diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index faf302985..88e5d034c 100755
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -81,7 +81,7 @@ $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config
 $dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['auth_ejabberd']]);
 
 \Friendica\DI::init($dice);
-
+\Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class));
 $appMode = $dice->create(Mode::class);
 
 if ($appMode->isNormal()) {
diff --git a/bin/console.php b/bin/console.php
index 0684f240e..35f0b5fee 100755
--- a/bin/console.php
+++ b/bin/console.php
@@ -33,4 +33,6 @@ require dirname(__DIR__) . '/vendor/autoload.php';
 $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
 $dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['console']]);
 
+\Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class));
+
 (new Friendica\Core\Console($dice, $argv))->execute();
diff --git a/bin/daemon.php b/bin/daemon.php
index 4fa9f8bd3..7d4945fe0 100755
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -60,6 +60,7 @@ $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config
 $dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['daemon']]);
 
 DI::init($dice);
+\Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class));
 $a = DI::app();
 
 if (DI::mode()->isInstall()) {
diff --git a/bin/worker.php b/bin/worker.php
index 46638a9ef..2fe03cb4b 100755
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -57,6 +57,7 @@ $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config
 $dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['worker']]);
 
 DI::init($dice);
+\Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class));
 $a = DI::app();
 
 DI::mode()->setExecutor(Mode::WORKER);
diff --git a/index.php b/index.php
index 2c18cb878..011b9d7f9 100644
--- a/index.php
+++ b/index.php
@@ -34,6 +34,8 @@ $dice = $dice->addRule(Friendica\App\Mode::class, ['call' => [['determineRunMode
 
 \Friendica\DI::init($dice);
 
+\Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class));
+
 $a = \Friendica\DI::app();
 
 \Friendica\DI::mode()->setExecutor(\Friendica\App\Mode::INDEX);
diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index b9f9b4c7f..9bd7793e4 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -121,7 +121,7 @@ function fbrowser_content(App $a)
 				$tpl = Renderer::getMarkupTemplate($template_file);
 				$o = Renderer::replaceMacros($tpl, [
 					'$type'     => 'file',
-					'$path'     => [ [ "", DI::l10n()->t("Files")] ],
+					'$path'     => ['' => DI::l10n()->t('Files')],
 					'$folders'  => false,
 					'$files'    => $files,
 					'$cancel'   => DI::l10n()->t('Cancel'),
diff --git a/src/App.php b/src/App.php
index 5c85c9f26..3ef9bdb4e 100644
--- a/src/App.php
+++ b/src/App.php
@@ -631,7 +631,9 @@ class App
 				Model\Profile::openWebAuthInit($token);
 			}
 
-			$auth->withSession($this);
+			if (!$this->mode->isBackend()) {
+				$auth->withSession($this);
+			}
 
 			if (empty($_SESSION['authenticated'])) {
 				header('X-Account-Management-Status: none');
diff --git a/src/BaseDepository.php b/src/BaseDepository.php
deleted file mode 100644
index 75118dd8c..000000000
--- a/src/BaseDepository.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-namespace Friendica;
-
-use Exception;
-use Friendica\Capabilities\ICanCreateFromTableRow;
-use Friendica\Database\Database;
-use Friendica\Database\DBA;
-use Friendica\Network\HTTPException\NotFoundException;
-use Psr\Log\LoggerInterface;
-
-/**
- * Depositories are meant to store and retrieve Entities from the database.
- *
- * The reason why there are methods prefixed with an underscore is because PHP doesn't support generic polymorphism
- * which means we can't directly overload base methods and make parameters more strict (from a parent class to a child
- * class for example)
- *
- * Similarly, we can't make an overloaded method return type more strict until we only support PHP version 7.4 but this
- * is less pressing.
- */
-abstract class BaseDepository
-{
-	const LIMIT = 30;
-
-	/**
-	 * @var string This should be set to the main database table name the depository is using
-	 */
-	protected static $table_name;
-
-	/** @var Database */
-	protected $db;
-
-	/** @var LoggerInterface */
-	protected $logger;
-
-	/** @var ICanCreateFromTableRow */
-	protected $factory;
-
-	public function __construct(Database $database, LoggerInterface $logger, ICanCreateFromTableRow $factory)
-	{
-		$this->db      = $database;
-		$this->logger  = $logger;
-		$this->factory = $factory;
-	}
-
-	/**
-	 * Populates the collection according to the condition. Retrieves a limited subset of entities depending on the
-	 * boundaries and the limit. The total count of rows matching the condition is stored in the collection.
-	 *
-	 * Depends on the corresponding table featuring a numerical auto incremented column called `id`.
-	 *
-	 * max_id and min_id are susceptible to the query order:
-	 * - min_id alone only reliably works with ASC order
-	 * - max_id alone only reliably works with DESC order
-	 * If the wrong order is detected in either case, we reverse the query order and the entity list order after the query
-	 *
-	 * Chainable.
-	 *
-	 * @param array    $condition
-	 * @param array    $params
-	 * @param int|null $min_id Retrieve models with an id no fewer than this, as close to it as possible
-	 * @param int|null $max_id Retrieve models with an id no greater than this, as close to it as possible
-	 * @param int      $limit
-	 * @return BaseCollection
-	 * @throws \Exception
-	 */
-	protected function _selectByBoundaries(
-		array $condition = [],
-		array $params = [],
-		int $min_id = null,
-		int $max_id = null,
-		int $limit = self::LIMIT
-	): BaseCollection {
-		$totalCount = $this->count($condition);
-
-		$boundCondition = $condition;
-
-		$reverseOrder = false;
-
-		if (isset($min_id)) {
-			$boundCondition = DBA::mergeConditions($boundCondition, ['`id` > ?', $min_id]);
-			if (!isset($max_id) && isset($params['order']['id']) && ($params['order']['id'] === true || $params['order']['id'] === 'DESC')) {
-				$reverseOrder = true;
-
-				$params['order']['id'] = 'ASC';
-			}
-		}
-
-		if (isset($max_id) && $max_id > 0) {
-			$boundCondition = DBA::mergeConditions($boundCondition, ['`id` < ?', $max_id]);
-			if (!isset($min_id) && (!isset($params['order']['id']) || $params['order']['id'] === false || $params['order']['id'] === 'ASC')) {
-				$reverseOrder = true;
-
-				$params['order']['id'] = 'DESC';
-			}
-		}
-
-		$params['limit'] = $limit;
-
-		$Entities = $this->_select($boundCondition, $params);
-		if ($reverseOrder) {
-			$Entities->reverse();
-		}
-
-		return new BaseCollection($Entities->getArrayCopy(), $totalCount);
-	}
-
-	/**
-	 * @param array $condition
-	 * @param array $params
-	 * @return BaseCollection
-	 * @throws Exception
-	 */
-	protected function _select(array $condition, array $params = []): BaseCollection
-	{
-		$rows = $this->db->selectToArray(static::$table_name, [], $condition, $params);
-
-		$Entities = new BaseCollection();
-		foreach ($rows as $fields) {
-			$Entities[] = $this->factory->createFromTableRow($fields);
-		}
-
-		return $Entities;
-	}
-
-	/**
-	 * @param array $condition
-	 * @param array $params
-	 * @return BaseEntity
-	 * @throws NotFoundException
-	 */
-	protected function _selectOne(array $condition, array $params = []): BaseEntity
-	{
-		$fields = $this->db->selectFirst(static::$table_name, [], $condition, $params);
-		if (!$this->db->isResult($fields)) {
-			throw new NotFoundException();
-		}
-
-		return $this->factory->createFromTableRow($fields);
-	}
-
-	/**
-	 * @param array $condition
-	 * @param array $params
-	 * @return int
-	 * @throws Exception
-	 */
-	public function count(array $condition, array $params = []): int
-	{
-		return $this->db->count(static::$table_name, $condition, $params);
-	}
-
-	/**
-	 * @param array $condition
-	 * @return bool
-	 * @throws Exception
-	 */
-	public function exists(array $condition): bool
-	{
-		return $this->db->exists(static::$table_name, $condition);
-	}
-}
diff --git a/src/BaseRepository.php b/src/BaseRepository.php
index 1294be88c..b86eff983 100644
--- a/src/BaseRepository.php
+++ b/src/BaseRepository.php
@@ -21,231 +21,162 @@
 
 namespace Friendica;
 
+use Exception;
+use Friendica\Capabilities\ICanCreateFromTableRow;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
-use Friendica\Network\HTTPException;
+use Friendica\Network\HTTPException\NotFoundException;
 use Psr\Log\LoggerInterface;
 
 /**
- * Repositories are Factories linked to one or more database tables.
+ * Repositories are meant to store and retrieve Entities from the database.
  *
- * @see BaseModel
- * @see BaseCollection
+ * The reason why there are methods prefixed with an underscore is because PHP doesn't support generic polymorphism
+ * which means we can't directly overload base methods and make parameters more strict (from a parent class to a child
+ * class for example)
+ *
+ * Similarly, we can't make an overloaded method return type more strict until we only support PHP version 7.4 but this
+ * is less pressing.
  */
-abstract class BaseRepository extends BaseFactory
+abstract class BaseRepository
 {
 	const LIMIT = 30;
 
-	/** @var Database */
-	protected $dba;
-
-	/** @var string */
+	/**
+	 * @var string This should be set to the main database table name the depository is using
+	 */
 	protected static $table_name;
 
-	/** @var BaseModel */
-	protected static $model_class;
+	/** @var Database */
+	protected $db;
 
-	/** @var BaseCollection */
-	protected static $collection_class;
+	/** @var LoggerInterface */
+	protected $logger;
 
-	public function __construct(Database $dba, LoggerInterface $logger)
+	/** @var ICanCreateFromTableRow */
+	protected $factory;
+
+	public function __construct(Database $database, LoggerInterface $logger, ICanCreateFromTableRow $factory)
 	{
-		parent::__construct($logger);
-
-		$this->dba = $dba;
-		$this->logger = $logger;
+		$this->db      = $database;
+		$this->logger  = $logger;
+		$this->factory = $factory;
 	}
 
 	/**
-	 * Fetches a single model record. The condition array is expected to contain a unique index (primary or otherwise).
+	 * Populates the collection according to the condition. Retrieves a limited subset of entities depending on the
+	 * boundaries and the limit. The total count of rows matching the condition is stored in the collection.
 	 *
-	 * Chainable.
-	 *
-	 * @param array $condition
-	 * @return BaseModel
-	 * @throws HTTPException\NotFoundException
-	 */
-	public function selectFirst(array $condition)
-	{
-		$data = $this->dba->selectFirst(static::$table_name, [], $condition);
-
-		if (!$data) {
-			throw new HTTPException\NotFoundException(static::class . ' record not found.');
-		}
-
-		return $this->create($data);
-	}
-
-	/**
-	 * Populates a Collection according to the condition.
-	 *
-	 * Chainable.
-	 *
-	 * @param array $condition
-	 * @param array $params
-	 * @return BaseCollection
-	 * @throws \Exception
-	 */
-	public function select(array $condition = [], array $params = [])
-	{
-		$models = $this->selectModels($condition, $params);
-
-		return new static::$collection_class($models);
-	}
-
-	/**
-	 * Populates the collection according to the condition. Retrieves a limited subset of models depending on the boundaries
-	 * and the limit. The total count of rows matching the condition is stored in the collection.
+	 * Depends on the corresponding table featuring a numerical auto incremented column called `id`.
 	 *
 	 * max_id and min_id are susceptible to the query order:
 	 * - min_id alone only reliably works with ASC order
 	 * - max_id alone only reliably works with DESC order
-	 * If the wrong order is detected in either case, we inverse the query order and we reverse the model array after the query
+	 * If the wrong order is detected in either case, we reverse the query order and the entity list order after the query
 	 *
 	 * Chainable.
 	 *
-	 * @param array $condition
-	 * @param array $params
-	 * @param int?  $min_id Retrieve models with an id no fewer than this, as close to it as possible
-	 * @param int?  $max_id Retrieve models with an id no greater than this, as close to it as possible
-	 * @param int   $limit
+	 * @param array    $condition
+	 * @param array    $params
+	 * @param int|null $min_id Retrieve models with an id no fewer than this, as close to it as possible
+	 * @param int|null $max_id Retrieve models with an id no greater than this, as close to it as possible
+	 * @param int      $limit
 	 * @return BaseCollection
 	 * @throws \Exception
 	 */
-	public function selectByBoundaries(array $condition = [], array $params = [], int $min_id = null, int $max_id = null, int $limit = self::LIMIT)
-	{
-		$totalCount = DBA::count(static::$table_name, $condition);
+	protected function _selectByBoundaries(
+		array $condition = [],
+		array $params = [],
+		int $min_id = null,
+		int $max_id = null,
+		int $limit = self::LIMIT
+	): BaseCollection {
+		$totalCount = $this->count($condition);
 
 		$boundCondition = $condition;
 
-		$reverseModels = false;
+		$reverseOrder = false;
 
 		if (isset($min_id)) {
 			$boundCondition = DBA::mergeConditions($boundCondition, ['`id` > ?', $min_id]);
 			if (!isset($max_id) && isset($params['order']['id']) && ($params['order']['id'] === true || $params['order']['id'] === 'DESC')) {
-				$reverseModels = true;
+				$reverseOrder = true;
+
 				$params['order']['id'] = 'ASC';
 			}
 		}
 
-		if (isset($max_id)) {
+		if (isset($max_id) && $max_id > 0) {
 			$boundCondition = DBA::mergeConditions($boundCondition, ['`id` < ?', $max_id]);
 			if (!isset($min_id) && (!isset($params['order']['id']) || $params['order']['id'] === false || $params['order']['id'] === 'ASC')) {
-				$reverseModels = true;
+				$reverseOrder = true;
+
 				$params['order']['id'] = 'DESC';
 			}
 		}
 
 		$params['limit'] = $limit;
 
-		$models = $this->selectModels($boundCondition, $params);
-
-		if ($reverseModels) {
-			$models = array_reverse($models);
+		$Entities = $this->_select($boundCondition, $params);
+		if ($reverseOrder) {
+			$Entities->reverse();
 		}
 
-		return new static::$collection_class($models, $totalCount);
+		return new BaseCollection($Entities->getArrayCopy(), $totalCount);
 	}
 
 	/**
-	 * This method updates the database row from the model.
-	 *
-	 * @param BaseModel $model
+	 * @param array $condition
+	 * @param array $params
+	 * @return BaseCollection
+	 * @throws Exception
+	 */
+	protected function _select(array $condition, array $params = []): BaseCollection
+	{
+		$rows = $this->db->selectToArray(static::$table_name, [], $condition, $params);
+
+		$Entities = new BaseCollection();
+		foreach ($rows as $fields) {
+			$Entities[] = $this->factory->createFromTableRow($fields);
+		}
+
+		return $Entities;
+	}
+
+	/**
+	 * @param array $condition
+	 * @param array $params
+	 * @return BaseEntity
+	 * @throws NotFoundException
+	 */
+	protected function _selectOne(array $condition, array $params = []): BaseEntity
+	{
+		$fields = $this->db->selectFirst(static::$table_name, [], $condition, $params);
+		if (!$this->db->isResult($fields)) {
+			throw new NotFoundException();
+		}
+
+		return $this->factory->createFromTableRow($fields);
+	}
+
+	/**
+	 * @param array $condition
+	 * @param array $params
+	 * @return int
+	 * @throws Exception
+	 */
+	public function count(array $condition, array $params = []): int
+	{
+		return $this->db->count(static::$table_name, $condition, $params);
+	}
+
+	/**
+	 * @param array $condition
 	 * @return bool
-	 * @throws \Exception
+	 * @throws Exception
 	 */
-	public function update(BaseModel $model)
+	public function exists(array $condition): bool
 	{
-		if ($this->dba->update(static::$table_name, $model->toArray(), ['id' => $model->id], $model->getOriginalData())) {
-			$model->resetOriginalData();
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * This method creates a new database row and returns a model if it was successful.
-	 *
-	 * @param array $fields
-	 * @return BaseModel|bool
-	 * @throws \Exception
-	 */
-	public function insert(array $fields)
-	{
-		$return = $this->dba->insert(static::$table_name, $fields);
-
-		if (!$return) {
-			throw new HTTPException\InternalServerErrorException('Unable to insert new row in table "' . static::$table_name . '"');
-		}
-
-		$fields['id'] = $this->dba->lastInsertId();
-		$return = $this->create($fields);
-
-		return $return;
-	}
-
-	/**
-	 * Deletes the model record from the database.
-	 *
-	 * @param BaseModel $model
-	 * @return bool
-	 * @throws \Exception
-	 */
-	public function delete(BaseModel &$model)
-	{
-		if ($success = $this->dba->delete(static::$table_name, ['id' => $model->id])) {
-			$model = null;
-		}
-
-		return $success;
-	}
-
-	/**
-	 * Base instantiation method, can be overriden to add specific dependencies
-	 *
-	 * @param array $data
-	 * @return BaseModel
-	 */
-	protected function create(array $data)
-	{
-		return new static::$model_class($this->dba, $this->logger, $data);
-	}
-
-	/**
-	 * @param array $condition Query condition
-	 * @param array $params    Additional query parameters
-	 * @return BaseModel[]
-	 * @throws \Exception
-	 */
-	protected function selectModels(array $condition, array $params = [])
-	{
-		$result = $this->dba->select(static::$table_name, [], $condition, $params);
-
-		/** @var BaseModel $prototype */
-		$prototype = null;
-
-		$models = [];
-
-		while ($record = $this->dba->fetch($result)) {
-			if ($prototype === null) {
-				$prototype = $this->create($record);
-				$models[] = $prototype;
-			} else {
-				$models[] = static::$model_class::createFromPrototype($prototype, $record);
-			}
-		}
-
-		$this->dba->close($result);
-
-		return $models;
-	}
-
-	/**
-	 * @param BaseCollection $collection
-	 */
-	public function saveCollection(BaseCollection $collection)
-	{
-		$collection->map([$this, 'update']);
+		return $this->db->exists(static::$table_name, $condition);
 	}
 }
diff --git a/src/Collection/FSuggests.php b/src/Contact/FriendSuggest/Collection/FriendSuggests.php
similarity index 89%
rename from src/Collection/FSuggests.php
rename to src/Contact/FriendSuggest/Collection/FriendSuggests.php
index 78c964636..be896ad0d 100644
--- a/src/Collection/FSuggests.php
+++ b/src/Contact/FriendSuggest/Collection/FriendSuggests.php
@@ -19,11 +19,10 @@
  *
  */
 
-namespace Friendica\Collection;
+namespace Friendica\Contact\FriendSuggest\Collection;
 
 use Friendica\BaseCollection;
 
-class FSuggests extends BaseCollection
+class FriendSuggests extends BaseCollection
 {
-
 }
diff --git a/src/Contact/FriendSuggest/Entity/FriendSuggest.php b/src/Contact/FriendSuggest/Entity/FriendSuggest.php
new file mode 100644
index 000000000..4fc8a2df9
--- /dev/null
+++ b/src/Contact/FriendSuggest/Entity/FriendSuggest.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Contact\FriendSuggest\Entity;
+
+use Friendica\BaseEntity;
+
+/**
+ * Model for interacting with a friend suggestion
+ *
+ * @property-read int $uid
+ * @property-read int $cid
+ * @property-read string $name
+ * @property-read string $url
+ * @property-read string $request
+ * @property-read string $photo
+ * @property-read string $note
+ * @property-read \DateTime created
+ * @property-read int|null $id
+ */
+class FriendSuggest extends BaseEntity
+{
+	/** @var int */
+	protected $uid;
+	/** @var int */
+	protected $cid;
+	/** @var string */
+	protected $name;
+	/** @var string */
+	protected $url;
+	/** @var string */
+	protected $request;
+	/** @var string */
+	protected $photo;
+	/** @var string */
+	protected $note;
+	/** @var \DateTime */
+	protected $created;
+	/** @var int|null */
+	protected $id;
+
+	/**
+	 * @param int       $uid
+	 * @param int       $cid
+	 * @param string    $name
+	 * @param string    $url
+	 * @param string    $request
+	 * @param string    $photo
+	 * @param string    $note
+	 * @param \DateTime $created
+	 * @param int|null  $id
+	 */
+	public function __construct(int $uid, int $cid, string $name, string $url, string $request, string $photo, string $note, \DateTime $created, ?int $id = null)
+	{
+		$this->uid     = $uid;
+		$this->cid     = $cid;
+		$this->name    = $name;
+		$this->url     = $url;
+		$this->request = $request;
+		$this->photo   = $photo;
+		$this->note    = $note;
+		$this->created = $created;
+		$this->id      = $id;
+	}
+}
diff --git a/src/Model/FSuggest.php b/src/Contact/FriendSuggest/Exception/FriendSuggestNotFoundException.php
similarity index 70%
rename from src/Model/FSuggest.php
rename to src/Contact/FriendSuggest/Exception/FriendSuggestNotFoundException.php
index d8dbd3911..04f0b75a3 100644
--- a/src/Model/FSuggest.php
+++ b/src/Contact/FriendSuggest/Exception/FriendSuggestNotFoundException.php
@@ -19,23 +19,12 @@
  *
  */
 
-namespace Friendica\Model;
+namespace Friendica\Contact\FriendSuggest\Exception;
 
-use Friendica\BaseModel;
-
-/**
- * Model for interacting with a friend suggestion
- *
- * @property int uid
- * @property int cid
- * @property string name
- * @property string url
- * @property string request
- * @property string photo
- * @property string note
- * @property string created
- */
-class FSuggest extends BaseModel
+class FriendSuggestNotFoundException extends \OutOfBoundsException
 {
-
+	public function __construct($message = '', \Throwable $previous = null)
+	{
+		parent::__construct($message, 404, $previous);
+	}
 }
diff --git a/src/Collection/Notifications.php b/src/Contact/FriendSuggest/Exception/FriendSuggestPersistenceException.php
similarity index 77%
rename from src/Collection/Notifications.php
rename to src/Contact/FriendSuggest/Exception/FriendSuggestPersistenceException.php
index adf0f4858..daa277450 100644
--- a/src/Collection/Notifications.php
+++ b/src/Contact/FriendSuggest/Exception/FriendSuggestPersistenceException.php
@@ -19,18 +19,12 @@
  *
  */
 
-namespace Friendica\Collection;
+namespace Friendica\Contact\FriendSuggest\Exception;
 
-use Friendica\BaseCollection;
-use Friendica\Model;
-
-class Notifications extends BaseCollection
+class FriendSuggestPersistenceException extends \RuntimeException
 {
-	/**
-	 * @return Model\Notification
-	 */
-	public function current()
+	public function __construct($message = '', \Throwable $previous = null)
 	{
-		return parent::current();
+		parent::__construct($message, 500, $previous);
 	}
 }
diff --git a/src/Contact/FriendSuggest/Factory/FriendSuggest.php b/src/Contact/FriendSuggest/Factory/FriendSuggest.php
new file mode 100644
index 000000000..dcda234b3
--- /dev/null
+++ b/src/Contact/FriendSuggest/Factory/FriendSuggest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Contact\FriendSuggest\Factory;
+
+use Friendica\BaseFactory;
+use Friendica\Capabilities\ICanCreateFromTableRow;
+use Friendica\Contact\FriendSuggest\Entity;
+
+class FriendSuggest extends BaseFactory implements ICanCreateFromTableRow
+{
+	/**
+	 * @inheritDoc
+	 */
+	public function createFromTableRow(array $row): Entity\FriendSuggest
+	{
+		return new Entity\FriendSuggest(
+			$row['uid'] ?? 0,
+			$row['cid'] ?? 0,
+			$row['name'] ?? '',
+			$row['url'] ?? '',
+			$row['request'] ?? '',
+			$row['photo'] ?? '',
+			$row['note'] ?? '',
+			new \DateTime($row['created'] ?? 'now', new \DateTimeZone('UTC')),
+			$row['id'] ?? null
+		);
+	}
+
+	public function createNew(
+		int $uid,
+		int $cid,
+		string $name = '',
+		string $url = '',
+		string $request = '',
+		string $photo = '',
+		string $note = ''
+	): Entity\FriendSuggest {
+		return $this->createFromTableRow([
+			'uid'     => $uid,
+			'cid'     => $cid,
+			'name'    => $name,
+			'url'     => $url,
+			'request' => $request,
+			'photo'   => $photo,
+			'note'    => $note,
+		]);
+	}
+
+	public function createEmpty(int $id): Entity\FriendSuggest
+	{
+		return $this->createFromTableRow(['id' => $id]);
+	}
+}
diff --git a/src/Contact/FriendSuggest/Repository/FriendSuggest.php b/src/Contact/FriendSuggest/Repository/FriendSuggest.php
new file mode 100644
index 000000000..36f811919
--- /dev/null
+++ b/src/Contact/FriendSuggest/Repository/FriendSuggest.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Contact\FriendSuggest\Repository;
+
+use Friendica\BaseRepository;
+use Friendica\Contact\FriendSuggest\Collection;
+use Friendica\Contact\FriendSuggest\Entity;
+use Friendica\Contact\FriendSuggest\Exception\FriendSuggestNotFoundException;
+use Friendica\Contact\FriendSuggest\Exception\FriendSuggestPersistenceException;
+use Friendica\Contact\FriendSuggest\Factory;
+use Friendica\Database\Database;
+use Friendica\Network\HTTPException\NotFoundException;
+use Friendica\Util\DateTimeFormat;
+use Psr\Log\LoggerInterface;
+
+class FriendSuggest extends BaseRepository
+{
+	/** @var Factory\FriendSuggest */
+	protected $factory;
+
+	protected static $table_name = 'fsuggest';
+
+	public function __construct(Database $database, LoggerInterface $logger, Factory\FriendSuggest $factory)
+	{
+		parent::__construct($database, $logger, $factory);
+	}
+
+	private function convertToTableRow(Entity\FriendSuggest $fsuggest): array
+	{
+		return [
+			'uid'     => $fsuggest->uid,
+			'cid'     => $fsuggest->cid,
+			'name'    => $fsuggest->name,
+			'url'     => $fsuggest->url,
+			'request' => $fsuggest->request,
+			'photo'   => $fsuggest->photo,
+			'note'    => $fsuggest->note,
+			'created' => $fsuggest->created->format(DateTimeFormat::MYSQL),
+		];
+	}
+
+	/**
+	 * @param array $condition
+	 * @param array $params
+	 *
+	 * @return Entity\FriendSuggest
+	 *
+	 * @throws NotFoundException The underlying exception if there's no FriendSuggest with the given conditions
+	 */
+	private function selectOne(array $condition, array $params = []): Entity\FriendSuggest
+	{
+		return parent::_selectOne($condition, $params);
+	}
+
+	/**
+	 * @param array $condition
+	 * @param array $params
+	 *
+	 * @return Collection\FriendSuggests
+	 *
+	 * @throws \Exception
+	 */
+	private function select(array $condition, array $params = []): Collection\FriendSuggests
+	{
+		return new Collection\FriendSuggests(parent::_select($condition, $params)->getArrayCopy());
+	}
+
+	/**
+	 * @param int $id
+	 *
+	 * @return Entity\FriendSuggest
+	 *
+	 * @throws FriendSuggestNotFoundException in case there's no suggestion for this id
+	 */
+	public function selectOneById(int $id): Entity\FriendSuggest
+	{
+		try {
+			return $this->selectOne(['id' => $id]);
+		} catch (NotFoundException $e) {
+			throw new FriendSuggestNotFoundException(sprintf('No FriendSuggest found for id %d', $id));
+		}
+	}
+
+	/**
+	 * @param int $cid
+	 *
+	 * @return Collection\FriendSuggests
+	 *
+	 * @throws FriendSuggestPersistenceException In case the underlying storage cannot select the suggestion
+	 */
+	public function selectForContact(int $cid): Collection\FriendSuggests
+	{
+		try {
+			return $this->select(['cid' => $cid]);
+		} catch (\Exception $e) {
+			throw new FriendSuggestPersistenceException(sprintf('Cannot select FriendSuggestion for contact %d', $cid));
+		}
+	}
+
+	/**
+	 * @param Entity\FriendSuggest $fsuggest
+	 *
+	 * @return Entity\FriendSuggest
+	 *
+	 * @throws FriendSuggestNotFoundException in case the underlying storage cannot save the suggestion
+	 */
+	public function save(Entity\FriendSuggest $fsuggest): Entity\FriendSuggest
+	{
+		try {
+			$fields = $this->convertToTableRow($fsuggest);
+
+			if ($fsuggest->id) {
+				$this->db->update(self::$table_name, $fields, ['id' => $fsuggest->id]);
+				return $this->selectOneById($fsuggest->id);
+			} else {
+				$this->db->insert(self::$table_name, $fields);
+				return $this->selectOneById($this->db->lastInsertId());
+			}
+		} catch (\Exception $exception) {
+			throw new FriendSuggestNotFoundException(sprintf('Cannot insert/update the FriendSuggestion %d for user %d', $fsuggest->id, $fsuggest->uid), $exception);
+		}
+	}
+
+	/**
+	 * @param Collection\FriendSuggests $fsuggests
+	 *
+	 * @return bool
+	 *
+	 * @throws FriendSuggestNotFoundException in case the underlying storage cannot delete the suggestion
+	 */
+	public function delete(Collection\FriendSuggests $fsuggests): bool
+	{
+		try {
+			$ids = $fsuggests->column('id');
+			return $this->db->delete(self::$table_name, ['id' => $ids]);
+		} catch (\Exception $exception) {
+			throw new FriendSuggestNotFoundException('Cannot delete the FriendSuggestions', $exception);
+		}
+	}
+}
diff --git a/src/Contact/Introduction/Collection/Introductions.php b/src/Contact/Introduction/Collection/Introductions.php
index 4df89cee4..697be46f9 100644
--- a/src/Contact/Introduction/Collection/Introductions.php
+++ b/src/Contact/Introduction/Collection/Introductions.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Contact\Introduction\Collection;
 
diff --git a/src/Contact/Introduction/Exception/IntroductionNotFoundException.php b/src/Contact/Introduction/Exception/IntroductionNotFoundException.php
index f48c9ea22..aee01f347 100644
--- a/src/Contact/Introduction/Exception/IntroductionNotFoundException.php
+++ b/src/Contact/Introduction/Exception/IntroductionNotFoundException.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Contact\Introduction\Exception;
 
diff --git a/src/Contact/Introduction/Exception/IntroductionPersistenceException.php b/src/Contact/Introduction/Exception/IntroductionPersistenceException.php
index 99fb919e3..e0f8d2baf 100644
--- a/src/Contact/Introduction/Exception/IntroductionPersistenceException.php
+++ b/src/Contact/Introduction/Exception/IntroductionPersistenceException.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Contact\Introduction\Exception;
 
diff --git a/src/Contact/Introduction/Depository/Introduction.php b/src/Contact/Introduction/Repository/Introduction.php
similarity index 98%
rename from src/Contact/Introduction/Depository/Introduction.php
rename to src/Contact/Introduction/Repository/Introduction.php
index 792673f23..6121d3aab 100644
--- a/src/Contact/Introduction/Depository/Introduction.php
+++ b/src/Contact/Introduction/Repository/Introduction.php
@@ -19,9 +19,9 @@
  *
  */
 
-namespace Friendica\Contact\Introduction\Depository;
+namespace Friendica\Contact\Introduction\Repository;
 
-use Friendica\BaseDepository;
+use Friendica\BaseRepository;
 use Friendica\Contact\Introduction\Exception\IntroductionNotFoundException;
 use Friendica\Contact\Introduction\Exception\IntroductionPersistenceException;
 use Friendica\Contact\Introduction\Collection;
@@ -32,7 +32,7 @@ use Friendica\Network\HTTPException\NotFoundException;
 use Friendica\Util\DateTimeFormat;
 use Psr\Log\LoggerInterface;
 
-class Introduction extends BaseDepository
+class Introduction extends BaseRepository
 {
 	/** @var Factory\Introduction */
 	protected $factory;
diff --git a/src/Core/Logger/Handler/ErrorHandler.php b/src/Core/Logger/Handler/ErrorHandler.php
new file mode 100644
index 000000000..c4e85fe6c
--- /dev/null
+++ b/src/Core/Logger/Handler/ErrorHandler.php
@@ -0,0 +1,347 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+declare(strict_types=1);
+
+namespace Friendica\Core\Logger\Handler;
+
+use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
+use Throwable;
+
+/**
+ * A facility to enable logging of runtime errors, exceptions and fatal errors.
+ *
+ * Quick setup: <code>ErrorHandler::register($logger);</code>
+ */
+class ErrorHandler
+{
+	/** @var LoggerInterface */
+	private $logger;
+
+	/** @var ?callable */
+	private $previousExceptionHandler = null;
+	/** @var array<class-string, LogLevel::*> an array of class name to LogLevel::* constant mapping */
+	private $uncaughtExceptionLevelMap = [];
+
+	/** @var callable|true|null */
+	private $previousErrorHandler = null;
+	/** @var array<int, LogLevel::*> an array of E_* constant to LogLevel::* constant mapping */
+	private $errorLevelMap = [];
+	/** @var bool */
+	private $handleOnlyReportedErrors = true;
+
+	/** @var bool */
+	private $hasFatalErrorHandler = false;
+	/** @var LogLevel::* */
+	private $fatalLevel = LogLevel::ALERT;
+	/** @var ?string */
+	private $reservedMemory = null;
+	/** @var ?mixed */
+	private $lastFatalTrace;
+	/** @var int[] */
+	private static $fatalErrors = [E_ERROR, E_PARSE, E_CORE_ERROR, E_COMPILE_ERROR, E_USER_ERROR];
+
+	public function __construct(LoggerInterface $logger)
+	{
+		$this->logger = $logger;
+	}
+
+	/**
+	 * Registers a new ErrorHandler for a given Logger
+	 *
+	 * By default it will handle errors, exceptions and fatal errors
+	 *
+	 * @param  LoggerInterface                        $logger
+	 * @param  array<int, LogLevel::*>|false          $errorLevelMap     an array of E_* constant to LogLevel::* constant mapping, or false to disable error handling
+	 * @param  array<class-string, LogLevel::*>|false $exceptionLevelMap an array of class name to LogLevel::* constant mapping, or false to disable exception handling
+	 * @param  LogLevel::*|null|false                 $fatalLevel        a LogLevel::* constant, null to use the default LogLevel::ALERT or false to disable fatal error handling
+	 *
+	 * @return ErrorHandler
+	 */
+	public static function register(LoggerInterface $logger, $errorLevelMap = [], $exceptionLevelMap = [], $fatalLevel = null): self
+	{
+		/** @phpstan-ignore-next-line */
+		$handler = new static($logger);
+		if ($errorLevelMap !== false) {
+			$handler->registerErrorHandler($errorLevelMap);
+		}
+		if ($exceptionLevelMap !== false) {
+			$handler->registerExceptionHandler($exceptionLevelMap);
+		}
+		if ($fatalLevel !== false) {
+			$handler->registerFatalHandler($fatalLevel);
+		}
+
+		return $handler;
+	}
+
+	/**
+	 * Stringify the class of the given object for logging purpose
+	 *
+	 * @param object $object An object to retrieve the class
+	 *
+	 * @return string the classname of the object
+	 */
+	public static function getClass(object $object): string
+	{
+		$class = \get_class($object);
+
+		if (false === ($pos = \strpos($class, "@anonymous\0"))) {
+			return $class;
+		}
+
+		if (false === ($parent = \get_parent_class($class))) {
+			return \substr($class, 0, $pos + 10);
+		}
+
+		return $parent . '@anonymous';
+	}
+
+	/**
+	 * @param array<class-string, LogLevel::*> $levelMap an array of class name to LogLevel::* constant mapping
+	 * @param bool                             $callPrevious Set to true, if a previously defined exception handler should be called after handling this exception
+	 *
+	 * @return $this
+	 */
+	public function registerExceptionHandler(array $levelMap = [], bool $callPrevious = true): self
+	{
+		$prev = set_exception_handler(function (Throwable $e): void {
+			$this->handleException($e);
+		});
+		$this->uncaughtExceptionLevelMap = $levelMap;
+		foreach ($this->defaultExceptionLevelMap() as $class => $level) {
+			if (!isset($this->uncaughtExceptionLevelMap[$class])) {
+				$this->uncaughtExceptionLevelMap[$class] = $level;
+			}
+		}
+		if ($callPrevious && $prev) {
+			$this->previousExceptionHandler = $prev;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * @param array<int, LogLevel::*> $levelMap an array of E_* constant to LogLevel::* constant mapping
+	 * @param bool                    $callPrevious Set to true, if a previously defined exception handler should be called after handling this exception
+	 * @param int                     $errorTypes a Mask for masking the errortypes, which should be handled by this error handler
+	 * @param bool                    $handleOnlyReportedErrors Set to true, only errors set per error_reporting() will be logged
+	 *
+	 * @return $this
+	 */
+	public function registerErrorHandler(array $levelMap = [], bool $callPrevious = true, int $errorTypes = -1, bool $handleOnlyReportedErrors = true): self
+	{
+		$prev                = set_error_handler([$this, 'handleError'], $errorTypes);
+		$this->errorLevelMap = array_replace($this->defaultErrorLevelMap(), $levelMap);
+		if ($callPrevious) {
+			$this->previousErrorHandler = $prev ?: true;
+		} else {
+			$this->previousErrorHandler = null;
+		}
+
+		$this->handleOnlyReportedErrors = $handleOnlyReportedErrors;
+
+		return $this;
+	}
+
+	/**
+	 * @param LogLevel::*|null $level              a LogLevel::* constant, null to use the default LogLevel::ALERT
+	 * @param int              $reservedMemorySize Amount of KBs to reserve in memory so that it can be freed when handling fatal errors giving Monolog some room in memory to get its job done
+	 *
+	 * @return $this
+	 */
+	public function registerFatalHandler($level = null, int $reservedMemorySize = 20): self
+	{
+		register_shutdown_function([$this, 'handleFatalError']);
+
+		$this->reservedMemory       = str_repeat(' ', 1024 * $reservedMemorySize);
+		$this->fatalLevel           = null === $level ? LogLevel::ALERT : $level;
+		$this->hasFatalErrorHandler = true;
+
+		return $this;
+	}
+
+	/**
+	 * @return array<class-string, LogLevel::*>
+	 */
+	protected function defaultExceptionLevelMap(): array
+	{
+		return [
+			'ParseError' => LogLevel::CRITICAL,
+			'Throwable'  => LogLevel::ERROR,
+		];
+	}
+
+	/**
+	 * @return array<int, LogLevel::*>
+	 */
+	protected function defaultErrorLevelMap(): array
+	{
+		return [
+			E_ERROR             => LogLevel::CRITICAL,
+			E_WARNING           => LogLevel::WARNING,
+			E_PARSE             => LogLevel::ALERT,
+			E_NOTICE            => LogLevel::NOTICE,
+			E_CORE_ERROR        => LogLevel::CRITICAL,
+			E_CORE_WARNING      => LogLevel::WARNING,
+			E_COMPILE_ERROR     => LogLevel::ALERT,
+			E_COMPILE_WARNING   => LogLevel::WARNING,
+			E_USER_ERROR        => LogLevel::ERROR,
+			E_USER_WARNING      => LogLevel::WARNING,
+			E_USER_NOTICE       => LogLevel::NOTICE,
+			E_STRICT            => LogLevel::NOTICE,
+			E_RECOVERABLE_ERROR => LogLevel::ERROR,
+			E_DEPRECATED        => LogLevel::NOTICE,
+			E_USER_DEPRECATED   => LogLevel::NOTICE,
+		];
+	}
+
+	/**
+	 * The Exception handler
+	 *
+	 * @param Throwable $e The Exception to handle
+	 */
+	private function handleException(Throwable $e): void
+	{
+		$level = LogLevel::ERROR;
+		foreach ($this->uncaughtExceptionLevelMap as $class => $candidate) {
+			if ($e instanceof $class) {
+				$level = $candidate;
+				break;
+			}
+		}
+
+		$this->logger->log(
+			$level,
+			sprintf('Uncaught Exception %s: "%s" at %s line %s', self::getClass($e), $e->getMessage(), $e->getFile(), $e->getLine()),
+			['exception' => $e]
+		);
+
+		if ($this->previousExceptionHandler) {
+			($this->previousExceptionHandler)($e);
+		}
+
+		if (!headers_sent() && !ini_get('display_errors')) {
+			http_response_code(500);
+		}
+
+		exit(255);
+	}
+
+	/**
+	 * The Error handler
+	 *
+	 * @private
+	 *
+	 * @param int        $code    The PHP error code
+	 * @param string     $message The error message
+	 * @param string     $file    If possible, set the file at which the failure occurred
+	 * @param int        $line
+	 * @param array|null $context If possible, add a context to the error for better analysis
+	 *
+	 * @return bool
+	 */
+	public function handleError(int $code, string $message, string $file = '', int $line = 0, ?array $context = []): bool
+	{
+		if ($this->handleOnlyReportedErrors && !(error_reporting() & $code)) {
+			return false;
+		}
+
+		// fatal error codes are ignored if a fatal error handler is present as well to avoid duplicate log entries
+		if (!$this->hasFatalErrorHandler || !in_array($code, self::$fatalErrors, true)) {
+			$level = $this->errorLevelMap[$code] ?? LogLevel::CRITICAL;
+			$this->logger->log($level, self::codeToString($code).': '.$message, ['code' => $code, 'message' => $message, 'file' => $file, 'line' => $line]);
+		} else {
+			$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+			array_shift($trace); // Exclude handleError from trace
+			$this->lastFatalTrace = $trace;
+		}
+
+		if ($this->previousErrorHandler === true) {
+			return false;
+		} elseif ($this->previousErrorHandler) {
+			return (bool) ($this->previousErrorHandler)($code, $message, $file, $line, $context);
+		}
+
+		return true;
+	}
+
+	/**
+	 * @private
+	 */
+	public function handleFatalError(): void
+	{
+		$this->reservedMemory = '';
+
+		$lastError = error_get_last();
+		if ($lastError && in_array($lastError['type'], self::$fatalErrors, true)) {
+			$this->logger->log(
+				$this->fatalLevel,
+				'Fatal Error ('.self::codeToString($lastError['type']).'): '.$lastError['message'],
+				['code' => $lastError['type'], 'message' => $lastError['message'], 'file' => $lastError['file'], 'line' => $lastError['line'], 'trace' => $this->lastFatalTrace]
+			);
+		}
+	}
+
+	/**
+	 * @param mixed $code
+	 *
+	 * @return string
+	 */
+	private static function codeToString($code): string
+	{
+		switch ($code) {
+			case E_ERROR:
+				return 'E_ERROR';
+			case E_WARNING:
+				return 'E_WARNING';
+			case E_PARSE:
+				return 'E_PARSE';
+			case E_NOTICE:
+				return 'E_NOTICE';
+			case E_CORE_ERROR:
+				return 'E_CORE_ERROR';
+			case E_CORE_WARNING:
+				return 'E_CORE_WARNING';
+			case E_COMPILE_ERROR:
+				return 'E_COMPILE_ERROR';
+			case E_COMPILE_WARNING:
+				return 'E_COMPILE_WARNING';
+			case E_USER_ERROR:
+				return 'E_USER_ERROR';
+			case E_USER_WARNING:
+				return 'E_USER_WARNING';
+			case E_USER_NOTICE:
+				return 'E_USER_NOTICE';
+			case E_STRICT:
+				return 'E_STRICT';
+			case E_RECOVERABLE_ERROR:
+				return 'E_RECOVERABLE_ERROR';
+			case E_DEPRECATED:
+				return 'E_DEPRECATED';
+			case E_USER_DEPRECATED:
+				return 'E_USER_DEPRECATED';
+		}
+
+		return 'Unknown PHP error';
+	}
+}
diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index 4ac59d14c..67960fabd 100644
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -27,7 +27,7 @@ use Friendica\DI;
 use Friendica\Model\Photo;
 use Friendica\Model\Profile;
 use Friendica\Object\Image;
-use Friendica\Security\PermissionSet\Depository\PermissionSet;
+use Friendica\Security\PermissionSet\Repository\PermissionSet;
 use Friendica\Util\Strings;
 use Friendica\Worker\Delivery;
 
diff --git a/src/DI.php b/src/DI.php
index 28df28a32..7e5f309b3 100644
--- a/src/DI.php
+++ b/src/DI.php
@@ -427,19 +427,27 @@ abstract class DI
 	//
 
 	/**
-	 * @return Repository\FSuggest;
+	 * @return Contact\FriendSuggest\Repository\FriendSuggest;
 	 */
 	public static function fsuggest()
 	{
-		return self::$dice->create(Repository\FSuggest::class);
+		return self::$dice->create(Contact\FriendSuggest\Repository\FriendSuggest::class);
 	}
 
 	/**
-	 * @return Contact\Introduction\Depository\Introduction
+	 * @return Contact\FriendSuggest\Factory\FriendSuggest;
+	 */
+	public static function fsuggestFactory()
+	{
+		return self::$dice->create(Contact\FriendSuggest\Factory\FriendSuggest::class);
+	}
+
+	/**
+	 * @return Contact\Introduction\Repository\Introduction
 	 */
 	public static function intro()
 	{
-		return self::$dice->create(Contact\Introduction\Depository\Introduction::class);
+		return self::$dice->create(Contact\Introduction\Repository\Introduction::class);
 	}
 
 	/**
@@ -450,9 +458,9 @@ abstract class DI
 		return self::$dice->create(Contact\Introduction\Factory\Introduction::class);
 	}
 
-	public static function permissionSet(): Security\PermissionSet\Depository\PermissionSet
+	public static function permissionSet(): Security\PermissionSet\Repository\PermissionSet
 	{
-		return self::$dice->create(Security\PermissionSet\Depository\PermissionSet::class);
+		return self::$dice->create(Security\PermissionSet\Repository\PermissionSet::class);
 	}
 
 	public static function permissionSetFactory(): Security\PermissionSet\Factory\PermissionSet
@@ -460,9 +468,9 @@ abstract class DI
 		return self::$dice->create(Security\PermissionSet\Factory\PermissionSet::class);
 	}
 
-	public static function profileField(): Profile\ProfileField\Depository\ProfileField
+	public static function profileField(): Profile\ProfileField\Repository\ProfileField
 	{
-		return self::$dice->create(Profile\ProfileField\Depository\ProfileField::class);
+		return self::$dice->create(Profile\ProfileField\Repository\ProfileField::class);
 	}
 
 	public static function profileFieldFactory(): Profile\ProfileField\Factory\ProfileField
@@ -470,9 +478,9 @@ abstract class DI
 		return self::$dice->create(Profile\ProfileField\Factory\ProfileField::class);
 	}
 
-	public static function notification(): Navigation\Notifications\Depository\Notification
+	public static function notification(): Navigation\Notifications\Repository\Notification
 	{
-		return self::$dice->create(Navigation\Notifications\Depository\Notification::class);
+		return self::$dice->create(Navigation\Notifications\Repository\Notification::class);
 	}
 
 	public static function notificationFactory(): Navigation\Notifications\Factory\Notification
@@ -480,9 +488,9 @@ abstract class DI
 		return self::$dice->create(Navigation\Notifications\Factory\Notification::class);
 	}
 
-	public static function notify(): Navigation\Notifications\Depository\Notify
+	public static function notify(): Navigation\Notifications\Repository\Notify
 	{
-		return self::$dice->create(Navigation\Notifications\Depository\Notify::class);
+		return self::$dice->create(Navigation\Notifications\Repository\Notify::class);
 	}
 
 	public static function notifyFactory(): Navigation\Notifications\Factory\Notify
diff --git a/src/Factory/Api/Mastodon/Account.php b/src/Factory/Api/Mastodon/Account.php
index a987e6874..7b7eba0ed 100644
--- a/src/Factory/Api/Mastodon/Account.php
+++ b/src/Factory/Api/Mastodon/Account.php
@@ -27,7 +27,7 @@ use Friendica\Collection\Api\Mastodon\Fields;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
 use Friendica\Network\HTTPException;
-use Friendica\Profile\ProfileField\Depository\ProfileField as ProfileFieldDepository;
+use Friendica\Profile\ProfileField\Repository\ProfileField as ProfileFieldRepository;
 use ImagickException;
 use Psr\Log\LoggerInterface;
 
@@ -35,17 +35,17 @@ class Account extends BaseFactory
 {
 	/** @var BaseURL */
 	private $baseUrl;
-	/** @var ProfileFieldDepository */
-	private $profileFieldDepo;
+	/** @var ProfileFieldRepository */
+	private $profileFieldRepo;
 	/** @var Field */
 	private $mstdnFieldFactory;
 
-	public function __construct(LoggerInterface $logger, BaseURL $baseURL, ProfileFieldDepository $profileFieldDepo, Field $mstdnFieldFactory)
+	public function __construct(LoggerInterface $logger, BaseURL $baseURL, ProfileFieldRepository $profileFieldRepo, Field $mstdnFieldFactory)
 	{
 		parent::__construct($logger);
 
 		$this->baseUrl           = $baseURL;
-		$this->profileFieldDepo  = $profileFieldDepo;
+		$this->profileFieldRepo  = $profileFieldRepo;
 		$this->mstdnFieldFactory = $mstdnFieldFactory;
 	}
 
@@ -76,7 +76,7 @@ class Account extends BaseFactory
 
 		$self_contact = Contact::selectFirst(['uid'], ['nurl' => $publicContact['nurl'], 'self' => true]);
 		if (!empty($self_contact['uid'])) {
-			$profileFields = $this->profileFieldDepo->selectPublicFieldsByUserId($self_contact['uid']);
+			$profileFields = $this->profileFieldRepo->selectPublicFieldsByUserId($self_contact['uid']);
 			$fields        = $this->mstdnFieldFactory->createFromProfileFields($profileFields);
 		} else {
 			$fields = new Fields();
@@ -94,7 +94,7 @@ class Account extends BaseFactory
 	{
 		$publicContact = Contact::selectFirst([], ['uid' => $userId, 'self' => true]);
 
-		$profileFields = $this->profileFieldDepo->selectPublicFieldsByUserId($userId);
+		$profileFields = $this->profileFieldRepo->selectPublicFieldsByUserId($userId);
 		$fields        = $this->mstdnFieldFactory->createFromProfileFields($profileFields);
 
 		$apContact = APContact::getByURL($publicContact['url'], false);
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index eea98b7e6..03cd09fc5 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1553,18 +1553,22 @@ class Contact
 	 */
 	public static function checkAvatarCache(int $cid)
 	{
-		$contact = DBA::selectFirst('contact', ['url', 'avatar', 'photo', 'thumb', 'micro'], ['id' => $cid, 'uid' => 0, 'self' => false]);
+		$contact = DBA::selectFirst('contact', ['url', 'network', 'avatar', 'photo', 'thumb', 'micro'], ['id' => $cid, 'uid' => 0, 'self' => false]);
 		if (!DBA::isResult($contact)) {
 			return;
 		}
 
-		if (empty($contact['avatar']) || (!empty($contact['photo']) && !empty($contact['thumb']) && !empty($contact['micro']))) {
+		if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) || DI::config()->get('system', 'cache_contact_avatar')) {
+			if (!empty($contact['avatar']) && (empty($contact['photo']) || empty($contact['thumb']) || empty($contact['micro']))) {
+				Logger::info('Adding avatar cache', ['id' => $cid, 'contact' => $contact]);
+				self::updateAvatar($cid, $contact['avatar'], true);
+				return;
+			}
+		} elseif (!empty($contact['photo']) || !empty($contact['thumb']) || !empty($contact['micro'])) {
+			Logger::info('Removing avatar cache', ['id' => $cid, 'contact' => $contact]);
+			self::updateAvatar($cid, $contact['avatar'], true);
 			return;
 		}
-
-		Logger::info('Adding avatar cache', ['id' => $cid, 'contact' => $contact]);
-
-		self::updateAvatar($cid, $contact['avatar'], true);
 	}
 
 	/**
@@ -1868,54 +1872,61 @@ class Contact
 			$avatar = self::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
 		}
 
-		if ($default_avatar && Proxy::isLocalImage($avatar)) {
-			$fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(),
-				'photo' => $avatar,
-				'thumb' => self::getDefaultAvatar($contact, Proxy::SIZE_THUMB),
-				'micro' => self::getDefaultAvatar($contact, Proxy::SIZE_MICRO)];
-			Logger::debug('Use default avatar', ['id' => $cid, 'uid' => $uid]);
-		}
-
-		// Use the data from the self account
-		if (empty($fields)) {
-			$local_uid = User::getIdForURL($contact['url']);
-			if (!empty($local_uid)) {
-				$fields = self::selectFirst(['avatar', 'avatar-date', 'photo', 'thumb', 'micro'], ['self' => true, 'uid' => $local_uid]);
-				Logger::debug('Use owner data', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
+		if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) || DI::config()->get('system', 'cache_contact_avatar')) {
+			if ($default_avatar && Proxy::isLocalImage($avatar)) {
+				$fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(),
+					'photo' => $avatar,
+					'thumb' => self::getDefaultAvatar($contact, Proxy::SIZE_THUMB),
+					'micro' => self::getDefaultAvatar($contact, Proxy::SIZE_MICRO)];
+				Logger::debug('Use default avatar', ['id' => $cid, 'uid' => $uid]);
 			}
-		}
 
-		if (empty($fields)) {
-			$update = ($contact['avatar'] != $avatar) || $force;
+			// Use the data from the self account
+			if (empty($fields)) {
+				$local_uid = User::getIdForURL($contact['url']);
+				if (!empty($local_uid)) {
+					$fields = self::selectFirst(['avatar', 'avatar-date', 'photo', 'thumb', 'micro'], ['self' => true, 'uid' => $local_uid]);
+					Logger::debug('Use owner data', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
+				}
+			}
 
-			if (!$update) {
-				$data = [
-					$contact['photo'] ?? '',
-					$contact['thumb'] ?? '',
-					$contact['micro'] ?? '',
-				];
+			if (empty($fields)) {
+				$update = ($contact['avatar'] != $avatar) || $force;
 
-				foreach ($data as $image_uri) {
-					$image_rid = Photo::ridFromURI($image_uri);
-					if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) {
-						Logger::debug('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
-						$update = true;
+				if (!$update) {
+					$data = [
+						$contact['photo'] ?? '',
+						$contact['thumb'] ?? '',
+						$contact['micro'] ?? '',
+					];
+
+					foreach ($data as $image_uri) {
+						$image_rid = Photo::ridFromURI($image_uri);
+						if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) {
+							Logger::debug('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
+							$update = true;
+						}
 					}
 				}
-			}
 
-			if ($update) {
-				$photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
-				if ($photos) {
-					$fields = ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()];
-					$update = !empty($fields);
-					Logger::debug('Created new cached avatars', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
-				} else {
-					$update = false;
+				if ($update) {
+					$photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
+					if ($photos) {
+						$fields = ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()];
+						$update = !empty($fields);
+						Logger::debug('Created new cached avatars', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
+					} else {
+						$update = false;
+					}
 				}
+			} else {
+				$update = ($fields['photo'] . $fields['thumb'] . $fields['micro'] != $contact['photo'] . $contact['thumb'] . $contact['micro']) || $force;
 			}
 		} else {
-			$update = ($fields['photo'] . $fields['thumb'] . $fields['micro'] != $contact['photo'] . $contact['thumb'] . $contact['micro']) || $force;
+			Photo::delete(['uid' => $uid, 'contact-id' => $cid, 'photo-type' => Photo::CONTACT_AVATAR]);
+			$fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(),
+				'photo' => '', 'thumb' => '', 'micro' => ''];
+			$update = ($avatar != $contact['avatar'] . $contact['photo'] . $contact['thumb'] . $contact['micro']) || $force;
 		}
 
 		if (!$update) {
diff --git a/src/Model/Event.php b/src/Model/Event.php
index 857b6c5b8..cb7c39c37 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -49,7 +49,7 @@ class Event
 
 		$uriid = $event['uri-id'] ?? $uriid;
 
-		$bd_format = DI::l10n()->t('l F d, Y \@ g:i A'); // Friday January 18, 2011 @ 8 AM.
+		$bd_format = DI::l10n()->t('l F d, Y \@ g:i A \G\M\TP (e)'); // Friday October 29, 2021 @ 9:15 AM GMT-04:00 (America/New_York)
 
 		$event_start = DI::l10n()->getDay(DateTimeFormat::local($event['start'], $bd_format));
 
diff --git a/src/Module/ActivityPub/Objects.php b/src/Module/ActivityPub/Objects.php
index 5ee1b65d8..232c80e5b 100644
--- a/src/Module/ActivityPub/Objects.php
+++ b/src/Module/ActivityPub/Objects.php
@@ -31,6 +31,7 @@ use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
+use Friendica\Security\PermissionSet\Repository\PermissionSet;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -84,11 +85,8 @@ class Objects extends BaseModule
 				$requester_id = Contact::getIdForURL($requester, $item['uid']);
 				if (!empty($requester_id)) {
 					$permissionSets = DI::permissionSet()->selectByContactId($requester_id, $item['uid']);
-					if (!empty($permissionSets)) {
-						$psid = array_merge($permissionSets->column('id'),
-							[DI::permissionSet()->selectPublicForUser($item['uid'])]);
-						$validated = in_array($item['psid'], $psid);
-					}
+					$psids = array_merge($permissionSets->column('id'), [PermissionSet::PUBLIC]);
+					$validated = in_array($item['psid'], $psids);
 				}
 			}
 		}
diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php
index 581962745..71deb67ef 100644
--- a/src/Module/Admin/Site.php
+++ b/src/Module/Admin/Site.php
@@ -163,6 +163,7 @@ class Site extends BaseAdmin
 		$allow_users_remote_self = !empty($_POST['allow_users_remote_self']);
 		$explicit_content       = !empty($_POST['explicit_content']);
 		$proxify_content        = !empty($_POST['proxify_content']);
+		$cache_contact_avatar   = !empty($_POST['cache_contact_avatar']);
 
 		$enable_multi_reg       = !empty($_POST['enable_multi_reg']);
 		$enable_openid          = !empty($_POST['enable_openid']);
@@ -330,6 +331,7 @@ class Site extends BaseAdmin
 		DI::config()->set('system', 'allow_users_remote_self', $allow_users_remote_self);
 		DI::config()->set('system', 'explicit_content'       , $explicit_content);
 		DI::config()->set('system', 'proxify_content'        , $proxify_content);
+		DI::config()->set('system', 'cache_contact_avatar'   , $cache_contact_avatar);
 		DI::config()->set('system', 'check_new_version_url'  , $check_new_version_url);
 
 		DI::config()->set('system', 'block_extended_register', !$enable_multi_reg);
@@ -554,6 +556,7 @@ class Site extends BaseAdmin
 			'$disable_embedded'       => ['disable_embedded', DI::l10n()->t('Don\'t embed private images in posts'), DI::config()->get('system', 'disable_embedded'), DI::l10n()->t('Don\'t replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while.')],
 			'$explicit_content'       => ['explicit_content', DI::l10n()->t('Explicit Content'), DI::config()->get('system', 'explicit_content'), DI::l10n()->t('Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page.')],
 			'$proxify_content'        => ['proxify_content', DI::l10n()->t('Proxify external content'), DI::config()->get('system', 'proxify_content'), DI::l10n()->t('Route external content via the proxy functionality. This is used for example for some OEmbed accesses and in some other rare cases.')],
+			'$cache_contact_avatar'   => ['cache_contact_avatar', DI::l10n()->t('Cache contact avatars'), DI::config()->get('system', 'cache_contact_avatar'), DI::l10n()->t('Locally store the avatar pictures of the contacts. This uses a lot of storage space but it increases the performance.')],
 			'$allow_users_remote_self'=> ['allow_users_remote_self', DI::l10n()->t('Allow Users to set remote_self'), DI::config()->get('system', 'allow_users_remote_self'), DI::l10n()->t('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.')],
 			'$enable_multi_reg'       => ['enable_multi_reg', DI::l10n()->t('Enable multiple registrations'), !DI::config()->get('system', 'block_extended_register'), DI::l10n()->t('Enable users to register additional accounts for use as pages.')],
 			'$enable_openid'          => ['enable_openid', DI::l10n()->t('Enable OpenID'), !DI::config()->get('system', 'no_openid'), DI::l10n()->t('Enable OpenID support for registration and logins.')],
diff --git a/src/Module/Api/Friendica/Profile/Show.php b/src/Module/Api/Friendica/Profile/Show.php
index 8102ac4bc..4167e6c61 100644
--- a/src/Module/Api/Friendica/Profile/Show.php
+++ b/src/Module/Api/Friendica/Profile/Show.php
@@ -28,7 +28,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Module\BaseApi;
 use Friendica\Network\HTTPException;
-use Friendica\Security\PermissionSet\Depository\PermissionSet;
+use Friendica\Security\PermissionSet\Repository\PermissionSet;
 
 /**
  * API endpoint: /api/friendica/profile/show
diff --git a/src/Module/FriendSuggest.php b/src/Module/FriendSuggest.php
index a53d47c48..78e75bc31 100644
--- a/src/Module/FriendSuggest.php
+++ b/src/Module/FriendSuggest.php
@@ -68,16 +68,15 @@ class FriendSuggest extends BaseModule
 
 		$note = Strings::escapeHtml(trim($_POST['note'] ?? ''));
 
-		$suggest = DI::fsuggest()->insert([
-			'uid'     => local_user(),
-			'cid'     => $cid,
-			'name'    => $contact['name'],
-			'url'     => $contact['url'],
-			'request' => $contact['request'],
-			'photo'   => $contact['avatar'],
-			'note'    => $note,
-			'created' => DateTimeFormat::utcNow()
-		]);
+		$suggest = DI::fsuggest()->save(DI::fsuggestFactory()->createNew(
+			local_user(),
+			$cid,
+			$contact['name'],
+			$contact['url'],
+			$contact['request'],
+			$contact['avatar'],
+			$note
+		));
 
 		Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::SUGGESTION, $suggest->id);
 
@@ -94,7 +93,7 @@ class FriendSuggest extends BaseModule
 			DI::baseUrl()->redirect();
 		}
 
-		$contacts = ContactModel::selectToArray(['id', 'name'], [
+		$suggestableContacts = ContactModel::selectToArray(['id', 'name'], [
 			'`uid` = ? 
 			AND `id` != ? 
 			AND `network` = ? 
@@ -111,8 +110,8 @@ class FriendSuggest extends BaseModule
 
 		$formattedContacts = [];
 
-		foreach ($contacts as $contact) {
-			$formattedContacts[$contact['id']] = $contact['name'];
+		foreach ($suggestableContacts as $suggestableContact) {
+			$formattedContacts[$suggestableContact['id']] = $suggestableContact['name'];
 		}
 
 		$tpl = Renderer::getMarkupTemplate('fsuggest.tpl');
diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index b43add0eb..0b03f4a79 100644
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -36,6 +36,7 @@ use Friendica\Network\HTTPException;
 use Friendica\Object\Image;
 use Friendica\Util\Images;
 use Friendica\Util\Network;
+use Friendica\Util\ParseUrl;
 use Friendica\Util\Proxy;
 
 /**
@@ -284,14 +285,26 @@ class Photo extends BaseModule
 					$url = $contact['avatar'];
 				} elseif (!empty($contact['avatar'])) {
 					$url = $contact['avatar'];
-				} elseif ($customsize <= Proxy::PIXEL_MICRO) {
-					$url = Contact::getDefaultAvatar($contact, Proxy::SIZE_MICRO);
-				} elseif ($customsize <= Proxy::PIXEL_THUMB) {
-					$url = Contact::getDefaultAvatar($contact, Proxy::SIZE_THUMB);
-				} else {
-					$url = Contact::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
 				}
-				return MPhoto::createPhotoForExternalResource($url);
+				$mimetext = '';
+				if (!empty($url)) {
+					$mime = ParseUrl::getContentType($url);
+					if (empty($mime) || ($mime[0] != 'image')) {
+						$url = '';
+					} else {
+						$mimetext = $mime[0] . '/' . $mime[1];
+					}
+				}
+				if (empty($url)) {
+					if ($customsize <= Proxy::PIXEL_MICRO) {
+						$url = Contact::getDefaultAvatar($contact, Proxy::SIZE_MICRO);
+					} elseif ($customsize <= Proxy::PIXEL_THUMB) {
+						$url = Contact::getDefaultAvatar($contact, Proxy::SIZE_THUMB);
+					} else {
+						$url = Contact::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
+					}
+				}
+				return MPhoto::createPhotoForExternalResource($url, 0, $mimetext);
 			case "header":
 				$contact = Contact::getById($id, ['uid', 'url', 'header']);
 				if (empty($contact)) {
diff --git a/src/Navigation/Notifications/Factory/FormattedNotification.php b/src/Navigation/Notifications/Factory/FormattedNotification.php
index 4e8c1b846..df0a77915 100644
--- a/src/Navigation/Notifications/Factory/FormattedNotification.php
+++ b/src/Navigation/Notifications/Factory/FormattedNotification.php
@@ -32,7 +32,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Post;
 use Friendica\Module\BaseNotifications;
 use Friendica\Navigation\Notifications\Collection\FormattedNotifications;
-use Friendica\Navigation\Notifications\Depository;
+use Friendica\Navigation\Notifications\Repository;
 use Friendica\Navigation\Notifications\ValueObject;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Protocol\Activity;
@@ -54,14 +54,14 @@ class FormattedNotification extends BaseFactory
 {
 	/** @var Database */
 	private $dba;
-	/** @var Depository\Notify */
+	/** @var Repository\Notify */
 	private $notify;
 	/** @var BaseURL */
 	private $baseUrl;
 	/** @var L10n */
 	private $l10n;
 
-	public function __construct(LoggerInterface $logger, Database $dba, Depository\Notify $notify, BaseURL $baseUrl, L10n $l10n)
+	public function __construct(LoggerInterface $logger, Database $dba, Repository\Notify $notify, BaseURL $baseUrl, L10n $l10n)
 	{
 		parent::__construct($logger);
 
diff --git a/src/Navigation/Notifications/Depository/Notification.php b/src/Navigation/Notifications/Repository/Notification.php
similarity index 96%
rename from src/Navigation/Notifications/Depository/Notification.php
rename to src/Navigation/Notifications/Repository/Notification.php
index a93bce665..154461e23 100644
--- a/src/Navigation/Notifications/Depository/Notification.php
+++ b/src/Navigation/Notifications/Repository/Notification.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Friendica\Navigation\Notifications\Depository;
+namespace Friendica\Navigation\Notifications\Repository;
 
 use Exception;
 use Friendica\BaseCollection;
-use Friendica\BaseDepository;
+use Friendica\BaseRepository;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\Model\Verb;
@@ -15,7 +15,7 @@ use Friendica\Network\HTTPException\NotFoundException;
 use Friendica\Util\DateTimeFormat;
 use Psr\Log\LoggerInterface;
 
-class Notification extends BaseDepository
+class Notification extends BaseRepository
 {
 	/** @var Factory\Notification  */
 	protected $factory;
diff --git a/src/Navigation/Notifications/Depository/Notify.php b/src/Navigation/Notifications/Repository/Notify.php
similarity index 99%
rename from src/Navigation/Notifications/Depository/Notify.php
rename to src/Navigation/Notifications/Repository/Notify.php
index a380166c6..3a6a4133c 100644
--- a/src/Navigation/Notifications/Depository/Notify.php
+++ b/src/Navigation/Notifications/Repository/Notify.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Friendica\Navigation\Notifications\Depository;
+namespace Friendica\Navigation\Notifications\Repository;
 
 use Friendica\App\BaseURL;
-use Friendica\BaseDepository;
+use Friendica\BaseRepository;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Config\IConfig;
 use Friendica\Core\Hook;
@@ -22,7 +22,7 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Emailer;
 use Psr\Log\LoggerInterface;
 
-class Notify extends BaseDepository
+class Notify extends BaseRepository
 {
 	/** @var Factory\Notify  */
 	protected $factory;
diff --git a/src/Profile/ProfileField/Depository/ProfileField.php b/src/Profile/ProfileField/Repository/ProfileField.php
similarity index 92%
rename from src/Profile/ProfileField/Depository/ProfileField.php
rename to src/Profile/ProfileField/Repository/ProfileField.php
index a6e441f3b..09959e430 100644
--- a/src/Profile/ProfileField/Depository/ProfileField.php
+++ b/src/Profile/ProfileField/Repository/ProfileField.php
@@ -19,9 +19,9 @@
  *
  */
 
-namespace Friendica\Profile\ProfileField\Depository;
+namespace Friendica\Profile\ProfileField\Repository;
 
-use Friendica\BaseDepository;
+use Friendica\BaseRepository;
 use Friendica\Database\Database;
 use Friendica\Profile\ProfileField\Exception\ProfileFieldNotFoundException;
 use Friendica\Profile\ProfileField\Exception\ProfileFieldPersistenceException;
@@ -29,11 +29,11 @@ use Friendica\Profile\ProfileField\Exception\UnexpectedPermissionSetException;
 use Friendica\Profile\ProfileField\Factory;
 use Friendica\Profile\ProfileField\Entity;
 use Friendica\Profile\ProfileField\Collection;
-use Friendica\Security\PermissionSet\Depository\PermissionSet as PermissionSetDepository;
+use Friendica\Security\PermissionSet\Repository\PermissionSet as PermissionSetRepository;
 use Friendica\Util\DateTimeFormat;
 use Psr\Log\LoggerInterface;
 
-class ProfileField extends BaseDepository
+class ProfileField extends BaseRepository
 {
 	/** @var  Factory\ProfileField */
 	protected $factory;
@@ -42,14 +42,14 @@ class ProfileField extends BaseDepository
 
 	protected static $view_name = 'profile_field-view';
 
-	/** @var PermissionSetDepository */
-	protected $permissionSetDepository;
+	/** @var PermissionSetRepository */
+	protected $permissionSetRepository;
 
-	public function __construct(Database $database, LoggerInterface $logger, Factory\ProfileField $factory, PermissionSetDepository $permissionSetDepository)
+	public function __construct(Database $database, LoggerInterface $logger, Factory\ProfileField $factory, PermissionSetRepository $permissionSetRepository)
 	{
 		parent::__construct($database, $logger, $factory);
 
-		$this->permissionSetDepository = $permissionSetDepository;
+		$this->permissionSetRepository = $permissionSetRepository;
 	}
 
 	/**
@@ -124,7 +124,7 @@ class ProfileField extends BaseDepository
 	public function selectPublicFieldsByUserId(int $uid): Collection\ProfileFields
 	{
 		try {
-			$publicPermissionSet = $this->permissionSetDepository->selectPublicForUser($uid);
+			$publicPermissionSet = $this->permissionSetRepository->selectPublicForUser($uid);
 
 			return $this->select([
 				'uid'  => $uid,
@@ -162,12 +162,12 @@ class ProfileField extends BaseDepository
 	 */
 	public function selectByContactId(int $cid, int $uid): Collection\ProfileFields
 	{
-		$permissionSets = $this->permissionSetDepository->selectByContactId($cid, $uid);
+		$permissionSets = $this->permissionSetRepository->selectByContactId($cid, $uid);
 
 		$permissionSetIds = $permissionSets->column('id');
 
 		// Includes public custom fields
-		$permissionSetIds[] = $this->permissionSetDepository->selectPublicForUser($uid)->id;
+		$permissionSetIds[] = $this->permissionSetRepository->selectPublicForUser($uid)->id;
 
 		return $this->select(
 			['uid' => $uid, 'psid' => $permissionSetIds],
diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index ab7b63866..5e6f77247 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -1782,7 +1782,7 @@ class Transmitter
 	{
 		$owner = User::getOwnerDataById($uid);
 
-		$suggestion = DI::fsuggest()->getById($suggestion_id);
+		$suggestion = DI::fsuggest()->selectOneById($suggestion_id);
 
 		$data = ['@context' => ActivityPub::CONTEXT,
 			'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
diff --git a/src/Repository/FSuggest.php b/src/Repository/FSuggest.php
deleted file mode 100644
index 1bbc6c739..000000000
--- a/src/Repository/FSuggest.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-namespace Friendica\Repository;
-
-use Friendica\BaseRepository;
-use Friendica\Collection;
-use Friendica\Model;
-
-class FSuggest extends BaseRepository
-{
-	protected static $table_name = 'fsuggest';
-
-	protected static $model_class = Model\FSuggest::class;
-
-	protected static $collection_class = Collection\FSuggests::class;
-
-	/**
-	 * @param array $data
-	 * @return Model\FSuggest
-	 */
-	protected function create(array $data)
-	{
-		return new Model\FSuggest($this->dba, $this->logger, $data);
-	}
-
-	/**
-	 * Returns the Friend Suggest based on it's ID
-	 *
-	 * @param int $id The id of the fsuggest
-	 *
-	 * @return Model\FSuggest
-	 *
-	 * @throws \Friendica\Network\HTTPException\NotFoundException
-	 */
-	public function getById(int $id)
-	{
-		return $this->selectFirst(['id' => $id]);
-	}
-
-	/**
-	 * @param array $condition
-	 * @return Model\FSuggest
-	 * @throws \Friendica\Network\HTTPException\NotFoundException
-	 */
-	public function selectFirst(array $condition)
-	{
-		return parent::selectFirst($condition);
-	}
-
-	/**
-	 * @param array $condition
-	 * @param array $params
-	 * @return Collection\FSuggests
-	 * @throws \Exception
-	 */
-	public function select(array $condition = [], array $params = [])
-	{
-		return parent::select($condition, $params);
-	}
-
-	/**
-	 * @param array    $condition
-	 * @param array    $params
-	 * @param int|null $min_id
-	 * @param int|null $max_id
-	 * @param int      $limit
-	 * @return Collection\FSuggests
-	 * @throws \Exception
-	 */
-	public function selectByBoundaries(array $condition = [], array $params = [], int $min_id = null, int $max_id = null, int $limit = self::LIMIT)
-	{
-		return parent::selectByBoundaries($condition, $params, $min_id, $max_id, $limit);
-	}
-}
diff --git a/src/Security/PermissionSet/Collection/PermissionSets.php b/src/Security/PermissionSet/Collection/PermissionSets.php
index c15b23a68..a18a05d17 100644
--- a/src/Security/PermissionSet/Collection/PermissionSets.php
+++ b/src/Security/PermissionSet/Collection/PermissionSets.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Security\PermissionSet\Collection;
 
diff --git a/src/Security/PermissionSet/Entity/PermissionSet.php b/src/Security/PermissionSet/Entity/PermissionSet.php
index 6a0409331..eb71909f1 100644
--- a/src/Security/PermissionSet/Entity/PermissionSet.php
+++ b/src/Security/PermissionSet/Entity/PermissionSet.php
@@ -1,9 +1,28 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Security\PermissionSet\Entity;
 
 use Friendica\BaseEntity;
-use Friendica\Security\PermissionSet\Depository\PermissionSet as PermissionSetDepository;
+use Friendica\Security\PermissionSet\Repository\PermissionSet as PermissionSetRepository;
 
 /**
  * @property-read int|null $id
@@ -55,7 +74,7 @@ class PermissionSet extends BaseEntity
 	 */
 	public function isPublic(): bool
 	{
-		return (($this->id === PermissionSetDepository::PUBLIC) ||
+		return (($this->id === PermissionSetRepository::PUBLIC) ||
 				(is_null($this->id) &&
 				 empty($this->allow_cid) &&
 				 empty($this->allow_gid) &&
diff --git a/src/Security/PermissionSet/Factory/PermissionSet.php b/src/Security/PermissionSet/Factory/PermissionSet.php
index bde6cd73f..969dfa185 100644
--- a/src/Security/PermissionSet/Factory/PermissionSet.php
+++ b/src/Security/PermissionSet/Factory/PermissionSet.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Security\PermissionSet\Factory;
 
diff --git a/src/Security/PermissionSet/Depository/PermissionSet.php b/src/Security/PermissionSet/Repository/PermissionSet.php
similarity index 98%
rename from src/Security/PermissionSet/Depository/PermissionSet.php
rename to src/Security/PermissionSet/Repository/PermissionSet.php
index b91f45218..af0264646 100644
--- a/src/Security/PermissionSet/Depository/PermissionSet.php
+++ b/src/Security/PermissionSet/Repository/PermissionSet.php
@@ -19,10 +19,10 @@
  *
  */
 
-namespace Friendica\Security\PermissionSet\Depository;
+namespace Friendica\Security\PermissionSet\Repository;
 
 use Exception;
-use Friendica\BaseDepository;
+use Friendica\BaseRepository;
 use Friendica\Database\Database;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
@@ -33,7 +33,7 @@ use Friendica\Security\PermissionSet\Entity;
 use Friendica\Util\ACLFormatter;
 use Psr\Log\LoggerInterface;
 
-class PermissionSet extends BaseDepository
+class PermissionSet extends BaseRepository
 {
 	/** @var int Virtual permission set id for public permission */
 	const PUBLIC = 0;
diff --git a/src/Security/TwoFactor/Collection/TrustedBrowsers.php b/src/Security/TwoFactor/Collection/TrustedBrowsers.php
index 659e16a5b..f3958802b 100644
--- a/src/Security/TwoFactor/Collection/TrustedBrowsers.php
+++ b/src/Security/TwoFactor/Collection/TrustedBrowsers.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Security\TwoFactor\Collection;
 
diff --git a/src/Security/TwoFactor/Factory/TrustedBrowser.php b/src/Security/TwoFactor/Factory/TrustedBrowser.php
index f190474a6..2f5c1a313 100644
--- a/src/Security/TwoFactor/Factory/TrustedBrowser.php
+++ b/src/Security/TwoFactor/Factory/TrustedBrowser.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Security\TwoFactor\Factory;
 
diff --git a/src/Security/TwoFactor/Model/TrustedBrowser.php b/src/Security/TwoFactor/Model/TrustedBrowser.php
index 7acc23785..4a3295cc6 100644
--- a/src/Security/TwoFactor/Model/TrustedBrowser.php
+++ b/src/Security/TwoFactor/Model/TrustedBrowser.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Security\TwoFactor\Model;
 
diff --git a/src/Security/TwoFactor/Repository/TrustedBrowser.php b/src/Security/TwoFactor/Repository/TrustedBrowser.php
index 6d708d367..35407029c 100644
--- a/src/Security/TwoFactor/Repository/TrustedBrowser.php
+++ b/src/Security/TwoFactor/Repository/TrustedBrowser.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Security\TwoFactor\Repository;
 
diff --git a/src/Worker/Contact/RemoveContent.php b/src/Worker/Contact/RemoveContent.php
index f0e6e631d..cdb321411 100644
--- a/src/Worker/Contact/RemoveContent.php
+++ b/src/Worker/Contact/RemoveContent.php
@@ -80,7 +80,7 @@ class RemoveContent
 		DBA::delete('contact-relation', ['relation-cid' => $id]);
 		DBA::delete('contact-relation', ['cid' => $id]);
 		DBA::delete('event', ['cid' => $id]);
-		DBA::delete('fsuggest', ['cid' => $id]);
+		DI::fsuggest()->delete(DI::fsuggest()->selectForContact($id));
 		DBA::delete('post-tag', ['cid' => $id]);
 		DBA::delete('user-contact', ['cid' => $id]);
 
diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index 8961b3f13..36d576cff 100644
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -21,6 +21,8 @@
 
 namespace Friendica\Worker;
 
+use Friendica\Contact\FriendSuggest\Collection\FriendSuggests;
+use Friendica\Contact\FriendSuggest\Exception\FriendSuggestNotFoundException;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
@@ -64,8 +66,10 @@ class Delivery
 			}
 			$uid = $target_item['uid'];
 		} elseif ($cmd == self::SUGGESTION) {
-			$target_item = DBA::selectFirst('fsuggest', [], ['id' => $post_uriid]);
-			if (!DBA::isResult($target_item)) {
+			try {
+				$target_item = DI::fsuggest()->selectOneById($post_uriid)->toArray();
+			} catch (FriendSuggestNotFoundException $e) {
+				DI::logger()->info('Cannot find FriendSuggestion', ['id' => $post_uriid]);
 				return;
 			}
 			$uid = $target_item['uid'];
@@ -209,7 +213,7 @@ class Delivery
 		// Also transmit via Diaspora if this is a direct answer to a Diaspora comment.
 		// This is done since the uri wouldn't match (Diaspora doesn't transmit it)
 		// Also transmit relayed posts from Diaspora contacts via Diaspora.
-		if (($contact['network'] != Protocol::DIASPORA) && in_array(Protocol::DIASPORA, [$parent['network'] ?? '', $thr_parent['network'] ?? '', $target_item['network']])) {
+		if (($contact['network'] != Protocol::DIASPORA) && in_array(Protocol::DIASPORA, [$parent['network'] ?? '', $thr_parent['network'] ?? '', $target_item['network']] ?? '')) {
 			Logger::info('Enforcing the Diaspora protocol', ['id' => $contact['id'], 'network' => $contact['network'], 'parent' => $parent['network'], 'thread-parent' => $thr_parent['network'], 'post' => $target_item['network']]);
 			$contact['network'] = Protocol::DIASPORA;
 		}
@@ -269,7 +273,7 @@ class Delivery
 	private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup, $server_protocol)
 	{
 		// Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora
-		if (Diaspora::isReshare($target_item['body']) && !empty(FContact::getByURL($contact['addr'], false))) {
+		if (Diaspora::isReshare($target_item['body'] ?? '') && !empty(FContact::getByURL($contact['addr'], false))) {
 			Logger::info('Reshare will be transmitted via Diaspora', ['url' => $contact['url'], 'guid' => ($target_item['guid'] ?? '') ?: $target_item['id']]);
 			self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
 			return;
@@ -284,7 +288,7 @@ class Delivery
 		} elseif ($cmd == self::SUGGESTION) {
 			$item = $target_item;
 			$atom = DFRN::fsuggest($item, $owner);
-			DBA::delete('fsuggest', ['id' => $item['id']]);
+			DI::fsuggest()->delete(new FriendSuggests([DI::fsuggest()->selectOneById($item['id'])]));
 		} elseif ($cmd == self::RELOCATION) {
 			$atom = DFRN::relocate($owner, $owner['uid']);
 		} elseif ($followup) {
diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index d69419eb1..16baea281 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -90,7 +90,7 @@ class Notifier
 					'APDelivery', $cmd, $target_id, $inbox, $uid, $receivers, $post_uriid);
 			}
 		} elseif ($cmd == Delivery::SUGGESTION) {
-			$suggest = DI::fsuggest()->getById($target_id);
+			$suggest = DI::fsuggest()->selectOneById($target_id);
 			$uid = $suggest->uid;
 			$recipients[] = $suggest->cid;
 		} elseif ($cmd == Delivery::REMOVAL) {
diff --git a/static/settings.config.php b/static/settings.config.php
index 5d9b430b1..5530163dc 100644
--- a/static/settings.config.php
+++ b/static/settings.config.php
@@ -64,6 +64,10 @@ return [
 		// Themes users can change to in their settings.
 		'allowed_themes' => 'frio,quattro,vier,duepuntozero,smoothly',
 
+		// cache_contact_avatar (Boolean)
+		// Cache versions of the contact avatars. Uses a lot of storage space
+		'cache_contact_avatar' => true,
+
 		// curl_timeout (Integer)
 		// Value is in seconds. Set to 0 for unlimited (not recommended).
 		'curl_timeout' =>  60,
diff --git a/tests/src/Contact/FriendSuggest/Factory/FriendSuggestTest.php b/tests/src/Contact/FriendSuggest/Factory/FriendSuggestTest.php
new file mode 100644
index 000000000..afa0711ae
--- /dev/null
+++ b/tests/src/Contact/FriendSuggest/Factory/FriendSuggestTest.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace Friendica\Test\src\Contact\FriendSuggest\Factory;
+
+use Friendica\Contact\FriendSuggest\Factory\FriendSuggest;
+use Friendica\Contact\FriendSuggest\Entity;
+use Friendica\Test\MockedTest;
+use Friendica\Util\Logger\VoidLogger;
+
+class FriendSuggestTest extends MockedTest
+{
+	public function dataCreate()
+	{
+		return [
+			'default' => [
+				'input' => [
+					'uid'     => 12,
+					'cid'     => 13,
+					'name'    => 'test',
+					'url'     => 'https://friendica.local/profile/test',
+					'request' => 'https://friendica.local/dfrn_request/test',
+					'photo'   => 'https://friendica.local/photo/profile/test',
+					'note'    => 'a common note',
+					'created' => '2021-10-12 12:23:00'
+				],
+				'assertion' => new Entity\FriendSuggest(
+					12,
+					13,
+					'test',
+					'https://friendica.local/profile/test',
+					'https://friendica.local/dfrn_request/test',
+					'https://friendica.local/photo/profile/test',
+					'a common note',
+					new \DateTime('2021-10-12 12:23:00', new \DateTimeZone('UTC'))
+				),
+			],
+			'minimum' => [
+				'input' => [
+					'id' => 20,
+				],
+				'assertion' => new Entity\FriendSuggest(
+					0,
+					0,
+					'',
+					'',
+					'',
+					'',
+					'',
+					new \DateTime('now', new \DateTimeZone('URC')),
+					28
+				),
+			],
+			'full' => [
+				'input' => [
+					'uid'     => 12,
+					'cid'     => 13,
+					'name'    => 'test',
+					'url'     => 'https://friendica.local/profile/test',
+					'request' => 'https://friendica.local/dfrn_request/test',
+					'photo'   => 'https://friendica.local/photo/profile/test',
+					'note'    => 'a common note',
+					'created' => '2021-10-12 12:23:00',
+					'id'      => 666,
+				],
+				'assertion' => new Entity\FriendSuggest(
+					12,
+					13,
+					'test',
+					'https://friendica.local/profile/test',
+					'https://friendica.local/dfrn_request/test',
+					'https://friendica.local/photo/profile/test',
+					'a common note',
+					new \DateTime('2021-10-12 12:23:00', new \DateTimeZone('UTC')),
+					666
+				),
+			],
+		];
+	}
+
+	public function assertFriendSuggest(Entity\FriendSuggest $assertion, Entity\FriendSuggest $friendSuggest)
+	{
+		self::assertEquals($assertion->id, $friendSuggest->id);
+		self::assertEquals($assertion->uid, $friendSuggest->uid);
+		self::assertEquals($assertion->cid, $friendSuggest->cid);
+		self::assertEquals($assertion->name, $friendSuggest->name);
+		self::assertEquals($assertion->url, $friendSuggest->url);
+		self::assertEquals($assertion->request, $friendSuggest->request);
+		self::assertEquals($assertion->photo, $friendSuggest->photo);
+		self::assertEquals($assertion->note, $friendSuggest->note);
+	}
+
+	public function testCreateNew()
+	{
+		$factory = new FriendSuggest(new VoidLogger());
+
+		$this->assertFriendSuggest(
+			$factory->createNew(12, 13),
+			new Entity\FriendSuggest(12, 13, '', '', '', '', '',
+				new \DateTime('now', new \DateTimeZone('UTC')), null
+			)
+		);
+	}
+
+	/**
+	 * @dataProvider dataCreate
+	 */
+	public function testCreateFromTableRow(array $input, Entity\FriendSuggest $assertion)
+	{
+		$factory = new FriendSuggest(new VoidLogger());
+
+		$this->assertFriendSuggest($factory->createFromTableRow($input), $assertion);
+	}
+
+	public function testCreateEmpty()
+	{
+		$factory = new FriendSuggest(new VoidLogger());
+
+		$this->assertFriendSuggest($factory->createEmpty(66), new Entity\FriendSuggest(0, 0, '', '', '', '', '',
+			new \DateTime('now', new \DateTimeZone('UTC')), 66
+		));
+	}
+}
diff --git a/tests/src/Profile/ProfileField/Entity/ProfileFieldTest.php b/tests/src/Profile/ProfileField/Entity/ProfileFieldTest.php
index 8acd1d94c..275a1d597 100644
--- a/tests/src/Profile/ProfileField/Entity/ProfileFieldTest.php
+++ b/tests/src/Profile/ProfileField/Entity/ProfileFieldTest.php
@@ -6,7 +6,7 @@ use Friendica\Profile\ProfileField\Entity\ProfileField;
 use Friendica\Profile\ProfileField\Exception\ProfileFieldNotFoundException;
 use Friendica\Profile\ProfileField\Exception\UnexpectedPermissionSetException;
 use Friendica\Profile\ProfileField\Factory\ProfileField as ProfileFieldFactory;
-use Friendica\Security\PermissionSet\Depository\PermissionSet as PermissionSetDepository;
+use Friendica\Security\PermissionSet\Repository\PermissionSet as PermissionSetRepository;
 use Friendica\Security\PermissionSet\Factory\PermissionSet as PermissionSetFactory;
 use Friendica\Test\MockedTest;
 use Friendica\Util\ACLFormatter;
@@ -16,8 +16,8 @@ use Mockery\MockInterface;
 
 class ProfileFieldTest extends MockedTest
 {
-	/** @var MockInterface|PermissionSetDepository */
-	protected $permissionSetDepository;
+	/** @var MockInterface|PermissionSetRepository */
+	protected $permissionSetRepository;
 	/** @var ProfileFieldFactory */
 	protected $profileFieldFactory;
 	/** @var MockInterface|PermissionSetFactory */
@@ -27,7 +27,7 @@ class ProfileFieldTest extends MockedTest
 	{
 		parent::setUp();
 
-		$this->permissionSetDepository = \Mockery::mock(PermissionSetDepository::class);
+		$this->permissionSetRepository = \Mockery::mock(PermissionSetRepository::class);
 		$this->permissionSetFactory    = new PermissionSetFactory(new VoidLogger(), new ACLFormatter());
 		$this->profileFieldFactory     = new ProfileFieldFactory(new VoidLogger(), $this->permissionSetFactory);
 	}
@@ -180,7 +180,7 @@ class ProfileFieldTest extends MockedTest
 
 		$permissionSet = $this->permissionSetFactory->createFromTableRow(['uid' => $uid, 'id' => $psid]);
 
-		$this->permissionSetDepository->shouldReceive('selectOneById')->with($psid, $uid)->andReturns($permissionSet);
+		$this->permissionSetRepository->shouldReceive('selectOneById')->with($psid, $uid)->andReturns($permissionSet);
 
 		self::assertEquals($psid, $entity->permissionSet->id);
 	}
diff --git a/tests/src/Profile/ProfileField/Depository/ProfileFieldTest.php b/tests/src/Profile/ProfileField/Repository/ProfileFieldTest.php
similarity index 84%
rename from tests/src/Profile/ProfileField/Depository/ProfileFieldTest.php
rename to tests/src/Profile/ProfileField/Repository/ProfileFieldTest.php
index 87ea6ca9c..0da41f51c 100644
--- a/tests/src/Profile/ProfileField/Depository/ProfileFieldTest.php
+++ b/tests/src/Profile/ProfileField/Repository/ProfileFieldTest.php
@@ -1,27 +1,27 @@
 <?php
 
-namespace Friendica\Test\src\Profile\ProfileField\Depository;
+namespace Friendica\Test\src\Profile\ProfileField\Repository;
 
 use Friendica\Profile\ProfileField\Collection\ProfileFields;
-use Friendica\Profile\ProfileField\Depository\ProfileField as ProfileFieldDepository;
+use Friendica\Profile\ProfileField\Repository\ProfileField as ProfileFieldRepository;
 use Friendica\Profile\ProfileField\Exception\ProfileFieldPersistenceException;
 use Friendica\Profile\ProfileField\Factory\ProfileField as ProfileFieldFactory;
-use Friendica\Security\PermissionSet\Depository\PermissionSet;
+use Friendica\Security\PermissionSet\Repository\PermissionSet;
 use Friendica\Security\PermissionSet\Factory\PermissionSet as PermissionSetFactory;
-use Friendica\Security\PermissionSet\Depository\PermissionSet as PermissionSetDepository;
+use Friendica\Security\PermissionSet\Repository\PermissionSet as PermissionSetRepository;
 use Friendica\Test\FixtureTest;
 use Friendica\DI;
 
 class ProfileFieldTest extends FixtureTest
 {
-	/** @var ProfileFieldDepository */
+	/** @var ProfileFieldRepository */
 	private $depository;
 	/** @var ProfileFieldFactory */
 	private $factory;
 	/** @var PermissionSetFactory */
 	private $permissionSetFactory;
-	/** @var PermissionSetDepository */
-	private $permissionSetDepository;
+	/** @var PermissionSetRepository */
+	private $permissionSetRepository;
 
 	public function setUp(): void
 	{
@@ -30,7 +30,7 @@ class ProfileFieldTest extends FixtureTest
 		$this->depository              = DI::profileField();
 		$this->factory                 = DI::profileFieldFactory();
 		$this->permissionSetFactory    = DI::permissionSetFactory();
-		$this->permissionSetDepository = DI::permissionSet();
+		$this->permissionSetRepository = DI::permissionSet();
 	}
 
 	/**
@@ -53,7 +53,7 @@ class ProfileFieldTest extends FixtureTest
 	 */
 	public function testSaveNew()
 	{
-		$profileField = $this->factory->createFromValues(42, 0, 'public', 'value', $this->permissionSetDepository->save($this->permissionSetFactory->createFromString(42, '', '<~>')));
+		$profileField = $this->factory->createFromValues(42, 0, 'public', 'value', $this->permissionSetRepository->save($this->permissionSetFactory->createFromString(42, '', '<~>')));
 
 		self::assertEquals($profileField->uid, $profileField->permissionSet->uid);
 
@@ -75,7 +75,7 @@ class ProfileFieldTest extends FixtureTest
 	 */
 	public function testUpdateOrder()
 	{
-		$profileField = $this->factory->createFromValues(42, 0, 'public', 'value', $this->permissionSetDepository->save($this->permissionSetFactory->createFromString(42, '', '<~>')));
+		$profileField = $this->factory->createFromValues(42, 0, 'public', 'value', $this->permissionSetRepository->save($this->permissionSetFactory->createFromString(42, '', '<~>')));
 
 		self::assertEquals($profileField->uid, $profileField->permissionSet->uid);
 
@@ -108,7 +108,7 @@ class ProfileFieldTest extends FixtureTest
 	 */
 	public function testUpdate()
 	{
-		$profileField = $this->factory->createFromValues(42, 0, 'public', 'value', $this->permissionSetDepository->save($this->permissionSetFactory->createFromString(42, '', '<~>')));
+		$profileField = $this->factory->createFromValues(42, 0, 'public', 'value', $this->permissionSetRepository->save($this->permissionSetFactory->createFromString(42, '', '<~>')));
 
 		self::assertEquals($profileField->uid, $profileField->permissionSet->uid);
 
@@ -121,12 +121,12 @@ class ProfileFieldTest extends FixtureTest
 
 		self::assertEquals($savedProfileField, $selectedProfileField);
 
-		$savedProfileField->update('another', 5, $this->permissionSetDepository->selectPublicForUser(42));
+		$savedProfileField->update('another', 5, $this->permissionSetRepository->selectPublicForUser(42));
 		self::assertEquals(PermissionSet::PUBLIC, $savedProfileField->permissionSet->id);
 
 		$publicProfileField = $this->depository->save($savedProfileField);
 
-		self::assertEquals($this->permissionSetDepository->selectPublicForUser(42), $publicProfileField->permissionSet);
+		self::assertEquals($this->permissionSetRepository->selectPublicForUser(42), $publicProfileField->permissionSet);
 		self::assertEquals('another', $publicProfileField->value);
 		self::assertEquals(5, $publicProfileField->order);
 
diff --git a/tests/src/Security/PermissionSet/Depository/PermissionSetTest.php b/tests/src/Security/PermissionSet/Repository/PermissionSetTest.php
similarity index 67%
rename from tests/src/Security/PermissionSet/Depository/PermissionSetTest.php
rename to tests/src/Security/PermissionSet/Repository/PermissionSetTest.php
index 596b1e6c1..697c5885f 100644
--- a/tests/src/Security/PermissionSet/Depository/PermissionSetTest.php
+++ b/tests/src/Security/PermissionSet/Repository/PermissionSetTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Friendica\Test\src\Security\PermissionSet\Depository;
+namespace Friendica\Test\src\Security\PermissionSet\Repository;
 
-use Friendica\Security\PermissionSet\Depository\PermissionSet as PermissionSetDepository;
+use Friendica\Security\PermissionSet\Repository\PermissionSet as PermissionSetRepository;
 use Friendica\Security\PermissionSet\Entity\PermissionSet;
 use Friendica\Security\PermissionSet\Factory\PermissionSet as PermissionSetFactory;
 use Friendica\Test\FixtureTest;
@@ -10,8 +10,8 @@ use Friendica\DI;
 
 class PermissionSetTest extends FixtureTest
 {
-	/** @var PermissionSetDepository */
-	private $depository;
+	/** @var PermissionSetRepository */
+	private $repository;
 	/** @var PermissionSetFactory */
 	private $factory;
 
@@ -19,20 +19,20 @@ class PermissionSetTest extends FixtureTest
 	{
 		parent::setUp();
 
-		$this->depository = DI::permissionSet();
+		$this->repository = DI::permissionSet();
 		$this->factory    = DI::permissionSetFactory();
 	}
 
 	public function testSelectOneByIdPublic()
 	{
-		$permissionSet = $this->depository->selectPublicForUser(1);
+		$permissionSet = $this->repository->selectPublicForUser(1);
 
 		$this->assertInstanceOf(PermissionSet::class, $permissionSet);
 		self::assertEmpty($permissionSet->allow_cid);
 		self::assertEmpty($permissionSet->allow_gid);
 		self::assertEmpty($permissionSet->deny_cid);
 		self::assertEmpty($permissionSet->deny_gid);
-		self::assertEmpty(PermissionSetDepository::PUBLIC, $permissionSet->id);
+		self::assertEmpty(PermissionSetRepository::PUBLIC, $permissionSet->id);
 		self::assertEquals(1, $permissionSet->uid);
 	}
 
@@ -43,21 +43,21 @@ class PermissionSetTest extends FixtureTest
 	{
 		$permissionSet = $this->factory->createFromString(42, '', '<~>');
 
-		$permissionSet = $this->depository->selectOrCreate($permissionSet);
+		$permissionSet = $this->repository->selectOrCreate($permissionSet);
 
 		self::assertNotNull($permissionSet->id);
 
-		$permissionSetSelected = $this->depository->selectOneById($permissionSet->id, 42);
+		$permissionSetSelected = $this->repository->selectOneById($permissionSet->id, 42);
 
 		self::assertEquals($permissionSet, $permissionSetSelected);
 
 		$newPermissionSet   = $permissionSet->withAllowedContacts(['1', '2']);
-		$savedPermissionSet = $this->depository->save($newPermissionSet);
+		$savedPermissionSet = $this->repository->save($newPermissionSet);
 
 		self::assertNotNull($savedPermissionSet->id);
 		self::assertNull($newPermissionSet->id);
 
-		$permissionSetSavedSelected = $this->depository->selectOneById($savedPermissionSet->id, 42);
+		$permissionSetSavedSelected = $this->repository->selectOneById($savedPermissionSet->id, 42);
 
 		self::assertEquals($savedPermissionSet, $permissionSetSavedSelected);
 	}
diff --git a/update.php b/update.php
index 85f407d36..a2999ed5a 100644
--- a/update.php
+++ b/update.php
@@ -55,7 +55,7 @@ use Friendica\Model\Photo;
 use Friendica\Model\Post;
 use Friendica\Model\Profile;
 use Friendica\Model\Storage;
-use Friendica\Security\PermissionSet\Depository\PermissionSet;
+use Friendica\Security\PermissionSet\Repository\PermissionSet;
 use Friendica\Worker\Delivery;
 
 // Post-update script of PR 5751
diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index f451cfc14..d71fea26f 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2021.12-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-20 15:10+0200\n"
+"POT-Creation-Date: 2021-10-24 23:21-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -51,10 +51,10 @@ msgstr ""
 #: src/Module/BaseApi.php:97 src/Module/BaseApi.php:106
 #: src/Module/BaseNotifications.php:88 src/Module/Contact.php:328
 #: src/Module/Contact/Advanced.php:44 src/Module/Delegation.php:118
-#: src/Module/FollowConfirm.php:16 src/Module/FriendSuggest.php:44
+#: src/Module/FollowConfirm.php:17 src/Module/FriendSuggest.php:44
 #: src/Module/Group.php:45 src/Module/Group.php:90 src/Module/Invite.php:41
-#: src/Module/Invite.php:130 src/Module/Notifications/Notification.php:47
-#: src/Module/Notifications/Notification.php:76
+#: src/Module/Invite.php:130 src/Module/Notifications/Notification.php:48
+#: src/Module/Notifications/Notification.php:79
 #: src/Module/Profile/Common.php:56 src/Module/Profile/Contacts.php:56
 #: src/Module/Profile/Schedule.php:39 src/Module/Profile/Schedule.php:56
 #: src/Module/Register.php:64 src/Module/Register.php:77
@@ -62,7 +62,7 @@ msgstr ""
 #: src/Module/Search/Directory.php:38 src/Module/Settings/Delegation.php:42
 #: src/Module/Settings/Delegation.php:70 src/Module/Settings/Display.php:43
 #: src/Module/Settings/Display.php:121
-#: src/Module/Settings/Profile/Photo/Crop.php:164
+#: src/Module/Settings/Profile/Photo/Crop.php:166
 #: src/Module/Settings/Profile/Photo/Index.php:112
 #: src/Module/Settings/UserExport.php:58 src/Module/Settings/UserExport.php:93
 #: src/Module/Settings/UserExport.php:198
@@ -365,7 +365,7 @@ msgid "Event Finishes:"
 msgstr ""
 
 #: mod/events.php:506 src/Module/Profile/Profile.php:172
-#: src/Module/Settings/Profile/Index.php:237
+#: src/Module/Settings/Profile/Index.php:239
 msgid "Description:"
 msgstr ""
 
@@ -393,11 +393,11 @@ msgstr ""
 #: src/Module/Debug/ActivityPubConversion.php:141
 #: src/Module/Debug/Babel.php:313 src/Module/Debug/Localtime.php:64
 #: src/Module/Debug/Probe.php:56 src/Module/Debug/WebFinger.php:53
-#: src/Module/Delegation.php:147 src/Module/FriendSuggest.php:129
+#: src/Module/Delegation.php:147 src/Module/FriendSuggest.php:128
 #: src/Module/Install.php:245 src/Module/Install.php:287
 #: src/Module/Install.php:324 src/Module/Invite.php:177
 #: src/Module/Item/Compose.php:150 src/Module/Profile/Profile.php:247
-#: src/Module/Settings/Profile/Index.php:221 src/Object/Post.php:963
+#: src/Module/Settings/Profile/Index.php:223 src/Object/Post.php:963
 #: view/theme/duepuntozero/config.php:69 view/theme/frio/config.php:160
 #: view/theme/quattro/config.php:71 view/theme/vier/config.php:119
 msgid "Submit"
@@ -407,7 +407,7 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: mod/events.php:521 src/Module/Admin/Site.php:505 src/Module/Contact.php:863
+#: mod/events.php:521 src/Module/Admin/Site.php:507 src/Module/Contact.php:863
 #: src/Module/Profile/Profile.php:249
 msgid "Advanced"
 msgstr ""
@@ -451,7 +451,7 @@ msgid "OStatus support is disabled. Contact can't be added."
 msgstr ""
 
 #: mod/follow.php:138 src/Content/Item.php:463 src/Content/Widget.php:76
-#: src/Model/Contact.php:1071 src/Model/Contact.php:1083
+#: src/Model/Contact.php:1072 src/Model/Contact.php:1084
 #: view/theme/vier/theme.php:172
 msgid "Connect/Follow"
 msgstr ""
@@ -693,7 +693,7 @@ msgstr ""
 
 #: mod/message.php:120 src/Module/Notifications/Introductions.php:113
 #: src/Module/Notifications/Introductions.php:148
-#: src/Module/Notifications/Notification.php:56
+#: src/Module/Notifications/Notification.php:57
 msgid "Discard"
 msgstr ""
 
@@ -1114,11 +1114,11 @@ msgstr ""
 #: mod/redir.php:55 mod/redir.php:129 src/Module/Contact/Advanced.php:54
 #: src/Module/Contact/Advanced.php:105 src/Module/Contact/Contacts.php:36
 #: src/Module/Contact/Media.php:43 src/Module/FriendSuggest.php:54
-#: src/Module/FriendSuggest.php:93 src/Module/Group.php:105
+#: src/Module/FriendSuggest.php:92 src/Module/Group.php:105
 msgid "Contact not found."
 msgstr ""
 
-#: mod/removeme.php:63 src/Navigation/Notifications/Depository/Notify.php:454
+#: mod/removeme.php:63 src/Navigation/Notifications/Repository/Notify.php:454
 msgid "[Friendica System Notify]"
 msgstr ""
 
@@ -1264,7 +1264,7 @@ msgstr ""
 
 #: mod/settings.php:474 mod/settings.php:565 mod/settings.php:702
 #: src/Module/Admin/Addons/Index.php:69 src/Module/Admin/Features.php:87
-#: src/Module/Admin/Logs/Settings.php:82 src/Module/Admin/Site.php:500
+#: src/Module/Admin/Logs/Settings.php:82 src/Module/Admin/Site.php:502
 #: src/Module/Admin/Themes/Index.php:113 src/Module/Admin/Tos.php:66
 #: src/Module/Settings/Delegation.php:170 src/Module/Settings/Display.php:194
 msgid "Save Settings"
@@ -2129,8 +2129,8 @@ msgid "All contacts"
 msgstr ""
 
 #: src/BaseModule.php:212 src/Content/Widget.php:231 src/Core/ACL.php:193
-#: src/Module/Contact.php:756 src/Module/PermissionTooltip.php:75
-#: src/Module/PermissionTooltip.php:97
+#: src/Module/Contact.php:756 src/Module/PermissionTooltip.php:79
+#: src/Module/PermissionTooltip.php:101
 msgid "Followers"
 msgstr ""
 
@@ -2736,31 +2736,31 @@ msgstr ""
 msgid "Follow Thread"
 msgstr ""
 
-#: src/Content/Item.php:443 src/Model/Contact.php:1076
+#: src/Content/Item.php:443 src/Model/Contact.php:1077
 msgid "View Status"
 msgstr ""
 
-#: src/Content/Item.php:444 src/Content/Item.php:466 src/Model/Contact.php:1010
-#: src/Model/Contact.php:1068 src/Model/Contact.php:1077
-#: src/Module/Directory.php:160 src/Module/Settings/Profile/Index.php:224
+#: src/Content/Item.php:444 src/Content/Item.php:466 src/Model/Contact.php:1011
+#: src/Model/Contact.php:1069 src/Model/Contact.php:1078
+#: src/Module/Directory.php:160 src/Module/Settings/Profile/Index.php:226
 msgid "View Profile"
 msgstr ""
 
-#: src/Content/Item.php:445 src/Model/Contact.php:1078
+#: src/Content/Item.php:445 src/Model/Contact.php:1079
 msgid "View Photos"
 msgstr ""
 
-#: src/Content/Item.php:446 src/Model/Contact.php:1069
-#: src/Model/Contact.php:1079
+#: src/Content/Item.php:446 src/Model/Contact.php:1070
+#: src/Model/Contact.php:1080
 msgid "Network Posts"
 msgstr ""
 
-#: src/Content/Item.php:447 src/Model/Contact.php:1070
-#: src/Model/Contact.php:1080
+#: src/Content/Item.php:447 src/Model/Contact.php:1071
+#: src/Model/Contact.php:1081
 msgid "View Contact"
 msgstr ""
 
-#: src/Content/Item.php:448 src/Model/Contact.php:1081
+#: src/Content/Item.php:448 src/Model/Contact.php:1082
 msgid "Send PM"
 msgstr ""
 
@@ -2775,7 +2775,7 @@ msgstr ""
 #: src/Module/Contact.php:788 src/Module/Contact.php:1072
 #: src/Module/Notifications/Introductions.php:112
 #: src/Module/Notifications/Introductions.php:184
-#: src/Module/Notifications/Notification.php:59
+#: src/Module/Notifications/Notification.php:61
 msgid "Ignore"
 msgstr ""
 
@@ -2783,7 +2783,7 @@ msgstr ""
 msgid "Languages"
 msgstr ""
 
-#: src/Content/Item.php:458 src/Model/Contact.php:1082
+#: src/Content/Item.php:458 src/Model/Contact.php:1083
 msgid "Poke"
 msgstr ""
 
@@ -3235,7 +3235,7 @@ msgstr ""
 msgid "Organisations"
 msgstr ""
 
-#: src/Content/Widget.php:522 src/Model/Contact.php:1503
+#: src/Content/Widget.php:522 src/Model/Contact.php:1506
 msgid "News"
 msgstr ""
 
@@ -3312,8 +3312,8 @@ msgstr ""
 msgid "Yourself"
 msgstr ""
 
-#: src/Core/ACL.php:200 src/Module/PermissionTooltip.php:81
-#: src/Module/PermissionTooltip.php:103
+#: src/Core/ACL.php:200 src/Module/PermissionTooltip.php:85
+#: src/Module/PermissionTooltip.php:107
 msgid "Mutuals"
 msgstr ""
 
@@ -4046,87 +4046,86 @@ msgstr ""
 msgid "Legacy module file not found: %s"
 msgstr ""
 
-#: src/Model/Contact.php:1072 src/Model/Contact.php:1084
+#: src/Model/Contact.php:1073 src/Model/Contact.php:1085
 msgid "UnFollow"
 msgstr ""
 
-#: src/Model/Contact.php:1090 src/Module/Admin/Users/Pending.php:107
+#: src/Model/Contact.php:1091 src/Module/Admin/Users/Pending.php:107
 #: src/Module/Notifications/Introductions.php:110
 #: src/Module/Notifications/Introductions.php:182
 msgid "Approve"
 msgstr ""
 
-#: src/Model/Contact.php:1499
+#: src/Model/Contact.php:1502
 msgid "Organisation"
 msgstr ""
 
-#: src/Model/Contact.php:1507
+#: src/Model/Contact.php:1510
 msgid "Forum"
 msgstr ""
 
-#: src/Model/Contact.php:2366
+#: src/Model/Contact.php:2380
 msgid "Disallowed profile URL."
 msgstr ""
 
-#: src/Model/Contact.php:2371 src/Module/Friendica.php:81
+#: src/Model/Contact.php:2385 src/Module/Friendica.php:81
 msgid "Blocked domain"
 msgstr ""
 
-#: src/Model/Contact.php:2376
+#: src/Model/Contact.php:2390
 msgid "Connect URL missing."
 msgstr ""
 
-#: src/Model/Contact.php:2385
+#: src/Model/Contact.php:2399
 msgid ""
 "The contact could not be added. Please check the relevant network "
 "credentials in your Settings -> Social Networks page."
 msgstr ""
 
-#: src/Model/Contact.php:2422
+#: src/Model/Contact.php:2436
 msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: src/Model/Contact.php:2424
+#: src/Model/Contact.php:2438
 msgid "No compatible communication protocols or feeds were discovered."
 msgstr ""
 
-#: src/Model/Contact.php:2427
+#: src/Model/Contact.php:2441
 msgid "An author or name was not found."
 msgstr ""
 
-#: src/Model/Contact.php:2430
+#: src/Model/Contact.php:2444
 msgid "No browser URL could be matched to this address."
 msgstr ""
 
-#: src/Model/Contact.php:2433
+#: src/Model/Contact.php:2447
 msgid ""
 "Unable to match @-style Identity Address with a known protocol or email "
 "contact."
 msgstr ""
 
-#: src/Model/Contact.php:2434
+#: src/Model/Contact.php:2448
 msgid "Use mailto: in front of address to force email check."
 msgstr ""
 
-#: src/Model/Contact.php:2440
+#: src/Model/Contact.php:2454
 msgid ""
 "The profile address specified belongs to a network which has been disabled "
 "on this site."
 msgstr ""
 
-#: src/Model/Contact.php:2445
+#: src/Model/Contact.php:2459
 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
 msgstr ""
 
-#: src/Model/Contact.php:2504
+#: src/Model/Contact.php:2518
 msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: src/Model/Event.php:52 src/Model/Event.php:853
-#: src/Module/Debug/Localtime.php:38
-msgid "l F d, Y \\@ g:i A"
+#: src/Model/Event.php:52
+msgid "l F d, Y \\@ g:i A \\G\\M\\TP (e)"
 msgstr ""
 
 #: src/Model/Event.php:73 src/Model/Event.php:90 src/Model/Event.php:464
@@ -4167,6 +4166,10 @@ msgstr ""
 msgid "Delete event"
 msgstr ""
 
+#: src/Model/Event.php:853 src/Module/Debug/Localtime.php:38
+msgid "l F d, Y \\@ g:i A"
+msgstr ""
+
 #: src/Model/Event.php:854
 msgid "D g:i A"
 msgstr ""
@@ -4708,7 +4711,7 @@ msgstr ""
 #: src/Module/Admin/Blocklist/Server.php:88 src/Module/Admin/Federation.php:159
 #: src/Module/Admin/Item/Delete.php:65 src/Module/Admin/Logs/Settings.php:80
 #: src/Module/Admin/Logs/View.php:83 src/Module/Admin/Queue.php:72
-#: src/Module/Admin/Site.php:497 src/Module/Admin/Storage.php:139
+#: src/Module/Admin/Site.php:499 src/Module/Admin/Storage.php:139
 #: src/Module/Admin/Summary.php:233 src/Module/Admin/Themes/Details.php:90
 #: src/Module/Admin/Themes/Index.php:111 src/Module/Admin/Tos.php:58
 #: src/Module/Admin/Users/Active.php:136 src/Module/Admin/Users/Blocked.php:137
@@ -5337,464 +5340,464 @@ msgstr ""
 msgid "Relocation started. Could take a while to complete."
 msgstr ""
 
-#: src/Module/Admin/Site.php:402 src/Module/Settings/Display.php:139
+#: src/Module/Admin/Site.php:404 src/Module/Settings/Display.php:139
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: src/Module/Admin/Site.php:419 src/Module/Settings/Display.php:149
+#: src/Module/Admin/Site.php:421 src/Module/Settings/Display.php:149
 #, php-format
 msgid "%s - (Experimental)"
 msgstr ""
 
-#: src/Module/Admin/Site.php:431
+#: src/Module/Admin/Site.php:433
 msgid "No community page for local users"
 msgstr ""
 
-#: src/Module/Admin/Site.php:432
+#: src/Module/Admin/Site.php:434
 msgid "No community page"
 msgstr ""
 
-#: src/Module/Admin/Site.php:433
+#: src/Module/Admin/Site.php:435
 msgid "Public postings from users of this site"
 msgstr ""
 
-#: src/Module/Admin/Site.php:434
+#: src/Module/Admin/Site.php:436
 msgid "Public postings from the federated network"
 msgstr ""
 
-#: src/Module/Admin/Site.php:435
+#: src/Module/Admin/Site.php:437
 msgid "Public postings from local users and the federated network"
 msgstr ""
 
-#: src/Module/Admin/Site.php:441
+#: src/Module/Admin/Site.php:443
 msgid "Multi user instance"
 msgstr ""
 
-#: src/Module/Admin/Site.php:468
+#: src/Module/Admin/Site.php:470
 msgid "Closed"
 msgstr ""
 
-#: src/Module/Admin/Site.php:469
+#: src/Module/Admin/Site.php:471
 msgid "Requires approval"
 msgstr ""
 
-#: src/Module/Admin/Site.php:470
+#: src/Module/Admin/Site.php:472
 msgid "Open"
 msgstr ""
 
-#: src/Module/Admin/Site.php:474 src/Module/Install.php:215
+#: src/Module/Admin/Site.php:476 src/Module/Install.php:215
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: src/Module/Admin/Site.php:475 src/Module/Install.php:216
+#: src/Module/Admin/Site.php:477 src/Module/Install.php:216
 msgid "Force all links to use SSL"
 msgstr ""
 
-#: src/Module/Admin/Site.php:476 src/Module/Install.php:217
+#: src/Module/Admin/Site.php:478 src/Module/Install.php:217
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: src/Module/Admin/Site.php:480
+#: src/Module/Admin/Site.php:482
 msgid "Don't check"
 msgstr ""
 
-#: src/Module/Admin/Site.php:481
+#: src/Module/Admin/Site.php:483
 msgid "check the stable version"
 msgstr ""
 
-#: src/Module/Admin/Site.php:482
+#: src/Module/Admin/Site.php:484
 msgid "check the development version"
 msgstr ""
 
-#: src/Module/Admin/Site.php:486
+#: src/Module/Admin/Site.php:488
 msgid "none"
 msgstr ""
 
-#: src/Module/Admin/Site.php:487
+#: src/Module/Admin/Site.php:489
 msgid "Local contacts"
 msgstr ""
 
-#: src/Module/Admin/Site.php:488
+#: src/Module/Admin/Site.php:490
 msgid "Interactors"
 msgstr ""
 
-#: src/Module/Admin/Site.php:498 src/Module/BaseAdmin.php:90
+#: src/Module/Admin/Site.php:500 src/Module/BaseAdmin.php:90
 msgid "Site"
 msgstr ""
 
-#: src/Module/Admin/Site.php:499
+#: src/Module/Admin/Site.php:501
 msgid "General Information"
 msgstr ""
 
-#: src/Module/Admin/Site.php:501
+#: src/Module/Admin/Site.php:503
 msgid "Republish users to directory"
 msgstr ""
 
-#: src/Module/Admin/Site.php:502 src/Module/Register.php:141
+#: src/Module/Admin/Site.php:504 src/Module/Register.php:141
 msgid "Registration"
 msgstr ""
 
-#: src/Module/Admin/Site.php:503
+#: src/Module/Admin/Site.php:505
 msgid "File upload"
 msgstr ""
 
-#: src/Module/Admin/Site.php:504
+#: src/Module/Admin/Site.php:506
 msgid "Policies"
 msgstr ""
 
-#: src/Module/Admin/Site.php:506
+#: src/Module/Admin/Site.php:508
 msgid "Auto Discovered Contact Directory"
 msgstr ""
 
-#: src/Module/Admin/Site.php:507
+#: src/Module/Admin/Site.php:509
 msgid "Performance"
 msgstr ""
 
-#: src/Module/Admin/Site.php:508
+#: src/Module/Admin/Site.php:510
 msgid "Worker"
 msgstr ""
 
-#: src/Module/Admin/Site.php:509
+#: src/Module/Admin/Site.php:511
 msgid "Message Relay"
 msgstr ""
 
-#: src/Module/Admin/Site.php:510
+#: src/Module/Admin/Site.php:512
 msgid ""
 "Use the command \"console relay\" in the command line to add or remove "
 "relays."
 msgstr ""
 
-#: src/Module/Admin/Site.php:511
+#: src/Module/Admin/Site.php:513
 msgid "The system is not subscribed to any relays at the moment."
 msgstr ""
 
-#: src/Module/Admin/Site.php:512
+#: src/Module/Admin/Site.php:514
 msgid "The system is currently subscribed to the following relays:"
 msgstr ""
 
-#: src/Module/Admin/Site.php:514
+#: src/Module/Admin/Site.php:516
 msgid "Relocate Instance"
 msgstr ""
 
-#: src/Module/Admin/Site.php:515
+#: src/Module/Admin/Site.php:517
 msgid ""
 "<strong>Warning!</strong> Advanced function. Could make this server "
 "unreachable."
 msgstr ""
 
-#: src/Module/Admin/Site.php:519
+#: src/Module/Admin/Site.php:521
 msgid "Site name"
 msgstr ""
 
-#: src/Module/Admin/Site.php:520
+#: src/Module/Admin/Site.php:522
 msgid "Sender Email"
 msgstr ""
 
-#: src/Module/Admin/Site.php:520
+#: src/Module/Admin/Site.php:522
 msgid ""
 "The email address your server shall use to send notification emails from."
 msgstr ""
 
-#: src/Module/Admin/Site.php:521
+#: src/Module/Admin/Site.php:523
 msgid "Name of the system actor"
 msgstr ""
 
-#: src/Module/Admin/Site.php:521
+#: src/Module/Admin/Site.php:523
 msgid ""
 "Name of the internal system account that is used to perform ActivityPub "
 "requests. This must be an unused username. If set, this can't be changed "
 "again."
 msgstr ""
 
-#: src/Module/Admin/Site.php:522
+#: src/Module/Admin/Site.php:524
 msgid "Banner/Logo"
 msgstr ""
 
-#: src/Module/Admin/Site.php:523
+#: src/Module/Admin/Site.php:525
 msgid "Email Banner/Logo"
 msgstr ""
 
-#: src/Module/Admin/Site.php:524
+#: src/Module/Admin/Site.php:526
 msgid "Shortcut icon"
 msgstr ""
 
-#: src/Module/Admin/Site.php:524
+#: src/Module/Admin/Site.php:526
 msgid "Link to an icon that will be used for browsers."
 msgstr ""
 
-#: src/Module/Admin/Site.php:525
+#: src/Module/Admin/Site.php:527
 msgid "Touch icon"
 msgstr ""
 
-#: src/Module/Admin/Site.php:525
+#: src/Module/Admin/Site.php:527
 msgid "Link to an icon that will be used for tablets and mobiles."
 msgstr ""
 
-#: src/Module/Admin/Site.php:526
+#: src/Module/Admin/Site.php:528
 msgid "Additional Info"
 msgstr ""
 
-#: src/Module/Admin/Site.php:526
+#: src/Module/Admin/Site.php:528
 #, php-format
 msgid ""
 "For public servers: you can add additional information here that will be "
 "listed at %s/servers."
 msgstr ""
 
-#: src/Module/Admin/Site.php:527
+#: src/Module/Admin/Site.php:529
 msgid "System language"
 msgstr ""
 
-#: src/Module/Admin/Site.php:528
+#: src/Module/Admin/Site.php:530
 msgid "System theme"
 msgstr ""
 
-#: src/Module/Admin/Site.php:528
+#: src/Module/Admin/Site.php:530
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href=\"/"
 "admin/themes\" id=\"cnftheme\">Change default theme settings</a>"
 msgstr ""
 
-#: src/Module/Admin/Site.php:529
+#: src/Module/Admin/Site.php:531
 msgid "Mobile system theme"
 msgstr ""
 
-#: src/Module/Admin/Site.php:529
+#: src/Module/Admin/Site.php:531
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: src/Module/Admin/Site.php:530 src/Module/Install.php:225
+#: src/Module/Admin/Site.php:532 src/Module/Install.php:225
 msgid "SSL link policy"
 msgstr ""
 
-#: src/Module/Admin/Site.php:530 src/Module/Install.php:227
+#: src/Module/Admin/Site.php:532 src/Module/Install.php:227
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: src/Module/Admin/Site.php:531
+#: src/Module/Admin/Site.php:533
 msgid "Force SSL"
 msgstr ""
 
-#: src/Module/Admin/Site.php:531
+#: src/Module/Admin/Site.php:533
 msgid ""
 "Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
 "to endless loops."
 msgstr ""
 
-#: src/Module/Admin/Site.php:532
+#: src/Module/Admin/Site.php:534
 msgid "Show help entry from navigation menu"
 msgstr ""
 
-#: src/Module/Admin/Site.php:532
+#: src/Module/Admin/Site.php:534
 msgid ""
 "Displays the menu entry for the Help pages from the navigation menu. It is "
 "always accessible by calling /help directly."
 msgstr ""
 
-#: src/Module/Admin/Site.php:533
+#: src/Module/Admin/Site.php:535
 msgid "Single user instance"
 msgstr ""
 
-#: src/Module/Admin/Site.php:533
+#: src/Module/Admin/Site.php:535
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr ""
 
-#: src/Module/Admin/Site.php:535
+#: src/Module/Admin/Site.php:537
 msgid "Maximum image size"
 msgstr ""
 
-#: src/Module/Admin/Site.php:535
+#: src/Module/Admin/Site.php:537
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: src/Module/Admin/Site.php:536
+#: src/Module/Admin/Site.php:538
 msgid "Maximum image length"
 msgstr ""
 
-#: src/Module/Admin/Site.php:536
+#: src/Module/Admin/Site.php:538
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr ""
 
-#: src/Module/Admin/Site.php:537
+#: src/Module/Admin/Site.php:539
 msgid "JPEG image quality"
 msgstr ""
 
-#: src/Module/Admin/Site.php:537
+#: src/Module/Admin/Site.php:539
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr ""
 
-#: src/Module/Admin/Site.php:539
+#: src/Module/Admin/Site.php:541
 msgid "Register policy"
 msgstr ""
 
-#: src/Module/Admin/Site.php:540
+#: src/Module/Admin/Site.php:542
 msgid "Maximum Daily Registrations"
 msgstr ""
 
-#: src/Module/Admin/Site.php:540
+#: src/Module/Admin/Site.php:542
 msgid ""
 "If registration is permitted above, this sets the maximum number of new user "
 "registrations to accept per day.  If register is set to closed, this setting "
 "has no effect."
 msgstr ""
 
-#: src/Module/Admin/Site.php:541
+#: src/Module/Admin/Site.php:543
 msgid "Register text"
 msgstr ""
 
-#: src/Module/Admin/Site.php:541
+#: src/Module/Admin/Site.php:543
 msgid ""
 "Will be displayed prominently on the registration page. You can use BBCode "
 "here."
 msgstr ""
 
-#: src/Module/Admin/Site.php:542
+#: src/Module/Admin/Site.php:544
 msgid "Forbidden Nicknames"
 msgstr ""
 
-#: src/Module/Admin/Site.php:542
+#: src/Module/Admin/Site.php:544
 msgid ""
 "Comma separated list of nicknames that are forbidden from registration. "
 "Preset is a list of role names according RFC 2142."
 msgstr ""
 
-#: src/Module/Admin/Site.php:543
+#: src/Module/Admin/Site.php:545
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: src/Module/Admin/Site.php:543
+#: src/Module/Admin/Site.php:545
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: src/Module/Admin/Site.php:544
+#: src/Module/Admin/Site.php:546
 msgid "Allowed friend domains"
 msgstr ""
 
-#: src/Module/Admin/Site.php:544
+#: src/Module/Admin/Site.php:546
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: src/Module/Admin/Site.php:545
+#: src/Module/Admin/Site.php:547
 msgid "Allowed email domains"
 msgstr ""
 
-#: src/Module/Admin/Site.php:545
+#: src/Module/Admin/Site.php:547
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 
-#: src/Module/Admin/Site.php:546
+#: src/Module/Admin/Site.php:548
 msgid "No OEmbed rich content"
 msgstr ""
 
-#: src/Module/Admin/Site.php:546
+#: src/Module/Admin/Site.php:548
 msgid ""
 "Don't show the rich content (e.g. embedded PDF), except from the domains "
 "listed below."
 msgstr ""
 
-#: src/Module/Admin/Site.php:547
+#: src/Module/Admin/Site.php:549
 msgid "Trusted third-party domains"
 msgstr ""
 
-#: src/Module/Admin/Site.php:547
+#: src/Module/Admin/Site.php:549
 msgid ""
 "Comma separated list of domains from which content is allowed to be embedded "
 "in posts like with OEmbed. All sub-domains of the listed domains are allowed "
 "as well."
 msgstr ""
 
-#: src/Module/Admin/Site.php:548
+#: src/Module/Admin/Site.php:550
 msgid "Block public"
 msgstr ""
 
-#: src/Module/Admin/Site.php:548
+#: src/Module/Admin/Site.php:550
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
-#: src/Module/Admin/Site.php:549
+#: src/Module/Admin/Site.php:551
 msgid "Force publish"
 msgstr ""
 
-#: src/Module/Admin/Site.php:549
+#: src/Module/Admin/Site.php:551
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: src/Module/Admin/Site.php:549
+#: src/Module/Admin/Site.php:551
 msgid "Enabling this may violate privacy laws like the GDPR"
 msgstr ""
 
-#: src/Module/Admin/Site.php:550
+#: src/Module/Admin/Site.php:552
 msgid "Global directory URL"
 msgstr ""
 
-#: src/Module/Admin/Site.php:550
+#: src/Module/Admin/Site.php:552
 msgid ""
 "URL to the global directory. If this is not set, the global directory is "
 "completely unavailable to the application."
 msgstr ""
 
-#: src/Module/Admin/Site.php:551
+#: src/Module/Admin/Site.php:553
 msgid "Private posts by default for new users"
 msgstr ""
 
-#: src/Module/Admin/Site.php:551
+#: src/Module/Admin/Site.php:553
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr ""
 
-#: src/Module/Admin/Site.php:552
+#: src/Module/Admin/Site.php:554
 msgid "Don't include post content in email notifications"
 msgstr ""
 
-#: src/Module/Admin/Site.php:552
+#: src/Module/Admin/Site.php:554
 msgid ""
 "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."
 msgstr ""
 
-#: src/Module/Admin/Site.php:553
+#: src/Module/Admin/Site.php:555
 msgid "Disallow public access to addons listed in the apps menu."
 msgstr ""
 
-#: src/Module/Admin/Site.php:553
+#: src/Module/Admin/Site.php:555
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
 msgstr ""
 
-#: src/Module/Admin/Site.php:554
+#: src/Module/Admin/Site.php:556
 msgid "Don't embed private images in posts"
 msgstr ""
 
-#: src/Module/Admin/Site.php:554
+#: src/Module/Admin/Site.php:556
 msgid ""
 "Don't replace locally-hosted private photos in posts with an embedded copy "
 "of the image. This means that contacts who receive posts containing private "
 "photos will have to authenticate and load each image, which may take a while."
 msgstr ""
 
-#: src/Module/Admin/Site.php:555
+#: src/Module/Admin/Site.php:557
 msgid "Explicit Content"
 msgstr ""
 
-#: src/Module/Admin/Site.php:555
+#: src/Module/Admin/Site.php:557
 msgid ""
 "Set this to announce that your node is used mostly for explicit content that "
 "might not be suited for minors. This information will be published in the "
@@ -5803,245 +5806,255 @@ msgid ""
 "will be shown at the user registration page."
 msgstr ""
 
-#: src/Module/Admin/Site.php:556
+#: src/Module/Admin/Site.php:558
 msgid "Proxify external content"
 msgstr ""
 
-#: src/Module/Admin/Site.php:556
+#: src/Module/Admin/Site.php:558
 msgid ""
 "Route external content via the proxy functionality. This is used for example "
 "for some OEmbed accesses and in some other rare cases."
 msgstr ""
 
-#: src/Module/Admin/Site.php:557
+#: src/Module/Admin/Site.php:559
+msgid "Cache contact avatars"
+msgstr ""
+
+#: src/Module/Admin/Site.php:559
+msgid ""
+"Locally store the avatar pictures of the contacts. This uses a lot of "
+"storage space but it increases the performance."
+msgstr ""
+
+#: src/Module/Admin/Site.php:560
 msgid "Allow Users to set remote_self"
 msgstr ""
 
-#: src/Module/Admin/Site.php:557
+#: src/Module/Admin/Site.php:560
 msgid ""
 "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."
 msgstr ""
 
-#: src/Module/Admin/Site.php:558
+#: src/Module/Admin/Site.php:561
 msgid "Enable multiple registrations"
 msgstr ""
 
-#: src/Module/Admin/Site.php:558
+#: src/Module/Admin/Site.php:561
 msgid "Enable users to register additional accounts for use as pages."
 msgstr ""
 
-#: src/Module/Admin/Site.php:559
+#: src/Module/Admin/Site.php:562
 msgid "Enable OpenID"
 msgstr ""
 
-#: src/Module/Admin/Site.php:559
+#: src/Module/Admin/Site.php:562
 msgid "Enable OpenID support for registration and logins."
 msgstr ""
 
-#: src/Module/Admin/Site.php:560
+#: src/Module/Admin/Site.php:563
 msgid "Enable Fullname check"
 msgstr ""
 
-#: src/Module/Admin/Site.php:560
+#: src/Module/Admin/Site.php:563
 msgid ""
 "Enable check to only allow users to register with a space between the first "
 "name and the last name in their full name."
 msgstr ""
 
-#: src/Module/Admin/Site.php:561
+#: src/Module/Admin/Site.php:564
 msgid "Community pages for visitors"
 msgstr ""
 
-#: src/Module/Admin/Site.php:561
+#: src/Module/Admin/Site.php:564
 msgid ""
 "Which community pages should be available for visitors. Local users always "
 "see both pages."
 msgstr ""
 
-#: src/Module/Admin/Site.php:562
+#: src/Module/Admin/Site.php:565
 msgid "Posts per user on community page"
 msgstr ""
 
-#: src/Module/Admin/Site.php:562
+#: src/Module/Admin/Site.php:565
 msgid ""
 "The maximum number of posts per user on the community page. (Not valid for "
 "\"Global Community\")"
 msgstr ""
 
-#: src/Module/Admin/Site.php:564
+#: src/Module/Admin/Site.php:567
 msgid "Enable Mail support"
 msgstr ""
 
-#: src/Module/Admin/Site.php:564
+#: src/Module/Admin/Site.php:567
 msgid ""
 "Enable built-in mail support to poll IMAP folders and to reply via mail."
 msgstr ""
 
-#: src/Module/Admin/Site.php:565
+#: src/Module/Admin/Site.php:568
 msgid ""
 "Mail support can't be enabled because the PHP IMAP module is not installed."
 msgstr ""
 
-#: src/Module/Admin/Site.php:566
+#: src/Module/Admin/Site.php:569
 msgid "Enable OStatus support"
 msgstr ""
 
-#: src/Module/Admin/Site.php:566
+#: src/Module/Admin/Site.php:569
 msgid ""
 "Enable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
 "communications in OStatus are public."
 msgstr ""
 
-#: src/Module/Admin/Site.php:568
+#: src/Module/Admin/Site.php:571
 msgid ""
 "Diaspora support can't be enabled because Friendica was installed into a sub "
 "directory."
 msgstr ""
 
-#: src/Module/Admin/Site.php:569
+#: src/Module/Admin/Site.php:572
 msgid "Enable Diaspora support"
 msgstr ""
 
-#: src/Module/Admin/Site.php:569
+#: src/Module/Admin/Site.php:572
 msgid ""
 "Enable built-in Diaspora network compatibility for communicating with "
 "diaspora servers."
 msgstr ""
 
-#: src/Module/Admin/Site.php:570
+#: src/Module/Admin/Site.php:573
 msgid "Verify SSL"
 msgstr ""
 
-#: src/Module/Admin/Site.php:570
+#: src/Module/Admin/Site.php:573
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you "
 "cannot connect (at all) to self-signed SSL sites."
 msgstr ""
 
-#: src/Module/Admin/Site.php:571
+#: src/Module/Admin/Site.php:574
 msgid "Proxy user"
 msgstr ""
 
-#: src/Module/Admin/Site.php:572
+#: src/Module/Admin/Site.php:575
 msgid "Proxy URL"
 msgstr ""
 
-#: src/Module/Admin/Site.php:573
+#: src/Module/Admin/Site.php:576
 msgid "Network timeout"
 msgstr ""
 
-#: src/Module/Admin/Site.php:573
+#: src/Module/Admin/Site.php:576
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: src/Module/Admin/Site.php:574
+#: src/Module/Admin/Site.php:577
 msgid "Maximum Load Average"
 msgstr ""
 
-#: src/Module/Admin/Site.php:574
+#: src/Module/Admin/Site.php:577
 #, php-format
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default %d."
 msgstr ""
 
-#: src/Module/Admin/Site.php:575
+#: src/Module/Admin/Site.php:578
 msgid "Maximum Load Average (Frontend)"
 msgstr ""
 
-#: src/Module/Admin/Site.php:575
+#: src/Module/Admin/Site.php:578
 msgid "Maximum system load before the frontend quits service - default 50."
 msgstr ""
 
-#: src/Module/Admin/Site.php:576
+#: src/Module/Admin/Site.php:579
 msgid "Minimal Memory"
 msgstr ""
 
-#: src/Module/Admin/Site.php:576
+#: src/Module/Admin/Site.php:579
 msgid ""
 "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
 "default 0 (deactivated)."
 msgstr ""
 
-#: src/Module/Admin/Site.php:577
+#: src/Module/Admin/Site.php:580
 msgid "Periodically optimize tables"
 msgstr ""
 
-#: src/Module/Admin/Site.php:577
+#: src/Module/Admin/Site.php:580
 msgid "Periodically optimize tables like the cache and the workerqueue"
 msgstr ""
 
-#: src/Module/Admin/Site.php:579
+#: src/Module/Admin/Site.php:582
 msgid "Discover followers/followings from contacts"
 msgstr ""
 
-#: src/Module/Admin/Site.php:579
+#: src/Module/Admin/Site.php:582
 msgid ""
 "If enabled, contacts are checked for their followers and following contacts."
 msgstr ""
 
-#: src/Module/Admin/Site.php:580
+#: src/Module/Admin/Site.php:583
 msgid "None - deactivated"
 msgstr ""
 
-#: src/Module/Admin/Site.php:581
+#: src/Module/Admin/Site.php:584
 msgid ""
 "Local contacts - contacts of our local contacts are discovered for their "
 "followers/followings."
 msgstr ""
 
-#: src/Module/Admin/Site.php:582
+#: src/Module/Admin/Site.php:585
 msgid ""
 "Interactors - contacts of our local contacts and contacts who interacted on "
 "locally visible postings are discovered for their followers/followings."
 msgstr ""
 
-#: src/Module/Admin/Site.php:584
+#: src/Module/Admin/Site.php:587
 msgid "Synchronize the contacts with the directory server"
 msgstr ""
 
-#: src/Module/Admin/Site.php:584
+#: src/Module/Admin/Site.php:587
 msgid ""
 "if enabled, the system will check periodically for new contacts on the "
 "defined directory server."
 msgstr ""
 
-#: src/Module/Admin/Site.php:586
+#: src/Module/Admin/Site.php:589
 msgid "Days between requery"
 msgstr ""
 
-#: src/Module/Admin/Site.php:586
+#: src/Module/Admin/Site.php:589
 msgid "Number of days after which a server is requeried for his contacts."
 msgstr ""
 
-#: src/Module/Admin/Site.php:587
+#: src/Module/Admin/Site.php:590
 msgid "Discover contacts from other servers"
 msgstr ""
 
-#: src/Module/Admin/Site.php:587
+#: src/Module/Admin/Site.php:590
 msgid ""
 "Periodically query other servers for contacts. The system queries Friendica, "
 "Mastodon and Hubzilla servers."
 msgstr ""
 
-#: src/Module/Admin/Site.php:588
+#: src/Module/Admin/Site.php:591
 msgid "Search the local directory"
 msgstr ""
 
-#: src/Module/Admin/Site.php:588
+#: src/Module/Admin/Site.php:591
 msgid ""
 "Search the local directory instead of the global directory. When searching "
 "locally, every search will be executed on the global directory in the "
 "background. This improves the search results when the search is repeated."
 msgstr ""
 
-#: src/Module/Admin/Site.php:590
+#: src/Module/Admin/Site.php:593
 msgid "Publish server information"
 msgstr ""
 
-#: src/Module/Admin/Site.php:590
+#: src/Module/Admin/Site.php:593
 msgid ""
 "If enabled, general server and usage data will be published. The data "
 "contains the name and version of the server, number of users with public "
@@ -6049,50 +6062,50 @@ msgid ""
 "href=\"http://the-federation.info/\">the-federation.info</a> for details."
 msgstr ""
 
-#: src/Module/Admin/Site.php:592
+#: src/Module/Admin/Site.php:595
 msgid "Check upstream version"
 msgstr ""
 
-#: src/Module/Admin/Site.php:592
+#: src/Module/Admin/Site.php:595
 msgid ""
 "Enables checking for new Friendica versions at github. If there is a new "
 "version, you will be informed in the admin panel overview."
 msgstr ""
 
-#: src/Module/Admin/Site.php:593
+#: src/Module/Admin/Site.php:596
 msgid "Suppress Tags"
 msgstr ""
 
-#: src/Module/Admin/Site.php:593
+#: src/Module/Admin/Site.php:596
 msgid "Suppress showing a list of hashtags at the end of the posting."
 msgstr ""
 
-#: src/Module/Admin/Site.php:594
+#: src/Module/Admin/Site.php:597
 msgid "Clean database"
 msgstr ""
 
-#: src/Module/Admin/Site.php:594
+#: src/Module/Admin/Site.php:597
 msgid ""
 "Remove old remote items, orphaned database records and old content from some "
 "other helper tables."
 msgstr ""
 
-#: src/Module/Admin/Site.php:595
+#: src/Module/Admin/Site.php:598
 msgid "Lifespan of remote items"
 msgstr ""
 
-#: src/Module/Admin/Site.php:595
+#: src/Module/Admin/Site.php:598
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "remote items will be deleted. Own items, and marked or filed items are "
 "always kept. 0 disables this behaviour."
 msgstr ""
 
-#: src/Module/Admin/Site.php:596
+#: src/Module/Admin/Site.php:599
 msgid "Lifespan of unclaimed items"
 msgstr ""
 
-#: src/Module/Admin/Site.php:596
+#: src/Module/Admin/Site.php:599
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "unclaimed remote items (mostly content from the relay) will be deleted. "
@@ -6100,144 +6113,144 @@ msgid ""
 "items if set to 0."
 msgstr ""
 
-#: src/Module/Admin/Site.php:597
+#: src/Module/Admin/Site.php:600
 msgid "Lifespan of raw conversation data"
 msgstr ""
 
-#: src/Module/Admin/Site.php:597
+#: src/Module/Admin/Site.php:600
 msgid ""
 "The conversation data is used for ActivityPub and OStatus, as well as for "
 "debug purposes. It should be safe to remove it after 14 days, default is 90 "
 "days."
 msgstr ""
 
-#: src/Module/Admin/Site.php:598
+#: src/Module/Admin/Site.php:601
 msgid "Maximum numbers of comments per post"
 msgstr ""
 
-#: src/Module/Admin/Site.php:598
+#: src/Module/Admin/Site.php:601
 msgid "How much comments should be shown for each post? Default value is 100."
 msgstr ""
 
-#: src/Module/Admin/Site.php:599
+#: src/Module/Admin/Site.php:602
 msgid "Maximum numbers of comments per post on the display page"
 msgstr ""
 
-#: src/Module/Admin/Site.php:599
+#: src/Module/Admin/Site.php:602
 msgid ""
 "How many comments should be shown on the single view for each post? Default "
 "value is 1000."
 msgstr ""
 
-#: src/Module/Admin/Site.php:600
+#: src/Module/Admin/Site.php:603
 msgid "Temp path"
 msgstr ""
 
-#: src/Module/Admin/Site.php:600
+#: src/Module/Admin/Site.php:603
 msgid ""
 "If you have a restricted system where the webserver can't access the system "
 "temp path, enter another path here."
 msgstr ""
 
-#: src/Module/Admin/Site.php:601
+#: src/Module/Admin/Site.php:604
 msgid "Only search in tags"
 msgstr ""
 
-#: src/Module/Admin/Site.php:601
+#: src/Module/Admin/Site.php:604
 msgid "On large systems the text search can slow down the system extremely."
 msgstr ""
 
-#: src/Module/Admin/Site.php:603
+#: src/Module/Admin/Site.php:606
 msgid "New base url"
 msgstr ""
 
-#: src/Module/Admin/Site.php:603
+#: src/Module/Admin/Site.php:606
 msgid ""
 "Change base url for this server. Sends relocate message to all Friendica and "
 "Diaspora* contacts of all users."
 msgstr ""
 
-#: src/Module/Admin/Site.php:605
+#: src/Module/Admin/Site.php:608
 msgid "Maximum number of parallel workers"
 msgstr ""
 
-#: src/Module/Admin/Site.php:605
+#: src/Module/Admin/Site.php:608
 #, php-format
 msgid ""
 "On shared hosters set this to %d. On larger systems, values of %d are great. "
 "Default value is %d."
 msgstr ""
 
-#: src/Module/Admin/Site.php:606
+#: src/Module/Admin/Site.php:609
 msgid "Enable fastlane"
 msgstr ""
 
-#: src/Module/Admin/Site.php:606
+#: src/Module/Admin/Site.php:609
 msgid ""
 "When enabed, the fastlane mechanism starts an additional worker if processes "
 "with higher priority are blocked by processes of lower priority."
 msgstr ""
 
-#: src/Module/Admin/Site.php:608
+#: src/Module/Admin/Site.php:611
 msgid "Direct relay transfer"
 msgstr ""
 
-#: src/Module/Admin/Site.php:608
+#: src/Module/Admin/Site.php:611
 msgid ""
 "Enables the direct transfer to other servers without using the relay servers"
 msgstr ""
 
-#: src/Module/Admin/Site.php:609
+#: src/Module/Admin/Site.php:612
 msgid "Relay scope"
 msgstr ""
 
-#: src/Module/Admin/Site.php:609
+#: src/Module/Admin/Site.php:612
 msgid ""
 "Can be \"all\" or \"tags\". \"all\" means that every public post should be "
 "received. \"tags\" means that only posts with selected tags should be "
 "received."
 msgstr ""
 
-#: src/Module/Admin/Site.php:609 src/Module/Contact.php:473
+#: src/Module/Admin/Site.php:612 src/Module/Contact.php:473
 #: src/Module/Settings/TwoFactor/Index.php:118
 msgid "Disabled"
 msgstr ""
 
-#: src/Module/Admin/Site.php:609
+#: src/Module/Admin/Site.php:612
 msgid "all"
 msgstr ""
 
-#: src/Module/Admin/Site.php:609
+#: src/Module/Admin/Site.php:612
 msgid "tags"
 msgstr ""
 
-#: src/Module/Admin/Site.php:610
+#: src/Module/Admin/Site.php:613
 msgid "Server tags"
 msgstr ""
 
-#: src/Module/Admin/Site.php:610
+#: src/Module/Admin/Site.php:613
 msgid "Comma separated list of tags for the \"tags\" subscription."
 msgstr ""
 
-#: src/Module/Admin/Site.php:611
+#: src/Module/Admin/Site.php:614
 msgid "Deny Server tags"
 msgstr ""
 
-#: src/Module/Admin/Site.php:611
+#: src/Module/Admin/Site.php:614
 msgid "Comma separated list of tags that are rejected."
 msgstr ""
 
-#: src/Module/Admin/Site.php:612
+#: src/Module/Admin/Site.php:615
 msgid "Allow user tags"
 msgstr ""
 
-#: src/Module/Admin/Site.php:612
+#: src/Module/Admin/Site.php:615
 msgid ""
 "If enabled, the tags from the saved searches will used for the \"tags\" "
 "subscription in addition to the \"relay_server_tags\"."
 msgstr ""
 
-#: src/Module/Admin/Site.php:615
+#: src/Module/Admin/Site.php:618
 msgid "Start Relocation"
 msgstr ""
 
@@ -7558,7 +7571,7 @@ msgid "Sort by post received date"
 msgstr ""
 
 #: src/Module/Conversation/Network.php:250
-#: src/Module/Settings/Profile/Index.php:226
+#: src/Module/Settings/Profile/Index.php:228
 msgid "Personal"
 msgstr ""
 
@@ -7782,7 +7795,7 @@ msgid "Twitter Source / Tweet URL (requires API key)"
 msgstr ""
 
 #: src/Module/Debug/Feed.php:38 src/Module/Filer/SaveTag.php:40
-#: src/Module/Settings/Profile/Index.php:140
+#: src/Module/Settings/Profile/Index.php:142
 msgid "You must be logged in to use this module"
 msgstr ""
 
@@ -7893,15 +7906,15 @@ msgstr ""
 msgid "Suggested contact not found."
 msgstr ""
 
-#: src/Module/FriendSuggest.php:84
+#: src/Module/FriendSuggest.php:83
 msgid "Friend suggestion sent."
 msgstr ""
 
-#: src/Module/FriendSuggest.php:121
+#: src/Module/FriendSuggest.php:120
 msgid "Suggest Friends"
 msgstr ""
 
-#: src/Module/FriendSuggest.php:124
+#: src/Module/FriendSuggest.php:123
 #, php-format
 msgid "Suggest a friend for %s"
 msgstr ""
@@ -8425,7 +8438,7 @@ msgstr ""
 msgid "No more %s notifications."
 msgstr ""
 
-#: src/Module/Notifications/Notification.php:104
+#: src/Module/Notifications/Notification.php:107
 msgid "You must be logged in to show this page."
 msgstr ""
 
@@ -8483,33 +8496,33 @@ msgstr ""
 msgid "Wrong type \"%s\", expected one of: %s"
 msgstr ""
 
-#: src/Module/PermissionTooltip.php:38
+#: src/Module/PermissionTooltip.php:42
 msgid "Model not found"
 msgstr ""
 
-#: src/Module/PermissionTooltip.php:60
+#: src/Module/PermissionTooltip.php:64
 msgid "Remote privacy information not available."
 msgstr ""
 
-#: src/Module/PermissionTooltip.php:69
+#: src/Module/PermissionTooltip.php:73
 msgid "Visible to:"
 msgstr ""
 
-#: src/Module/Photo.php:122
+#: src/Module/Photo.php:123
 msgid "The Photo is not available."
 msgstr ""
 
-#: src/Module/Photo.php:135
+#: src/Module/Photo.php:136
 #, php-format
 msgid "The Photo with id %s is not available."
 msgstr ""
 
-#: src/Module/Photo.php:168
+#: src/Module/Photo.php:169
 #, php-format
 msgid "Invalid external resource with url %s."
 msgstr ""
 
-#: src/Module/Photo.php:170
+#: src/Module/Photo.php:171
 #, php-format
 msgid "Invalid photo with id %s."
 msgstr ""
@@ -8545,12 +8558,12 @@ msgstr ""
 msgid "Birthday:"
 msgstr ""
 
-#: src/Module/Profile/Profile.php:167 src/Module/Settings/Profile/Index.php:244
+#: src/Module/Profile/Profile.php:167 src/Module/Settings/Profile/Index.php:246
 #: src/Util/Temporal.php:165
 msgid "Age: "
 msgstr ""
 
-#: src/Module/Profile/Profile.php:167 src/Module/Settings/Profile/Index.php:244
+#: src/Module/Profile/Profile.php:167 src/Module/Settings/Profile/Index.php:246
 #: src/Util/Temporal.php:165
 #, php-format
 msgid "%d year old"
@@ -9133,125 +9146,125 @@ msgstr ""
 msgid "Profile couldn't be updated."
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:171
-#: src/Module/Settings/Profile/Index.php:191
+#: src/Module/Settings/Profile/Index.php:173
+#: src/Module/Settings/Profile/Index.php:193
 msgid "Label:"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:172
-#: src/Module/Settings/Profile/Index.php:192
+#: src/Module/Settings/Profile/Index.php:174
+#: src/Module/Settings/Profile/Index.php:194
 msgid "Value:"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:182
-#: src/Module/Settings/Profile/Index.php:202
+#: src/Module/Settings/Profile/Index.php:184
+#: src/Module/Settings/Profile/Index.php:204
 msgid "Field Permissions"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:183
-#: src/Module/Settings/Profile/Index.php:203
+#: src/Module/Settings/Profile/Index.php:185
+#: src/Module/Settings/Profile/Index.php:205
 msgid "(click to open/close)"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:189
+#: src/Module/Settings/Profile/Index.php:191
 msgid "Add a new profile field"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:219
+#: src/Module/Settings/Profile/Index.php:221
 msgid "Profile Actions"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:220
+#: src/Module/Settings/Profile/Index.php:222
 msgid "Edit Profile Details"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:222
+#: src/Module/Settings/Profile/Index.php:224
 msgid "Change Profile Photo"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:227
+#: src/Module/Settings/Profile/Index.php:229
 msgid "Profile picture"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:228
+#: src/Module/Settings/Profile/Index.php:230
 msgid "Location"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:229 src/Util/Temporal.php:93
+#: src/Module/Settings/Profile/Index.php:231 src/Util/Temporal.php:93
 #: src/Util/Temporal.php:95
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:230
+#: src/Module/Settings/Profile/Index.php:232
 msgid "Custom Profile Fields"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:232 src/Module/Welcome.php:58
+#: src/Module/Settings/Profile/Index.php:234 src/Module/Welcome.php:58
 msgid "Upload Profile Photo"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:236
+#: src/Module/Settings/Profile/Index.php:238
 msgid "Display name:"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:239
+#: src/Module/Settings/Profile/Index.php:241
 msgid "Street Address:"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:240
+#: src/Module/Settings/Profile/Index.php:242
 msgid "Locality/City:"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:241
+#: src/Module/Settings/Profile/Index.php:243
 msgid "Region/State:"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:242
+#: src/Module/Settings/Profile/Index.php:244
 msgid "Postal/Zip Code:"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:243
+#: src/Module/Settings/Profile/Index.php:245
 msgid "Country:"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:245
+#: src/Module/Settings/Profile/Index.php:247
 msgid "XMPP (Jabber) address:"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:245
+#: src/Module/Settings/Profile/Index.php:247
 msgid "The XMPP address will be published so that people can follow you there."
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:246
+#: src/Module/Settings/Profile/Index.php:248
 msgid "Matrix (Element) address:"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:246
+#: src/Module/Settings/Profile/Index.php:248
 msgid ""
 "The Matrix address will be published so that people can follow you there."
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:247
+#: src/Module/Settings/Profile/Index.php:249
 msgid "Homepage URL:"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:248
+#: src/Module/Settings/Profile/Index.php:250
 msgid "Public Keywords:"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:248
+#: src/Module/Settings/Profile/Index.php:250
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:249
+#: src/Module/Settings/Profile/Index.php:251
 msgid "Private Keywords:"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:249
+#: src/Module/Settings/Profile/Index.php:251
 msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: src/Module/Settings/Profile/Index.php:250
+#: src/Module/Settings/Profile/Index.php:252
 #, php-format
 msgid ""
 "<p>Custom fields appear on <a href=\"%s\">your profile page</a>.</p>\n"
@@ -9262,42 +9275,42 @@ msgid ""
 "contacts or the Friendica contacts in the selected groups.</p>"
 msgstr ""
 
-#: src/Module/Settings/Profile/Photo/Crop.php:106
-#: src/Module/Settings/Profile/Photo/Crop.php:124
-#: src/Module/Settings/Profile/Photo/Crop.php:142
+#: src/Module/Settings/Profile/Photo/Crop.php:108
+#: src/Module/Settings/Profile/Photo/Crop.php:126
+#: src/Module/Settings/Profile/Photo/Crop.php:144
 #: src/Module/Settings/Profile/Photo/Index.php:102
 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr ""
 
-#: src/Module/Settings/Profile/Photo/Crop.php:149
+#: src/Module/Settings/Profile/Photo/Crop.php:151
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr ""
 
-#: src/Module/Settings/Profile/Photo/Crop.php:154
+#: src/Module/Settings/Profile/Photo/Crop.php:156
 msgid "Unable to process image"
 msgstr ""
 
-#: src/Module/Settings/Profile/Photo/Crop.php:173
+#: src/Module/Settings/Profile/Photo/Crop.php:175
 msgid "Photo not found."
 msgstr ""
 
-#: src/Module/Settings/Profile/Photo/Crop.php:195
+#: src/Module/Settings/Profile/Photo/Crop.php:197
 msgid "Profile picture successfully updated."
 msgstr ""
 
-#: src/Module/Settings/Profile/Photo/Crop.php:221
-#: src/Module/Settings/Profile/Photo/Crop.php:225
+#: src/Module/Settings/Profile/Photo/Crop.php:223
+#: src/Module/Settings/Profile/Photo/Crop.php:227
 msgid "Crop Image"
 msgstr ""
 
-#: src/Module/Settings/Profile/Photo/Crop.php:222
+#: src/Module/Settings/Profile/Photo/Crop.php:224
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: src/Module/Settings/Profile/Photo/Crop.php:224
+#: src/Module/Settings/Profile/Photo/Crop.php:226
 msgid "Use Image As Is"
 msgstr ""
 
@@ -9910,262 +9923,6 @@ msgid ""
 "features and resources."
 msgstr ""
 
-#: src/Navigation/Notifications/Depository/Notify.php:192
-#: src/Navigation/Notifications/Depository/Notify.php:675
-msgid "[Friendica:Notify]"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:256
-#, php-format
-msgid "%s New mail received at %s"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:258
-#, php-format
-msgid "%1$s sent you a new private message at %2$s."
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:259
-msgid "a private message"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:259
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:261
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:292
-#, php-format
-msgid "%1$s commented on %2$s's %3$s %4$s"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:297
-#, php-format
-msgid "%1$s commented on your %2$s %3$s"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:301
-#, php-format
-msgid "%1$s commented on their %2$s %3$s"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:305
-#: src/Navigation/Notifications/Depository/Notify.php:710
-#, php-format
-msgid "%1$s Comment to conversation #%2$d by %3$s"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:307
-#, php-format
-msgid "%s commented on an item/conversation you have been following."
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:311
-#: src/Navigation/Notifications/Depository/Notify.php:326
-#: src/Navigation/Notifications/Depository/Notify.php:345
-#: src/Navigation/Notifications/Depository/Notify.php:725
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:318
-#, php-format
-msgid "%s %s posted to your profile wall"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:320
-#, php-format
-msgid "%1$s posted to your profile wall at %2$s"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:321
-#, php-format
-msgid "%1$s posted to [url=%2$s]your wall[/url]"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:333
-#, php-format
-msgid "%1$s %2$s poked you"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:335
-#, php-format
-msgid "%1$s poked you at %2$s"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:336
-#, php-format
-msgid "%1$s [url=%2$s]poked you[/url]."
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:353
-#, php-format
-msgid "%s Introduction received"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:355
-#, php-format
-msgid "You've received an introduction from '%1$s' at %2$s"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:356
-#, php-format
-msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:361
-#: src/Navigation/Notifications/Depository/Notify.php:407
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:363
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:370
-#, php-format
-msgid "%s A new person is sharing with you"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:372
-#: src/Navigation/Notifications/Depository/Notify.php:373
-#, php-format
-msgid "%1$s is sharing with you at %2$s"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:380
-#, php-format
-msgid "%s You have a new follower"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:382
-#: src/Navigation/Notifications/Depository/Notify.php:383
-#, php-format
-msgid "You have a new follower at %2$s : %1$s"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:396
-#, php-format
-msgid "%s Friend suggestion received"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:398
-#, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:399
-#, php-format
-msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:405
-msgid "Name:"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:406
-msgid "Photo:"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:409
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:417
-#: src/Navigation/Notifications/Depository/Notify.php:432
-#, php-format
-msgid "%s Connection accepted"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:419
-#: src/Navigation/Notifications/Depository/Notify.php:434
-#, php-format
-msgid "'%1$s' has accepted your connection request at %2$s"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:420
-#: src/Navigation/Notifications/Depository/Notify.php:435
-#, php-format
-msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:425
-msgid ""
-"You are now mutual friends and may exchange status updates, photos, and "
-"email without restriction."
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:427
-#, php-format
-msgid "Please visit %s if you wish to make any changes to this relationship."
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:440
-#, php-format
-msgid ""
-"'%1$s' has chosen to accept you a fan, which restricts some forms of "
-"communication - such as private messaging and some profile interactions. If "
-"this is a celebrity or community page, these settings were applied "
-"automatically."
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:442
-#, php-format
-msgid ""
-"'%1$s' may choose to extend this into a two-way or more permissive "
-"relationship in the future."
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:444
-#, php-format
-msgid "Please visit %s  if you wish to make any changes to this relationship."
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:454
-msgid "registration request"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:456
-#, php-format
-msgid "You've received a registration request from '%1$s' at %2$s"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:457
-#, php-format
-msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:462
-#, php-format
-msgid ""
-"Full Name:\t%s\n"
-"Site Location:\t%s\n"
-"Login Name:\t%s (%s)"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:468
-#, php-format
-msgid "Please visit %s to approve or reject the request."
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:704
-#, php-format
-msgid "%s %s tagged you"
-msgstr ""
-
-#: src/Navigation/Notifications/Depository/Notify.php:707
-#, php-format
-msgid "%s %s shared a new post"
-msgstr ""
-
 #: src/Navigation/Notifications/Factory/FormattedNotification.php:89
 #, php-format
 msgid "%s liked %s's post"
@@ -10324,6 +10081,262 @@ msgstr ""
 msgid "%1$s shared a post"
 msgstr ""
 
+#: src/Navigation/Notifications/Repository/Notify.php:192
+#: src/Navigation/Notifications/Repository/Notify.php:675
+msgid "[Friendica:Notify]"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:256
+#, php-format
+msgid "%s New mail received at %s"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:258
+#, php-format
+msgid "%1$s sent you a new private message at %2$s."
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:259
+msgid "a private message"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:259
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:261
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:292
+#, php-format
+msgid "%1$s commented on %2$s's %3$s %4$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:297
+#, php-format
+msgid "%1$s commented on your %2$s %3$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:301
+#, php-format
+msgid "%1$s commented on their %2$s %3$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:305
+#: src/Navigation/Notifications/Repository/Notify.php:710
+#, php-format
+msgid "%1$s Comment to conversation #%2$d by %3$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:307
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:311
+#: src/Navigation/Notifications/Repository/Notify.php:326
+#: src/Navigation/Notifications/Repository/Notify.php:345
+#: src/Navigation/Notifications/Repository/Notify.php:725
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:318
+#, php-format
+msgid "%s %s posted to your profile wall"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:320
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:321
+#, php-format
+msgid "%1$s posted to [url=%2$s]your wall[/url]"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:333
+#, php-format
+msgid "%1$s %2$s poked you"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:335
+#, php-format
+msgid "%1$s poked you at %2$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:336
+#, php-format
+msgid "%1$s [url=%2$s]poked you[/url]."
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:353
+#, php-format
+msgid "%s Introduction received"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:355
+#, php-format
+msgid "You've received an introduction from '%1$s' at %2$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:356
+#, php-format
+msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:361
+#: src/Navigation/Notifications/Repository/Notify.php:407
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:363
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:370
+#, php-format
+msgid "%s A new person is sharing with you"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:372
+#: src/Navigation/Notifications/Repository/Notify.php:373
+#, php-format
+msgid "%1$s is sharing with you at %2$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:380
+#, php-format
+msgid "%s You have a new follower"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:382
+#: src/Navigation/Notifications/Repository/Notify.php:383
+#, php-format
+msgid "You have a new follower at %2$s : %1$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:396
+#, php-format
+msgid "%s Friend suggestion received"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:398
+#, php-format
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:399
+#, php-format
+msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:405
+msgid "Name:"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:406
+msgid "Photo:"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:409
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:417
+#: src/Navigation/Notifications/Repository/Notify.php:432
+#, php-format
+msgid "%s Connection accepted"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:419
+#: src/Navigation/Notifications/Repository/Notify.php:434
+#, php-format
+msgid "'%1$s' has accepted your connection request at %2$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:420
+#: src/Navigation/Notifications/Repository/Notify.php:435
+#, php-format
+msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:425
+msgid ""
+"You are now mutual friends and may exchange status updates, photos, and "
+"email without restriction."
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:427
+#, php-format
+msgid "Please visit %s if you wish to make any changes to this relationship."
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:440
+#, php-format
+msgid ""
+"'%1$s' has chosen to accept you a fan, which restricts some forms of "
+"communication - such as private messaging and some profile interactions. If "
+"this is a celebrity or community page, these settings were applied "
+"automatically."
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:442
+#, php-format
+msgid ""
+"'%1$s' may choose to extend this into a two-way or more permissive "
+"relationship in the future."
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:444
+#, php-format
+msgid "Please visit %s  if you wish to make any changes to this relationship."
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:454
+msgid "registration request"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:456
+#, php-format
+msgid "You've received a registration request from '%1$s' at %2$s"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:457
+#, php-format
+msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:462
+#, php-format
+msgid ""
+"Full Name:\t%s\n"
+"Site Location:\t%s\n"
+"Login Name:\t%s (%s)"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:468
+#, php-format
+msgid "Please visit %s to approve or reject the request."
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:704
+#, php-format
+msgid "%s %s tagged you"
+msgstr ""
+
+#: src/Navigation/Notifications/Repository/Notify.php:707
+#, php-format
+msgid "%s %s shared a new post"
+msgstr ""
+
 #: src/Object/EMail/ItemCCEMail.php:42
 #, php-format
 msgid ""
@@ -10677,7 +10690,7 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""
 
-#: src/Worker/Delivery.php:521
+#: src/Worker/Delivery.php:525
 msgid "(no subject)"
 msgstr ""
 
diff --git a/view/lang/ar/messages.po b/view/lang/ar/messages.po
index 6141f6773..fb819076a 100644
--- a/view/lang/ar/messages.po
+++ b/view/lang/ar/messages.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-18 00:07+0200\n"
-"PO-Revision-Date: 2021-10-18 20:45+0000\n"
+"POT-Creation-Date: 2021-10-23 21:51-0400\n"
+"PO-Revision-Date: 2021-10-24 17:56+0000\n"
 "Last-Translator: abidin toumi <abidin24@tutanota.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -53,261 +53,10 @@ msgstr[5] "رُفضت المشاركة. تجاوزت الحد الأسبوعي 
 msgid "Monthly posting limit of %d post reached. The post was rejected."
 msgstr "رُفضت المشاركة. تجاوزت الحد الشهري وهو %d مشاركة."
 
-#: include/enotify.php:50 include/enotify.php:533
-msgid "[Friendica:Notify]"
-msgstr "[Friendica:Notify]"
-
-#: include/enotify.php:114
-#, php-format
-msgid "%s New mail received at %s"
-msgstr "أُستلم بريد جديد %s على %s"
-
-#: include/enotify.php:116
-#, php-format
-msgid "%1$s sent you a new private message at %2$s."
-msgstr "أرسل %1$s لك رسالة خاصة على %2$s."
-
-#: include/enotify.php:117
-msgid "a private message"
-msgstr "رسالة خاصة"
-
-#: include/enotify.php:117
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr "أرسل %1$s لك %2$s."
-
-#: include/enotify.php:119
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "من فضلك.زر %s لعرض و/أو الرد على الرسائل الخاصة."
-
-#: include/enotify.php:150
-#, php-format
-msgid "%1$s commented on %2$s's %3$s %4$s"
-msgstr "علق %1$s على %3$s %2$s %4$s"
-
-#: include/enotify.php:155
-#, php-format
-msgid "%1$s commented on your %2$s %3$s"
-msgstr "علق %1$s على %2$s تخصك %3$s"
-
-#: include/enotify.php:159
-#, php-format
-msgid "%1$s commented on their %2$s %3$s"
-msgstr "علق %1$s على %2$s له %3$s"
-
-#: include/enotify.php:163 include/enotify.php:568
-#, php-format
-msgid "%1$s Comment to conversation #%2$d by %3$s"
-msgstr "علق %1$s على محادثة %3$s #%2$d"
-
-#: include/enotify.php:165
-#, php-format
-msgid "%s commented on an item/conversation you have been following."
-msgstr "علق %s على محادثة/عنصر تتابعه."
-
-#: include/enotify.php:169 include/enotify.php:184 include/enotify.php:203
-#: include/enotify.php:583
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "من فضلك.زر %s لعرض و/أو الرد على المحادثة."
-
-#: include/enotify.php:176
-#, php-format
-msgid "%s %s posted to your profile wall"
-msgstr "نشر %s%s على حائط ملفك الشخصي"
-
-#: include/enotify.php:178
-#, php-format
-msgid "%1$s posted to your profile wall at %2$s"
-msgstr "نشر %1$s على حائط ملفك الشخصي على %2$s"
-
-#: include/enotify.php:179
-#, php-format
-msgid "%1$s posted to [url=%2$s]your wall[/url]"
-msgstr "\"نشر %1$s على [%2$s=url]حائطك[/url]"
-
-#: include/enotify.php:191
-#, php-format
-msgid "%1$s %2$s poked you"
-msgstr "لكزك %1$s %2$s"
-
-#: include/enotify.php:193
-#, php-format
-msgid "%1$s poked you at %2$s"
-msgstr "لكزك %1$s على %2$s"
-
-#: include/enotify.php:194
-#, php-format
-msgid "%1$s [url=%2$s]poked you[/url]."
-msgstr "[url=%2$s]لكزك[/url] %1$s."
-
-#: include/enotify.php:211
-#, php-format
-msgid "%s Introduction received"
-msgstr "تلقيت تقديما من %s"
-
-#: include/enotify.php:213
-#, php-format
-msgid "You've received an introduction from '%1$s' at %2$s"
-msgstr "تلقيت تقديما من '%1$s' على %2$s"
-
-#: include/enotify.php:214
-#, php-format
-msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
-msgstr "تلقيت [url=%1$s]تقديما[/url] من %2$s."
-
-#: include/enotify.php:219 include/enotify.php:265
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "يمكنك زيارة ملفهم الخصي على %s"
-
-#: include/enotify.php:221
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
-msgstr "من فضلك زر %s لقبول أو رفض التقديم."
-
-#: include/enotify.php:228
-#, php-format
-msgid "%s A new person is sharing with you"
-msgstr "%s شخص جديد يشارك معك"
-
-#: include/enotify.php:230 include/enotify.php:231
-#, php-format
-msgid "%1$s is sharing with you at %2$s"
-msgstr "يشارك %1$s معك على %2$s"
-
-#: include/enotify.php:238
-#, php-format
-msgid "%s You have a new follower"
-msgstr "لديك متابِع جديد %s"
-
-#: include/enotify.php:240 include/enotify.php:241
-#, php-format
-msgid "You have a new follower at %2$s : %1$s"
-msgstr "لديك متابِع جديد على %2$s : %1$s"
-
-#: include/enotify.php:254
-#, php-format
-msgid "%s Friend suggestion received"
-msgstr "تلقيت إقتراح صديق %s"
-
-#: include/enotify.php:256
-#, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
-msgstr "تلقيت اقتراح صديق من '%1$s' على %2$s"
-
-#: include/enotify.php:257
-#, php-format
-msgid ""
-"You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
-msgstr " تلقيت [url=%1$s]اقتراح %2$s كصديق[/url] من %3$s."
-
-#: include/enotify.php:263
-msgid "Name:"
-msgstr "الاسم:"
-
-#: include/enotify.php:264
-msgid "Photo:"
-msgstr "الصورة:"
-
-#: include/enotify.php:267
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "من فضلك زر %s لقبول  أو رفض الاقتراح."
-
-#: include/enotify.php:275 include/enotify.php:290
-#, php-format
-msgid "%s Connection accepted"
-msgstr "قُبِل الاقتران %s"
-
-#: include/enotify.php:277 include/enotify.php:292
-#, php-format
-msgid "'%1$s' has accepted your connection request at %2$s"
-msgstr "قبِل '%1$s' طلب الاقتران على %2$s"
-
-#: include/enotify.php:278 include/enotify.php:293
-#, php-format
-msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
-msgstr "قبِل %2$s [url=%1$s]طلب الاقتران[/url]"
-
-#: include/enotify.php:283
-msgid ""
-"You are now mutual friends and may exchange status updates, photos, and "
-"email without restriction."
-msgstr "أصبحتما صديقين من كلا الطرفين ويمكنكما تبادل تحديثات الحالة، والصور، والبريد دون قيود."
-
-#: include/enotify.php:285
-#, php-format
-msgid "Please visit %s if you wish to make any changes to this relationship."
-msgstr "من فضلك زر %s إن أردت تغيير هذه العلاقة."
-
-#: include/enotify.php:298
-#, php-format
-msgid ""
-"'%1$s' has chosen to accept you a fan, which restricts some forms of "
-"communication - such as private messaging and some profile interactions. If "
-"this is a celebrity or community page, these settings were applied "
-"automatically."
-msgstr "قبِلك '%1$s' كمعجب، هذا يحدُّ من أشكال التواصل بينكما مثل الزسائل الخاصة وبعض التفاعلات. يتم هذا تلقائيا اذا كانت صفحة مشهور أو مجتمع."
-
-#: include/enotify.php:300
-#, php-format
-msgid ""
-"'%1$s' may choose to extend this into a two-way or more permissive "
-"relationship in the future."
-msgstr "قد يختار '%1$s' توسيعها إلى علاقة ذات اتجاهين أو أكثر في المستقبل."
-
-#: include/enotify.php:302
-#, php-format
-msgid "Please visit %s  if you wish to make any changes to this relationship."
-msgstr "من فضلك زر %s إن أردت تغيير هذه العلاقة."
-
-#: include/enotify.php:312 mod/removeme.php:63
-msgid "[Friendica System Notify]"
-msgstr "[Friendica System Notify]"
-
-#: include/enotify.php:312
-msgid "registration request"
-msgstr "طلب تسجيل"
-
-#: include/enotify.php:314
-#, php-format
-msgid "You've received a registration request from '%1$s' at %2$s"
-msgstr "تلقيت طلب تسجيل من '%1$s' على %2$s"
-
-#: include/enotify.php:315
-#, php-format
-msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
-msgstr "تلقيت [url=%1$s]طلب تسجيل[/url] من %2$s"
-
-#: include/enotify.php:320
-#, php-format
-msgid ""
-"Full Name:\t%s\n"
-"Site Location:\t%s\n"
-"Login Name:\t%s (%s)"
-msgstr "الاسم الكامل:\t%s\nالموقع:\t%s\nاسم الولوج:\t%s (%s)"
-
-#: include/enotify.php:326
-#, php-format
-msgid "Please visit %s to approve or reject the request."
-msgstr "من فضلك زر %s لقبول  أو رفض الطلب."
-
-#: include/enotify.php:562
-#, php-format
-msgid "%s %s tagged you"
-msgstr "ذكرك %s%s"
-
-#: include/enotify.php:565
-#, php-format
-msgid "%s %s shared a new post"
-msgstr "شارك %s%s مشاركة جديدة"
-
 #: mod/api.php:30 mod/editpost.php:38 mod/events.php:220 mod/follow.php:56
 #: mod/follow.php:130 mod/item.php:185 mod/item.php:190 mod/item.php:936
 #: mod/message.php:69 mod/message.php:111 mod/notes.php:44
-#: mod/ostatus_subscribe.php:32 mod/photos.php:163 mod/photos.php:908
+#: mod/ostatus_subscribe.php:32 mod/photos.php:160 mod/photos.php:900
 #: mod/repair_ostatus.php:31 mod/settings.php:47 mod/settings.php:57
 #: mod/settings.php:409 mod/suggest.php:34 mod/uimport.php:33
 #: mod/unfollow.php:35 mod/unfollow.php:50 mod/unfollow.php:82
@@ -318,10 +67,10 @@ msgstr "شارك %s%s مشاركة جديدة"
 #: src/Module/BaseApi.php:97 src/Module/BaseApi.php:106
 #: src/Module/BaseNotifications.php:88 src/Module/Contact.php:328
 #: src/Module/Contact/Advanced.php:44 src/Module/Delegation.php:118
-#: src/Module/FollowConfirm.php:16 src/Module/FriendSuggest.php:44
+#: src/Module/FollowConfirm.php:17 src/Module/FriendSuggest.php:44
 #: src/Module/Group.php:45 src/Module/Group.php:90 src/Module/Invite.php:41
-#: src/Module/Invite.php:130 src/Module/Notifications/Notification.php:47
-#: src/Module/Notifications/Notification.php:76
+#: src/Module/Invite.php:130 src/Module/Notifications/Notification.php:48
+#: src/Module/Notifications/Notification.php:79
 #: src/Module/Profile/Common.php:56 src/Module/Profile/Contacts.php:56
 #: src/Module/Profile/Schedule.php:39 src/Module/Profile/Schedule.php:56
 #: src/Module/Register.php:64 src/Module/Register.php:77
@@ -329,7 +78,7 @@ msgstr "شارك %s%s مشاركة جديدة"
 #: src/Module/Search/Directory.php:38 src/Module/Settings/Delegation.php:42
 #: src/Module/Settings/Delegation.php:70 src/Module/Settings/Display.php:43
 #: src/Module/Settings/Display.php:121
-#: src/Module/Settings/Profile/Photo/Crop.php:158
+#: src/Module/Settings/Profile/Photo/Crop.php:166
 #: src/Module/Settings/Profile/Photo/Index.php:112
 #: src/Module/Settings/UserExport.php:58 src/Module/Settings/UserExport.php:93
 #: src/Module/Settings/UserExport.php:198
@@ -345,10 +94,10 @@ msgstr "رُفض الإذن."
 #: src/Module/Item/Pin.php:42 src/Module/Item/Pin.php:57
 #: src/Module/Item/Star.php:43
 msgid "Access denied."
-msgstr "رُفض الإذن."
+msgstr "رُفض الوصول."
 
-#: mod/cal.php:61 mod/cal.php:78 mod/photos.php:69 mod/photos.php:143
-#: mod/photos.php:815 src/Model/Profile.php:229 src/Module/HCard.php:52
+#: mod/cal.php:61 mod/cal.php:78 mod/photos.php:69 mod/photos.php:140
+#: mod/photos.php:807 src/Model/Profile.php:229 src/Module/HCard.php:52
 #: src/Module/Profile/Common.php:41 src/Module/Profile/Common.php:52
 #: src/Module/Profile/Contacts.php:40 src/Module/Profile/Contacts.php:50
 #: src/Module/Profile/Media.php:38 src/Module/Profile/Status.php:58
@@ -360,7 +109,7 @@ msgstr "لم يُعثر على المستخدم."
 #: src/Module/Profile/Profile.php:109 src/Module/Profile/Status.php:109
 #: src/Module/Update/Profile.php:56
 msgid "Access to this profile has been restricted."
-msgstr "قُيد الوصول لهذا الملف الشخصي."
+msgstr "قُيِّد الوصول لهذا الملف الشخصي."
 
 #: mod/cal.php:242 mod/events.php:377 src/Content/Nav.php:194
 #: src/Content/Nav.php:258 src/Module/BaseProfile.php:84
@@ -423,12 +172,12 @@ msgstr "لم يُعثر على بيانات قابلة للتصدير"
 msgid "calendar"
 msgstr "تقويم"
 
-#: mod/display.php:165 mod/photos.php:819
+#: mod/display.php:165 mod/photos.php:811
 #: src/Module/Conversation/Community.php:176 src/Module/Debug/Probe.php:39
 #: src/Module/Debug/WebFinger.php:38 src/Module/Directory.php:49
 #: src/Module/Search/Index.php:50 src/Module/Search/Index.php:55
 msgid "Public access denied."
-msgstr "رُفض الوصول العمومي."
+msgstr "رُفض الوصول العلني."
 
 #: mod/display.php:221 mod/display.php:295
 msgid "The requested item doesn't exist or has been deleted."
@@ -436,7 +185,7 @@ msgstr "العنصر غير موجود أو حُذف."
 
 #: mod/display.php:375
 msgid "The feed for this item is unavailable."
-msgstr "خلاصة هذا العنصر غير متوفرة."
+msgstr "تغذية هذا العنصر غير متوفرة."
 
 #: mod/editpost.php:45 mod/editpost.php:55
 msgid "Item not found"
@@ -444,14 +193,14 @@ msgstr "لم يُعثر على العنصر"
 
 #: mod/editpost.php:64
 msgid "Edit post"
-msgstr "حرر المشاركة"
+msgstr "عدّل المشاركة"
 
 #: mod/editpost.php:91 mod/notes.php:56 src/Content/Text/HTML.php:885
 #: src/Module/Admin/Storage.php:143 src/Module/Filer/SaveTag.php:69
 msgid "Save"
 msgstr "احفظ"
 
-#: mod/editpost.php:92 mod/photos.php:1355 src/Content/Conversation.php:326
+#: mod/editpost.php:92 mod/photos.php:1347 src/Content/Conversation.php:326
 #: src/Module/Contact/Poke.php:157 src/Object/Post.php:964
 msgid "Loading..."
 msgstr "يحمل..."
@@ -467,11 +216,11 @@ msgstr "ارفع صورة"
 
 #: mod/editpost.php:95 src/Content/Conversation.php:329
 msgid "Attach file"
-msgstr "أرفق ملفا"
+msgstr "أرفق ملفًا"
 
 #: mod/editpost.php:96 src/Content/Conversation.php:330
 msgid "attach file"
-msgstr "أرفق ملفا"
+msgstr "أرفق ملفًا"
 
 #: mod/editpost.php:97 mod/message.php:199 mod/message.php:356
 #: mod/wallmessage.php:140
@@ -501,11 +250,11 @@ msgstr "رابط ملف صوتي"
 #: mod/editpost.php:103 src/Content/Conversation.php:340
 #: src/Module/Item/Compose.php:161
 msgid "Set your location"
-msgstr "موقعك"
+msgstr "عيّن موقعك"
 
 #: mod/editpost.php:104 src/Content/Conversation.php:341
 msgid "set location"
-msgstr "عين موقعك"
+msgstr "عين الموقع"
 
 #: mod/editpost.php:105 src/Content/Conversation.php:342
 msgid "Clear browser location"
@@ -516,7 +265,7 @@ msgid "clear location"
 msgstr "امسح الموقع"
 
 #: mod/editpost.php:107 mod/message.php:200 mod/message.php:358
-#: mod/photos.php:1506 mod/wallmessage.php:141
+#: mod/photos.php:1498 mod/wallmessage.php:141
 #: src/Content/Conversation.php:355 src/Content/Conversation.php:689
 #: src/Module/Item/Compose.php:165 src/Object/Post.php:502
 msgid "Please wait"
@@ -524,7 +273,7 @@ msgstr "يرجى الانتظار"
 
 #: mod/editpost.php:108 src/Content/Conversation.php:356
 msgid "Permission settings"
-msgstr "إعدادات الأذون"
+msgstr "إعدادات الأذونات"
 
 #: mod/editpost.php:116 src/Core/ACL.php:325
 msgid "CC: email addresses"
@@ -542,20 +291,20 @@ msgstr "عين العنوان"
 #: mod/editpost.php:122 src/Content/Conversation.php:347
 #: src/Module/Item/Compose.php:167
 msgid "Categories (comma-separated list)"
-msgstr "فئات (قائمة مقسمة بفاصلة)"
+msgstr "الفئات (قائمة مفصولة بفاصلة)"
 
 #: mod/editpost.php:123 src/Core/ACL.php:326
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "مثل: bob@example.com, mary@example.com"
 
-#: mod/editpost.php:128 mod/events.php:517 mod/photos.php:1354
-#: mod/photos.php:1410 mod/photos.php:1484 src/Content/Conversation.php:370
+#: mod/editpost.php:128 mod/events.php:517 mod/photos.php:1346
+#: mod/photos.php:1402 mod/photos.php:1476 src/Content/Conversation.php:370
 #: src/Module/Item/Compose.php:160 src/Object/Post.php:974
 msgid "Preview"
 msgstr "معاينة"
 
 #: mod/editpost.php:130 mod/fbrowser.php:100 mod/fbrowser.php:127
-#: mod/follow.php:144 mod/photos.php:1017 mod/photos.php:1122 mod/tagrm.php:37
+#: mod/follow.php:144 mod/photos.php:1013 mod/photos.php:1114 mod/tagrm.php:37
 #: mod/tagrm.php:129 mod/unfollow.php:97 src/Content/Conversation.php:373
 #: src/Module/Contact/Revoke.php:99 src/Module/RemoteFollow.php:116
 msgid "Cancel"
@@ -565,21 +314,21 @@ msgstr "ألغ"
 #: src/Content/Widget/VCard.php:107 src/Model/Profile.php:460
 #: src/Module/Admin/Logs/View.php:92
 msgid "Message"
-msgstr "رسالة"
+msgstr "الرسالة"
 
 #: mod/editpost.php:135 src/Content/Conversation.php:381
 #: src/Module/Settings/TwoFactor/Trusted.php:101
 msgid "Browser"
-msgstr "متصفح"
+msgstr "المتصفح"
 
-#: mod/editpost.php:136 mod/events.php:522 mod/photos.php:956
-#: mod/photos.php:1308 src/Content/Conversation.php:357
+#: mod/editpost.php:136 mod/events.php:522 mod/photos.php:948
+#: mod/photos.php:1300 src/Content/Conversation.php:357
 msgid "Permissions"
-msgstr "أُذون"
+msgstr "الأُذونات"
 
 #: mod/editpost.php:138 src/Content/Conversation.php:383
 msgid "Open Compose page"
-msgstr "افتح صفحة التأليف"
+msgstr "افتح صفحة الإنشاء"
 
 #: mod/events.php:123 mod/events.php:125
 msgid "Event can not end before it has started."
@@ -591,7 +340,7 @@ msgstr "عنوان الحدث و وقت بدئه إلزاميان."
 
 #: mod/events.php:379
 msgid "Create New Event"
-msgstr "أنشئ حدثاً جديد"
+msgstr "أنشئ حدثاً جديدًا"
 
 #: mod/events.php:478 src/Module/Admin/Logs/View.php:96
 msgid "Event details"
@@ -632,7 +381,7 @@ msgid "Event Finishes:"
 msgstr "ينتهي الحدث في:"
 
 #: mod/events.php:506 src/Module/Profile/Profile.php:172
-#: src/Module/Settings/Profile/Index.php:237
+#: src/Module/Settings/Profile/Index.php:239
 msgid "Description:"
 msgstr "الوصف:"
 
@@ -653,18 +402,18 @@ msgid "Share this event"
 msgstr "شارك هذا الحدث"
 
 #: mod/events.php:519 mod/message.php:201 mod/message.php:357
-#: mod/photos.php:938 mod/photos.php:1039 mod/photos.php:1312
-#: mod/photos.php:1353 mod/photos.php:1409 mod/photos.php:1483
+#: mod/photos.php:930 mod/photos.php:1034 mod/photos.php:1304
+#: mod/photos.php:1345 mod/photos.php:1401 mod/photos.php:1475
 #: src/Module/Admin/Item/Source.php:65 src/Module/Contact.php:523
 #: src/Module/Contact/Advanced.php:133 src/Module/Contact/Poke.php:158
 #: src/Module/Debug/ActivityPubConversion.php:141
 #: src/Module/Debug/Babel.php:313 src/Module/Debug/Localtime.php:64
 #: src/Module/Debug/Probe.php:56 src/Module/Debug/WebFinger.php:53
-#: src/Module/Delegation.php:147 src/Module/FriendSuggest.php:129
+#: src/Module/Delegation.php:147 src/Module/FriendSuggest.php:128
 #: src/Module/Install.php:245 src/Module/Install.php:287
 #: src/Module/Install.php:324 src/Module/Invite.php:177
 #: src/Module/Item/Compose.php:150 src/Module/Profile/Profile.php:247
-#: src/Module/Settings/Profile/Index.php:221 src/Object/Post.php:963
+#: src/Module/Settings/Profile/Index.php:223 src/Object/Post.php:963
 #: view/theme/duepuntozero/config.php:69 view/theme/frio/config.php:160
 #: view/theme/quattro/config.php:71 view/theme/vier/config.php:119
 msgid "Submit"
@@ -674,14 +423,14 @@ msgstr "أرسل"
 msgid "Basic"
 msgstr "أساسي"
 
-#: mod/events.php:521 src/Module/Admin/Site.php:505 src/Module/Contact.php:863
+#: mod/events.php:521 src/Module/Admin/Site.php:507 src/Module/Contact.php:863
 #: src/Module/Profile/Profile.php:249
 msgid "Advanced"
 msgstr "متقدم"
 
 #: mod/events.php:538
 msgid "Failed to remove event"
-msgstr "فشلت إزالت الحدث"
+msgstr "فشلت إزالة الحدث"
 
 #: mod/fbrowser.php:43 src/Content/Nav.php:192 src/Module/BaseProfile.php:64
 #: view/theme/frio/theme.php:227
@@ -703,7 +452,7 @@ msgstr "أرسل الطلب"
 
 #: mod/follow.php:84
 msgid "You already added this contact."
-msgstr "لقد أضفت هذا المتراسل بالفعل."
+msgstr "أضفت هذا المتراسل سلفًا."
 
 #: mod/follow.php:100
 msgid "The network type couldn't be detected. Contact can't be added."
@@ -718,7 +467,7 @@ msgid "OStatus support is disabled. Contact can't be added."
 msgstr "دعم OStatus غير مفعل. لا يمكن إضافة المتراسل."
 
 #: mod/follow.php:138 src/Content/Item.php:463 src/Content/Widget.php:76
-#: src/Model/Contact.php:1071 src/Model/Contact.php:1083
+#: src/Model/Contact.php:1072 src/Model/Contact.php:1084
 #: view/theme/vier/theme.php:172
 msgid "Connect/Follow"
 msgstr "اقترن\\تابع"
@@ -736,7 +485,7 @@ msgstr "عنوان معرّفك:"
 #: src/Module/Notifications/Introductions.php:107
 #: src/Module/Notifications/Introductions.php:176
 msgid "Profile URL"
-msgstr "رابط الصفحة الشخصية"
+msgstr "رابط الملف الشخصي"
 
 #: mod/follow.php:142 src/Module/Contact.php:573
 #: src/Module/Notifications/Introductions.php:169
@@ -756,11 +505,11 @@ msgstr "أضف ملاحظة شخصية:"
 #: mod/follow.php:163 mod/unfollow.php:109 src/Module/BaseProfile.php:59
 #: src/Module/Contact.php:833
 msgid "Status Messages and Posts"
-msgstr "رسائل ومشاركات الحالة"
+msgstr "مشاركات ورسائل الحالة"
 
 #: mod/follow.php:191
 msgid "The contact could not be added."
-msgstr "لا يمكن إضافة المتراسل."
+msgstr "تعذر إضافة المتراسل."
 
 #: mod/item.php:135 mod/item.php:139
 msgid "Unable to locate original post."
@@ -768,7 +517,7 @@ msgstr "تعذر إيجاد المشاركة الأصلية."
 
 #: mod/item.php:341 mod/item.php:346
 msgid "Empty post discarded."
-msgstr "تُجوهلت المشاركة الفارغة."
+msgstr "رُفضت المشاركة الفارغة."
 
 #: mod/item.php:742
 msgid "Post updated."
@@ -842,7 +591,7 @@ msgstr "تعذر التحقق من الطلب (ربما تكون قد أرسلت
 
 #: mod/lostpass.php:113
 msgid "Request has expired, please make a new one."
-msgstr "انتهت صلاحيته، يرجى طلب واحد جديد."
+msgstr "انتهت صلاحيته، أرسل طلب واحد جديد."
 
 #: mod/lostpass.php:128
 msgid "Forgot your Password?"
@@ -868,7 +617,7 @@ msgstr "إعادة تعيين كلمة المرور"
 
 #: mod/lostpass.php:147
 msgid "Your password has been reset as requested."
-msgstr "أُعيذ تعيين كلمة المرور كما طلبت."
+msgstr "أُعيد تعيين كلمة المرور بناء على طلبك."
 
 #: mod/lostpass.php:148
 msgid "Your new password is"
@@ -924,7 +673,7 @@ msgstr "غُيرت كلمة المرور على %s"
 
 #: mod/match.php:62
 msgid "No keywords to match. Please add keywords to your profile."
-msgstr "لا توجد كلمات مفتاحية لمطابقتها. من فضلك أضاف كلمات مفتاحية إلى ملفك الشخصي."
+msgstr "لا توجد كلمات مفتاحية لمطابقتها. من فضلك أضف كلمات مفتاحية إلى ملفك الشخصي."
 
 #: mod/match.php:93 src/Module/BaseSearch.php:117
 msgid "No matches"
@@ -948,7 +697,7 @@ msgstr "تعذر العثور على معلومات المتراسل."
 
 #: mod/message.php:90 mod/wallmessage.php:75
 msgid "Message could not be sent."
-msgstr "تعذر ارسال الرسالة."
+msgstr "تعذر إرسال الرسالة."
 
 #: mod/message.php:93 mod/wallmessage.php:78
 msgid "Message collection failure."
@@ -956,13 +705,13 @@ msgstr "فشل جمع الرسائل."
 
 #: mod/message.php:120 src/Module/Notifications/Introductions.php:113
 #: src/Module/Notifications/Introductions.php:148
-#: src/Module/Notifications/Notification.php:56
+#: src/Module/Notifications/Notification.php:57
 msgid "Discard"
-msgstr "تجاهل"
+msgstr "ارفض"
 
 #: mod/message.php:133 src/Content/Nav.php:283 view/theme/frio/theme.php:234
 msgid "Messages"
-msgstr "رسائل"
+msgstr "الرسائل"
 
 #: mod/message.php:146
 msgid "Conversation not found."
@@ -974,11 +723,11 @@ msgstr "لم تحذف الرسالة."
 
 #: mod/message.php:166
 msgid "Conversation was not removed."
-msgstr "لم تزل المحادثة."
+msgstr "لم تُزل المحادثة."
 
 #: mod/message.php:180 mod/message.php:286 mod/wallmessage.php:123
 msgid "Please enter a link URL:"
-msgstr "يرجى ادخال عنوان الرابط:"
+msgstr "يرجى إدخال الرابط:"
 
 #: mod/message.php:189 mod/wallmessage.php:128
 msgid "Send Private Message"
@@ -986,7 +735,7 @@ msgstr "أرسل رسالة خاصة"
 
 #: mod/message.php:190 mod/message.php:347 mod/wallmessage.php:130
 msgid "To:"
-msgstr "الى:"
+msgstr "إلى:"
 
 #: mod/message.php:191 mod/message.php:348 mod/wallmessage.php:131
 msgid "Subject:"
@@ -1063,7 +812,7 @@ msgstr "الملاحظات الشخصية مرئية لك فقط."
 
 #: mod/ostatus_subscribe.php:37
 msgid "Subscribing to contacts"
-msgstr "يشتراك في متراسلين"
+msgstr "يشترك في متراسلين"
 
 #: mod/ostatus_subscribe.php:47
 msgid "No contact provided."
@@ -1071,7 +820,7 @@ msgstr "لم يُقدم متراسلين."
 
 #: mod/ostatus_subscribe.php:53
 msgid "Couldn't fetch information for contact."
-msgstr "تعذر جلب معلومات التمراسل."
+msgstr "تعذر جلب معلومات المتراسل."
 
 #: mod/ostatus_subscribe.php:64
 msgid "Couldn't fetch friends for contact."
@@ -1103,263 +852,263 @@ msgstr "فشل"
 
 #: mod/ostatus_subscribe.php:121
 msgid "ignored"
-msgstr "تجاهل"
+msgstr "متجاهل"
 
 #: mod/ostatus_subscribe.php:126 mod/repair_ostatus.php:57
 msgid "Keep this window open until done."
 msgstr "أبق هذه النافذة مفتوحة حتى ينتهي."
 
-#: mod/photos.php:111 src/Module/BaseProfile.php:67
+#: mod/photos.php:108 src/Module/BaseProfile.php:67
 msgid "Photo Albums"
 msgstr "ألبومات الصور"
 
-#: mod/photos.php:112 mod/photos.php:1608
+#: mod/photos.php:109 mod/photos.php:1593
 msgid "Recent Photos"
 msgstr "الصور الأخيرة"
 
-#: mod/photos.php:114 mod/photos.php:1090 mod/photos.php:1610
+#: mod/photos.php:111 mod/photos.php:1082 mod/photos.php:1595
 msgid "Upload New Photos"
 msgstr "ارفع صور جديدة"
 
-#: mod/photos.php:132 src/Module/BaseSettings.php:37
+#: mod/photos.php:129 src/Module/BaseSettings.php:37
 msgid "everybody"
 msgstr "الجميع"
 
-#: mod/photos.php:170
+#: mod/photos.php:167
 msgid "Contact information unavailable"
 msgstr "معلومات المتراسل غير متوفرة"
 
-#: mod/photos.php:204
+#: mod/photos.php:196
 msgid "Album not found."
 msgstr "لم يُعثر على الألبوم."
 
-#: mod/photos.php:258
+#: mod/photos.php:250
 msgid "Album successfully deleted"
 msgstr "حُذف الألبوم بنجاح"
 
-#: mod/photos.php:260
+#: mod/photos.php:252
 msgid "Album was empty."
 msgstr "ألبوم فارغ."
 
-#: mod/photos.php:292
+#: mod/photos.php:284
 msgid "Failed to delete the photo."
 msgstr "فشل حذف الصفحة."
 
-#: mod/photos.php:567
+#: mod/photos.php:559
 msgid "a photo"
 msgstr "صورة"
 
-#: mod/photos.php:567
+#: mod/photos.php:559
 #, php-format
 msgid "%1$s was tagged in %2$s by %3$s"
 msgstr "ذكر %3$s %1$s في %2$s"
 
-#: mod/photos.php:650 mod/photos.php:653 mod/photos.php:680
+#: mod/photos.php:642 mod/photos.php:645 mod/photos.php:672
 #: mod/wall_upload.php:207 src/Module/Settings/Profile/Photo/Index.php:60
 #, php-format
 msgid "Image exceeds size limit of %s"
 msgstr "تجاوزت الصورة الحد الأقصى للحجم وهو %s"
 
-#: mod/photos.php:656
+#: mod/photos.php:648
 msgid "Image upload didn't complete, please try again"
 msgstr "لم يكتمل رفع الصورة، من فضلك أعد المحاولة"
 
-#: mod/photos.php:659
+#: mod/photos.php:651
 msgid "Image file is missing"
 msgstr "ملف الصورة مفقود"
 
-#: mod/photos.php:664
+#: mod/photos.php:656
 msgid ""
 "Server can't accept new file upload at this time, please contact your "
 "administrator"
 msgstr "الخادم لا يقبل رفع ملفات جديدة، يرجى التواصل مع مدير الموقع"
 
-#: mod/photos.php:688
+#: mod/photos.php:680
 msgid "Image file is empty."
 msgstr "ملف الصورة فارغ."
 
-#: mod/photos.php:703 mod/wall_upload.php:166
+#: mod/photos.php:695 mod/wall_upload.php:166
 #: src/Module/Settings/Profile/Photo/Index.php:69
 msgid "Unable to process image."
 msgstr "تعذرت معالجة الصورة."
 
-#: mod/photos.php:732 mod/wall_upload.php:232
+#: mod/photos.php:724 mod/wall_upload.php:232
 #: src/Module/Settings/Profile/Photo/Index.php:96
 msgid "Image upload failed."
 msgstr "فشل رفع الصورة."
 
-#: mod/photos.php:824
+#: mod/photos.php:816
 msgid "No photos selected"
 msgstr "لم تختر صورًا"
 
-#: mod/photos.php:893
+#: mod/photos.php:885
 msgid "Access to this item is restricted."
 msgstr "الوصول إلى هذا العنصر مقيد."
 
-#: mod/photos.php:948
+#: mod/photos.php:940
 msgid "Upload Photos"
 msgstr "ارفع صورًا"
 
-#: mod/photos.php:952 mod/photos.php:1035
+#: mod/photos.php:944 mod/photos.php:1030
 msgid "New album name: "
 msgstr "اسم الألبوم الجديد: "
 
-#: mod/photos.php:953
+#: mod/photos.php:945
 msgid "or select existing album:"
 msgstr "أو اختر ألبومًا موجودًا:"
 
-#: mod/photos.php:954
+#: mod/photos.php:946
 msgid "Do not show a status post for this upload"
 msgstr "لا تظهر مشاركة حالة لهذا الملف المرفوع"
 
-#: mod/photos.php:1015
+#: mod/photos.php:1011
 msgid "Do you really want to delete this photo album and all its photos?"
 msgstr "أتريد حذف هذا الألبوم وكافة محتوياته؟"
 
-#: mod/photos.php:1016 mod/photos.php:1040
+#: mod/photos.php:1012 mod/photos.php:1035
 msgid "Delete Album"
 msgstr "احذف الألبوم"
 
-#: mod/photos.php:1046
+#: mod/photos.php:1039
 msgid "Edit Album"
 msgstr "حرر الألبوم"
 
-#: mod/photos.php:1047
+#: mod/photos.php:1040
 msgid "Drop Album"
 msgstr "احذف الألبوم"
 
-#: mod/photos.php:1052
+#: mod/photos.php:1044
 msgid "Show Newest First"
 msgstr "اعرض الأحدث أولًا"
 
-#: mod/photos.php:1054
+#: mod/photos.php:1046
 msgid "Show Oldest First"
 msgstr "اعرض الأقدم أولًا"
 
-#: mod/photos.php:1075 mod/photos.php:1593
+#: mod/photos.php:1067 mod/photos.php:1578
 msgid "View Photo"
 msgstr "اعرض الصور"
 
-#: mod/photos.php:1108
+#: mod/photos.php:1100
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "رُفض الإذن. قد يكون الوصول إلى هذا العنصر مقيدا."
 
-#: mod/photos.php:1110
+#: mod/photos.php:1102
 msgid "Photo not available"
 msgstr "الصورة غير متوفرة"
 
-#: mod/photos.php:1120
+#: mod/photos.php:1112
 msgid "Do you really want to delete this photo?"
 msgstr "أتريد حذف هذه الصورة؟"
 
-#: mod/photos.php:1121 mod/photos.php:1313
+#: mod/photos.php:1113 mod/photos.php:1305
 msgid "Delete Photo"
 msgstr "احذف الصورة"
 
-#: mod/photos.php:1211
+#: mod/photos.php:1203
 msgid "View photo"
 msgstr "اعرض الصورة"
 
-#: mod/photos.php:1213
+#: mod/photos.php:1205
 msgid "Edit photo"
 msgstr "حرر الصورة"
 
-#: mod/photos.php:1214
+#: mod/photos.php:1206
 msgid "Delete photo"
 msgstr "احذف الصورة"
 
-#: mod/photos.php:1215
+#: mod/photos.php:1207
 msgid "Use as profile photo"
 msgstr "استخدامها كصورة الملف الشخصي"
 
-#: mod/photos.php:1222
+#: mod/photos.php:1214
 msgid "Private Photo"
 msgstr "صور خاصة"
 
-#: mod/photos.php:1228
+#: mod/photos.php:1220
 msgid "View Full Size"
 msgstr "اعرض الحجم الكامل"
 
-#: mod/photos.php:1281
+#: mod/photos.php:1273
 msgid "Tags: "
 msgstr "الوسوم: "
 
-#: mod/photos.php:1284
+#: mod/photos.php:1276
 msgid "[Select tags to remove]"
 msgstr "[اختر وسومًا لإزالتها]"
 
-#: mod/photos.php:1299
+#: mod/photos.php:1291
 msgid "New album name"
 msgstr "اسم الألبوم الجديد"
 
-#: mod/photos.php:1300
+#: mod/photos.php:1292
 msgid "Caption"
 msgstr "وصف الصورة"
 
-#: mod/photos.php:1301
+#: mod/photos.php:1293
 msgid "Add a Tag"
 msgstr "أضف وسمًا"
 
-#: mod/photos.php:1301
+#: mod/photos.php:1293
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "مثال: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: mod/photos.php:1302
+#: mod/photos.php:1294
 msgid "Do not rotate"
 msgstr "لا تدورها"
 
-#: mod/photos.php:1303
+#: mod/photos.php:1295
 msgid "Rotate CW (right)"
 msgstr "أدر باتجاه عقارب الساعة"
 
-#: mod/photos.php:1304
+#: mod/photos.php:1296
 msgid "Rotate CCW (left)"
 msgstr "أدر عكس اتجاه عقارب الساعة"
 
-#: mod/photos.php:1350 mod/photos.php:1406 mod/photos.php:1480
+#: mod/photos.php:1342 mod/photos.php:1398 mod/photos.php:1472
 #: src/Module/Contact.php:993 src/Module/Item/Compose.php:148
 #: src/Object/Post.php:960
 msgid "This is you"
 msgstr "هذا أنت"
 
-#: mod/photos.php:1352 mod/photos.php:1408 mod/photos.php:1482
+#: mod/photos.php:1344 mod/photos.php:1400 mod/photos.php:1474
 #: src/Object/Post.php:496 src/Object/Post.php:962
 msgid "Comment"
 msgstr "علِّق"
 
-#: mod/photos.php:1441 src/Content/Conversation.php:615
+#: mod/photos.php:1433 src/Content/Conversation.php:615
 #: src/Object/Post.php:227
 msgid "Select"
 msgstr "اختر"
 
-#: mod/photos.php:1442 mod/settings.php:563 src/Content/Conversation.php:616
+#: mod/photos.php:1434 mod/settings.php:563 src/Content/Conversation.php:616
 #: src/Module/Admin/Users/Active.php:139
 #: src/Module/Admin/Users/Blocked.php:140 src/Module/Admin/Users/Index.php:153
 msgid "Delete"
 msgstr "احذف"
 
-#: mod/photos.php:1503 src/Object/Post.php:349
+#: mod/photos.php:1495 src/Object/Post.php:349
 msgid "Like"
 msgstr "أعجبني"
 
-#: mod/photos.php:1504 src/Object/Post.php:349
+#: mod/photos.php:1496 src/Object/Post.php:349
 msgid "I like this (toggle)"
 msgstr "أعجبت به (بدِّل)"
 
-#: mod/photos.php:1505 src/Object/Post.php:350
+#: mod/photos.php:1497 src/Object/Post.php:350
 msgid "Dislike"
 msgstr "لم يعجبني"
 
-#: mod/photos.php:1507 src/Object/Post.php:350
+#: mod/photos.php:1499 src/Object/Post.php:350
 msgid "I don't like this (toggle)"
 msgstr "لم أعجب به (بدِّل)"
 
-#: mod/photos.php:1529
+#: mod/photos.php:1521
 msgid "Map"
 msgstr "خريطة"
 
-#: mod/photos.php:1599
+#: mod/photos.php:1584
 msgid "View Album"
 msgstr "اعرض الألبوم"
 
@@ -1378,15 +1127,19 @@ msgstr "{0} و %d يطلبون التسجيل"
 
 #: mod/redir.php:49 mod/redir.php:102
 msgid "Bad Request."
-msgstr "طلب خاطئ"
+msgstr "طلب خاطئ."
 
 #: mod/redir.php:55 mod/redir.php:129 src/Module/Contact/Advanced.php:54
 #: src/Module/Contact/Advanced.php:105 src/Module/Contact/Contacts.php:36
 #: src/Module/Contact/Media.php:43 src/Module/FriendSuggest.php:54
-#: src/Module/FriendSuggest.php:93 src/Module/Group.php:105
+#: src/Module/FriendSuggest.php:92 src/Module/Group.php:105
 msgid "Contact not found."
 msgstr "لم يُعثر على المتراسل."
 
+#: mod/removeme.php:63 src/Navigation/Notifications/Repository/Notify.php:454
+msgid "[Friendica System Notify]"
+msgstr "[Friendica System Notify]"
+
 #: mod/removeme.php:63
 msgid "User deleted their account"
 msgstr "حذف المستخدم حسابه"
@@ -1414,7 +1167,7 @@ msgstr "سيزيل حسابك كليا. لا مجال لتراجع عند انت
 
 #: mod/removeme.php:101
 msgid "Please enter your password for verification:"
-msgstr "يرجى ادخال كلمة المرور لتأكيد:"
+msgstr "يرجى إدخال كلمة المرور لتأكيد:"
 
 #: mod/repair_ostatus.php:36
 msgid "Resubscribing to OStatus contacts"
@@ -1465,7 +1218,7 @@ msgstr "لم تُغير كلمة المرور."
 
 #: mod/settings.php:303
 msgid "Please use a shorter name."
-msgstr "يرجى إستخدام اسم أقصر."
+msgstr "يرجى استخدام اسم أقصر."
 
 #: mod/settings.php:306
 msgid "Name too short."
@@ -1477,7 +1230,7 @@ msgstr "كلمة مرور خاطئة."
 
 #: mod/settings.php:318
 msgid "Invalid email."
-msgstr "البريد الالكتروني غير صالح."
+msgstr "البريد الإلكتروني غير صالح."
 
 #: mod/settings.php:324
 msgid "Cannot change to that email."
@@ -1485,11 +1238,11 @@ msgstr "لا يمكن التغيير إلى هذا البريد الإلكترو
 
 #: mod/settings.php:365
 msgid "Private forum has no privacy permissions. Using default privacy group."
-msgstr "المنتدى الخاص ليس لديه أذون الخصوصية. يستخدم مجموعة الخصوصية الافتراضية."
+msgstr "المنتدى الخاص ليس لديه أذونات خصوصية. يستخدم مجموعة الخصوصية الافتراضية."
 
 #: mod/settings.php:368
 msgid "Private forum has no privacy permissions and no default privacy group."
-msgstr "المنتدى الخاص ليس لديه أذون الخصوصية ولا مجموعة خصوصية افتراضية."
+msgstr "المنتدى الخاص ليس لديه أذونات خصوصية ولا مجموعة خصوصية افتراضية."
 
 #: mod/settings.php:387
 msgid "Settings were not updated."
@@ -1534,7 +1287,7 @@ msgstr "ميزات إضافية"
 
 #: mod/settings.php:474 mod/settings.php:565 mod/settings.php:702
 #: src/Module/Admin/Addons/Index.php:69 src/Module/Admin/Features.php:87
-#: src/Module/Admin/Logs/Settings.php:82 src/Module/Admin/Site.php:500
+#: src/Module/Admin/Logs/Settings.php:82 src/Module/Admin/Site.php:502
 #: src/Module/Admin/Themes/Index.php:113 src/Module/Admin/Tos.php:66
 #: src/Module/Settings/Delegation.php:170 src/Module/Settings/Display.php:194
 msgid "Save Settings"
@@ -1567,7 +1320,7 @@ msgstr "الوصول إلى البريد الإلكتروني معطل في هذ
 
 #: mod/settings.php:528 mod/settings.php:563
 msgid "None"
-msgstr "لا شيﺀ"
+msgstr "لا شيء"
 
 #: mod/settings.php:534 src/Module/BaseSettings.php:80
 msgid "Social Networks"
@@ -1652,7 +1405,7 @@ msgstr "أصلح اشتراكات OStatus"
 
 #: mod/settings.php:552
 msgid "Email/Mailbox Setup"
-msgstr "تثبيت بريد الكتروني/صندوق بريد"
+msgstr "إعداد بريد الكتروني/صندوق بريد"
 
 #: mod/settings.php:553
 msgid ""
@@ -1678,7 +1431,7 @@ msgstr "الحماية:"
 
 #: mod/settings.php:559
 msgid "Email login name:"
-msgstr "اسم الولوج للبريد الالكتروني:"
+msgstr "اسم الولوج للبريد الإلكتروني:"
 
 #: mod/settings.php:560
 msgid "Email password:"
@@ -1750,7 +1503,7 @@ msgstr "صفحة إخبارية"
 msgid ""
 "Account for a news reflector that automatically approves contact requests as"
 " \"Followers\"."
-msgstr ""
+msgstr "حساب إخباري يوافق تلقائياً على طلبات المراسلة \"كمتابعين\"."
 
 #: mod/settings.php:637 src/Module/Admin/BaseUsers.php:109
 msgid "Community Forum"
@@ -1778,7 +1531,7 @@ msgstr "صفحة سياسي"
 msgid ""
 "Account for a public profile that automatically approves contact requests as"
 " \"Followers\"."
-msgstr "حساب ملف شخصي عمومي يوافق تلقائياً على طلبات المراسلة \"كمتابعين\"."
+msgstr "حساب شخصي علني يوافق تلقائياً على طلبات المراسلة \"كمتابعين\"."
 
 #: mod/settings.php:649 src/Module/Admin/BaseUsers.php:101
 msgid "Public Forum"
@@ -1824,14 +1577,14 @@ msgid ""
 "Your profile will be published in this node's <a href=\"%s\">local "
 "directory</a>. Your profile details may be publicly visible depending on the"
 " system settings."
-msgstr "سيتشر ملفك الشخصي في <a href=\"%s\"> الدليل المحلي</a> لهذه العقدة. تعتمد خصوصية معلوماتك على إعدادات النظام."
+msgstr "سينشر ملفك الشخصي في <a href=\"%s\"> الدليل المحلي</a> لهذه العقدة. تعتمد خصوصية معلوماتك على إعدادات النظام."
 
 #: mod/settings.php:683
 #, php-format
 msgid ""
 "Your profile will also be published in the global friendica directories "
 "(e.g. <a href=\"%s\">%s</a>)."
-msgstr "سينشر ملفك الشخصي كذلك في الأدلة العالمية لفرَندِكا (مثال <a href=\"%s\">%s</a>)."
+msgstr "سينشر ملفك الشخصي كذلك في الأدلة العالمية لفرَندِيكا (مثال <a href=\"%s\">%s</a>)."
 
 #: mod/settings.php:689
 #, php-format
@@ -1854,7 +1607,7 @@ msgstr "كلمة المرور الجديدة:"
 msgid ""
 "Allowed characters are a-z, A-Z, 0-9 and special characters except white "
 "spaces, accentuated letters and colon (:)."
-msgstr "المحارف المسموح بها هي a-z، A-Z، 0-9 والأحرف الخاصة باستثناء المساحات، الأحرف المنبورة والكولون (:)."
+msgstr "المحارف المسموح بها هي a-z، A-Z، 0-9 والأحرف الخاصة باستثناء المساحات، الأحرف المنبورة ونقطتي التفسير (:)."
 
 #: mod/settings.php:710 src/Module/Register.php:152
 msgid "Confirm:"
@@ -1894,7 +1647,7 @@ msgstr "الاسم الكامل:"
 
 #: mod/settings.php:719
 msgid "Email Address:"
-msgstr "البريد الالكتروني:"
+msgstr "البريد الإلكتروني:"
 
 #: mod/settings.php:720
 msgid "Your Timezone:"
@@ -1972,7 +1725,7 @@ msgid ""
 "Your public posts will not appear on the community pages or in search "
 "results, nor be sent to relay servers. However they can still appear on "
 "public feeds on remote servers."
-msgstr "لن تظهر مشاركتك العامومية على صفحات المجتمع أو في نتائج البحث، ولن يتم إرسالها إلى خوادم الترحيل. بيد أنها لا تزال تظهر في التغذية العامومية للخوادم البعيدة."
+msgstr "لن تظهر مشاركتك العلنية على صفحات المجتمع أو في نتائج البحث، ولن يتم إرسالها إلى خوادم الترحيل. بيد أنها لا تزال تظهر في التغذية العمومية للخوادم البعيدة."
 
 #: mod/settings.php:733
 msgid "Make all posted pictures accessible"
@@ -1984,7 +1737,7 @@ msgid ""
 "is a workaround for the problem that most other networks can't handle "
 "permissions on pictures. Non public pictures still won't be visible for the "
 "public on your photo albums though."
-msgstr "يسمح هذا الخيار بالوصول للصورة المنشورة عبر رابط مباشر. هذا حل لمعظم الشبكات التي لا يمكنها التعامل مع الأذون. صورك غير العلنية ستبقى مخفية."
+msgstr "يسمح هذا الخيار بالوصول للصورة المنشورة عبر رابط مباشر. هذا حل لمعظم الشبكات التي لا يمكنها التعامل مع الأذونات. صورك غير العلنية ستبقى مخفية."
 
 #: mod/settings.php:734
 msgid "Allow friends to post to your profile page?"
@@ -1994,7 +1747,7 @@ msgstr "أتسمح لأصدقائك بالنشر في صفحة ملفك الشخ
 msgid ""
 "Your contacts may write posts on your profile wall. These posts will be "
 "distributed to your contacts"
-msgstr ""
+msgstr "يمكن لمتراسليك كتابة مشاركات على حائط ملفك الشخصي. ستكون هذه المشركات مرئية لمتراسليك"
 
 #: mod/settings.php:735
 msgid "Allow friends to tag your posts?"
@@ -2020,7 +1773,7 @@ msgstr "حد الرسائل اليومي المستلمة من مجهولين:"
 
 #: mod/settings.php:739
 msgid "Default Post Permissions"
-msgstr "أذون النشر الافتراضية"
+msgstr "أذونات النشر الافتراضية"
 
 #: mod/settings.php:743
 msgid "Expiration settings"
@@ -2085,7 +1838,7 @@ msgstr "إعدادات التنبيهات"
 
 #: mod/settings.php:753
 msgid "Send a notification email when:"
-msgstr "أرسل تنبيها لبريدي الإلكتروتي عند:"
+msgstr "أرسل تنبيها للبريدي الإلكتروني عند:"
 
 #: mod/settings.php:754
 msgid "You receive an introduction"
@@ -2105,7 +1858,7 @@ msgstr "يكتب شخص ما تعليق متابعة"
 
 #: mod/settings.php:758
 msgid "You receive a private message"
-msgstr "تلقيت رسالت خاصة"
+msgstr "تلقيت رسالة خاصة"
 
 #: mod/settings.php:759
 msgid "You receive a friend suggestion"
@@ -2145,7 +1898,7 @@ msgstr "رسائل تنبيهية كنص فقط"
 
 #: mod/settings.php:771
 msgid "Send text only notification emails, without the html part"
-msgstr "أرسال بريد التنبيه كنص فقط، بدون وسوم html"
+msgstr "أرسل بريد التنبيه كنص فقط، بدون وسوم html"
 
 #: mod/settings.php:773
 msgid "Show detailled notifications"
@@ -2166,7 +1919,7 @@ msgid ""
 "You don't see posts from ignored contacts. But you still see their comments."
 " This setting controls if you want to still receive regular notifications "
 "that are caused by ignored contacts or not."
-msgstr "أنت لا ترى مشاركات المنراسلين المتجاهلين. لكن لا يزال بإمكانك رؤية تعليقاتهم. هذا الإعداد يتحكم إذا كنت ترغب في الاستمرار في تلقي تنبيهات سببها المتراسلون المتجاهلون."
+msgstr "أنت لا ترى مشاركات المتراسلين المتجاهلين. لكن لا يزال بإمكانك رؤية تعليقاتهم. هذا الإعداد يتحكم إذا كنت ترغب في الاستمرار في تلقي تنبيهات سببها المتراسلون المتجاهلون."
 
 #: mod/settings.php:781
 msgid "Advanced Account/Page Type Settings"
@@ -2273,7 +2026,7 @@ msgstr "تحتاج إلى تصدير حسابك من الخادم القديم 
 msgid ""
 "This feature is experimental. We can't import contacts from the OStatus "
 "network (GNU Social/Statusnet) or from Diaspora"
-msgstr ""
+msgstr "هذه الميزة تجريبية. لا يمكن استيراد متراسلين من شبكة OStatus (GNU Social/Statusnet) أو من شبكة Diaspora"
 
 #: mod/uimport.php:68
 msgid "Account file"
@@ -2334,7 +2087,7 @@ msgstr "تجاوز الملف الحد الأقصى للحجم وهو %s"
 msgid "File upload failed."
 msgstr "فشل رفع الملف."
 
-#: mod/wall_upload.php:224 src/Model/Photo.php:985
+#: mod/wall_upload.php:224 src/Model/Photo.php:987
 msgid "Wall Photos"
 msgstr "صور الحائط"
 
@@ -2387,7 +2140,7 @@ msgstr "هذه الطريقة غير مسموح بها لهذه الوحدة. ا
 
 #: src/App/Router.php:243 src/Module/HTTPException/PageNotFound.php:32
 msgid "Page not found."
-msgstr "لم يتم العثور على الصفحة."
+msgstr "لم يُعثر على الصفحة."
 
 #: src/BaseModule.php:180
 msgid ""
@@ -2400,8 +2153,8 @@ msgid "All contacts"
 msgstr "كل المتراسلين"
 
 #: src/BaseModule.php:212 src/Content/Widget.php:231 src/Core/ACL.php:193
-#: src/Module/Contact.php:756 src/Module/PermissionTooltip.php:75
-#: src/Module/PermissionTooltip.php:97
+#: src/Module/Contact.php:756 src/Module/PermissionTooltip.php:79
+#: src/Module/PermissionTooltip.php:101
 msgid "Followers"
 msgstr "متابِعون"
 
@@ -2913,7 +2666,7 @@ msgstr "الوسوم الشائعة"
 msgid ""
 "Show a community page widget with a list of the most popular tags in recent "
 "public posts."
-msgstr ""
+msgstr "أظهر ودجة صفحة المجتمع تحوي قائمة الوسوم المتداولة في المشاركات العلنية الأخيرة."
 
 #: src/Content/Feature.php:104
 msgid "Post Composition Features"
@@ -3009,32 +2762,32 @@ msgstr "حدث"
 msgid "Follow Thread"
 msgstr "تابع المناقشة"
 
-#: src/Content/Item.php:443 src/Model/Contact.php:1076
+#: src/Content/Item.php:443 src/Model/Contact.php:1077
 msgid "View Status"
 msgstr "اعرض الحالة"
 
 #: src/Content/Item.php:444 src/Content/Item.php:466
-#: src/Model/Contact.php:1010 src/Model/Contact.php:1068
-#: src/Model/Contact.php:1077 src/Module/Directory.php:160
-#: src/Module/Settings/Profile/Index.php:224
+#: src/Model/Contact.php:1011 src/Model/Contact.php:1069
+#: src/Model/Contact.php:1078 src/Module/Directory.php:160
+#: src/Module/Settings/Profile/Index.php:226
 msgid "View Profile"
 msgstr "اعرض الملف الشخصي"
 
-#: src/Content/Item.php:445 src/Model/Contact.php:1078
+#: src/Content/Item.php:445 src/Model/Contact.php:1079
 msgid "View Photos"
 msgstr "اعرض الصور"
 
-#: src/Content/Item.php:446 src/Model/Contact.php:1069
-#: src/Model/Contact.php:1079
+#: src/Content/Item.php:446 src/Model/Contact.php:1070
+#: src/Model/Contact.php:1080
 msgid "Network Posts"
 msgstr "مشاركات الشبكة"
 
-#: src/Content/Item.php:447 src/Model/Contact.php:1070
-#: src/Model/Contact.php:1080
+#: src/Content/Item.php:447 src/Model/Contact.php:1071
+#: src/Model/Contact.php:1081
 msgid "View Contact"
 msgstr "اعرض المتراسل"
 
-#: src/Content/Item.php:448 src/Model/Contact.php:1081
+#: src/Content/Item.php:448 src/Model/Contact.php:1082
 msgid "Send PM"
 msgstr "أرسل رسالة خاصة"
 
@@ -3049,7 +2802,7 @@ msgstr "احجب"
 #: src/Module/Contact.php:788 src/Module/Contact.php:1072
 #: src/Module/Notifications/Introductions.php:112
 #: src/Module/Notifications/Introductions.php:184
-#: src/Module/Notifications/Notification.php:59
+#: src/Module/Notifications/Notification.php:61
 msgid "Ignore"
 msgstr "تجاهل"
 
@@ -3057,7 +2810,7 @@ msgstr "تجاهل"
 msgid "Languages"
 msgstr "اللغات"
 
-#: src/Content/Item.php:458 src/Model/Contact.php:1082
+#: src/Content/Item.php:458 src/Model/Contact.php:1083
 msgid "Poke"
 msgstr "ألكز"
 
@@ -3120,13 +2873,15 @@ msgstr "صفحة ملفك الشخصي"
 msgid "Your photos"
 msgstr "صورك"
 
-#: src/Content/Nav.php:193 view/theme/frio/theme.php:228
-msgid "Videos"
-msgstr "الفيديوهات"
+#: src/Content/Nav.php:193 src/Module/BaseProfile.php:72
+#: src/Module/BaseProfile.php:75 src/Module/Contact.php:838
+#: view/theme/frio/theme.php:228
+msgid "Media"
+msgstr "الوسائط"
 
 #: src/Content/Nav.php:193 view/theme/frio/theme.php:228
-msgid "Your videos"
-msgstr "فيديوهاتك"
+msgid "Your postings with media"
+msgstr "مشاركاتك التي تحوي وسائط"
 
 #: src/Content/Nav.php:194 view/theme/frio/theme.php:229
 msgid "Your events"
@@ -3340,8 +3095,8 @@ msgstr "التالي"
 msgid "last"
 msgstr "الأخير"
 
-#: src/Content/Text/BBCode.php:987 src/Content/Text/BBCode.php:1775
-#: src/Content/Text/BBCode.php:1776
+#: src/Content/Text/BBCode.php:987 src/Content/Text/BBCode.php:1781
+#: src/Content/Text/BBCode.php:1782
 msgid "Image/photo"
 msgstr "صورة"
 
@@ -3355,23 +3110,23 @@ msgstr "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a>
 msgid "Link to source"
 msgstr "رابط المصدر"
 
-#: src/Content/Text/BBCode.php:1693 src/Content/Text/HTML.php:943
+#: src/Content/Text/BBCode.php:1699 src/Content/Text/HTML.php:943
 msgid "Click to open/close"
 msgstr "أنقر للفتح/للإغلاق"
 
-#: src/Content/Text/BBCode.php:1724
+#: src/Content/Text/BBCode.php:1730
 msgid "$1 wrote:"
 msgstr "كتب $1:"
 
-#: src/Content/Text/BBCode.php:1780 src/Content/Text/BBCode.php:1781
+#: src/Content/Text/BBCode.php:1786 src/Content/Text/BBCode.php:1787
 msgid "Encrypted content"
 msgstr "محتوى مشفر"
 
-#: src/Content/Text/BBCode.php:1996
+#: src/Content/Text/BBCode.php:2002
 msgid "Invalid source protocol"
 msgstr "ميفاق المصدر غير صالح"
 
-#: src/Content/Text/BBCode.php:2011
+#: src/Content/Text/BBCode.php:2017
 msgid "Invalid link protocol"
 msgstr "ميفاق الرابط غير صالح"
 
@@ -3514,7 +3269,7 @@ msgstr "الأشخاص"
 msgid "Organisations"
 msgstr "المنظّمات"
 
-#: src/Content/Widget.php:522 src/Model/Contact.php:1503
+#: src/Content/Widget.php:522 src/Model/Contact.php:1506
 msgid "News"
 msgstr "الأخبار"
 
@@ -3542,9 +3297,9 @@ msgstr "لا متراسلين"
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
-msgstr[0] "لا متراسلين"
-msgstr[1] "متراسل واحد"
-msgstr[2] "متراسلان"
+msgstr[0] "لا متراسلين %d"
+msgstr[1] "متراسل %d"
+msgstr[2] "متراسلان %d"
 msgstr[3] "%d متراسلين"
 msgstr[4] "%d متراسلا"
 msgstr[5] "%d متراسل"
@@ -3565,9 +3320,9 @@ msgstr "عمليات البحث المحفوظة"
 #, php-format
 msgid "Trending Tags (last %d hour)"
 msgid_plural "Trending Tags (last %d hours)"
-msgstr[0] "الوسوم الشائعة (أقل من ساعة)"
-msgstr[1] "الوسوم الشائعة (آخر ساعة)"
-msgstr[2] "الوسوم الشائعة (آخر ساعتين)"
+msgstr[0] "الوسوم الشائعة (أقل من ساعة %d)"
+msgstr[1] "الوسوم الشائعة (آخر ساعة %d)"
+msgstr[2] "الوسوم الشائعة (آخر ساعتين %d)"
 msgstr[3] "الوسوم الشائعة (آخر %d ساعات)"
 msgstr[4] "الوسوم الشائعة (آخر %d ساعة)"
 msgstr[5] "الوسوم الشائعة (آخر %d ساعة)"
@@ -3599,10 +3354,10 @@ msgstr "ألغِ المتابعة"
 msgid "Yourself"
 msgstr "أنت"
 
-#: src/Core/ACL.php:200 src/Module/PermissionTooltip.php:81
-#: src/Module/PermissionTooltip.php:103
+#: src/Core/ACL.php:200 src/Module/PermissionTooltip.php:85
+#: src/Module/PermissionTooltip.php:107
 msgid "Mutuals"
-msgstr ""
+msgstr "المشتركة"
 
 #: src/Core/ACL.php:292
 msgid "Post to Email"
@@ -3687,7 +3442,7 @@ msgstr "سطر أوامر PHP"
 
 #: src/Core/Installer.php:284
 msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
-msgstr ""
+msgstr "ملف PHP التنفيذي ليس ملفًا ثنائيًا (قد يكون إصدار cgi-fcgi)"
 
 #: src/Core/Installer.php:285
 msgid "Found PHP version: "
@@ -3695,13 +3450,13 @@ msgstr "اصدار PHP: "
 
 #: src/Core/Installer.php:287
 msgid "PHP cli binary"
-msgstr ""
+msgstr "الملف الثنائي لـ PHP"
 
 #: src/Core/Installer.php:300
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
-msgstr ""
+msgstr "إصدار سطر أوامر PHP المثبت على النظام ليس مفعلًا فيه \"register_argc_argv\"."
 
 #: src/Core/Installer.php:301
 msgid "This is required for message delivery to work."
@@ -3730,11 +3485,11 @@ msgstr "ولّد مفاتيح التشفير"
 #: src/Core/Installer.php:394
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr ""
+msgstr "خطأ: وحدة mod-rewrite لخادم أباتشي مطلوبة لكنها لم تثبت."
 
 #: src/Core/Installer.php:399
 msgid "Apache mod_rewrite module"
-msgstr ""
+msgstr "وحدة Apache mod_rewrite"
 
 #: src/Core/Installer.php:405
 msgid "Error: PDO or MySQLi PHP module required but not installed."
@@ -3807,7 +3562,7 @@ msgstr ""
 
 #: src/Core/Installer.php:471
 msgid "Program execution functions"
-msgstr ""
+msgstr "مهام تنفيذ البرنامج"
 
 #: src/Core/Installer.php:472
 msgid ""
@@ -3835,7 +3590,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "مثبِت الويب غير قادر على إنشاء ملف \"local.config.php\" في مجلد \"config\" التابع للخادم."
 
 #: src/Core/Installer.php:510
 msgid ""
@@ -3922,7 +3677,7 @@ msgstr ""
 
 #: src/Core/Installer.php:609
 msgid "Please ensure that the connection to the server is secure."
-msgstr ""
+msgstr "يرجى التأكد من أن الاتصال بالخادم آمن."
 
 #: src/Core/Installer.php:610
 msgid "No TLS detected"
@@ -3942,7 +3697,7 @@ msgstr ""
 
 #: src/Core/Installer.php:643
 msgid "ImageMagick supports GIF"
-msgstr ""
+msgstr "ImageMagick يدعم GIF"
 
 #: src/Core/Installer.php:665
 msgid "Database already in use."
@@ -4156,7 +3911,7 @@ msgstr ""
 msgid ""
 "Friendica can't display this page at the moment, please contact the "
 "administrator."
-msgstr "لا يمكن لفرَندِكا عرض هذه الصفحة حاليا، رجاء اتصل بالمدير."
+msgstr "لا يمكن لفرَندِيكا عرض هذه الصفحة حاليا، رجاء اتصل بالمدير."
 
 #: src/Core/Renderer.php:141
 msgid "template engine cannot be registered without a name."
@@ -4171,24 +3926,24 @@ msgstr "لم يسجل محرك القوالب!"
 msgid ""
 "Updates from version %s are not supported. Please update at least to version"
 " 2021.01 and wait until the postupdate finished version 1383."
-msgstr ""
+msgstr "التحديثات التلقائية غير مدعومة من الإصدار %s. يرجى التحديث يدويًا إلى الإصدار 2021.01 وانتظر تحديث البيانات للوصول إلى الإصدار 1383."
 
 #: src/Core/Update.php:78
 #, php-format
 msgid ""
 "Updates from postupdate version %s are not supported. Please update at least"
 " to version 2021.01 and wait until the postupdate finished version 1383."
-msgstr ""
+msgstr "التحديث التلقائي للبيانات من الإصدار %s غير مدعوم. يرجى التحديث يدويًا إلى الإصدار 2021.01 وانتظر تحديث البيانات للوصول إلى الإصدار 1383."
 
 #: src/Core/Update.php:152
 #, php-format
 msgid "%s: executing pre update %d"
-msgstr ""
+msgstr "%s: ينفذ التحديث الاستباقي %d"
 
 #: src/Core/Update.php:190
 #, php-format
 msgid "%s: executing post update %d"
-msgstr ""
+msgstr "%s: ينفذ تحديث البيانات %d"
 
 #: src/Core/Update.php:261
 #, php-format
@@ -4219,7 +3974,7 @@ msgstr "[تنبيهات فرنديكا] تحديث قاعدة البيانات"
 msgid ""
 "\n"
 "\t\t\t\t\tThe friendica database was successfully updated from %s to %s."
-msgstr "\n\t\t\t\t\tحُدثت قاعدة البيانات بنجاح من الاصدار %s الى %s."
+msgstr "\n\t\t\t\t\tحُدثت قاعدة البيانات بنجاح من الإصدار %s إلى %s."
 
 #: src/Core/UserImport.php:125
 msgid "Error decoding account file"
@@ -4227,7 +3982,7 @@ msgstr "خطأ أثناء فك ترميز ملف الحساب"
 
 #: src/Core/UserImport.php:131
 msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr ""
+msgstr "خطأ! لا توجد بيانات إصدار في الملف! هذا ليس ملف شخصي؟"
 
 #: src/Core/UserImport.php:139
 #, php-format
@@ -4242,7 +3997,7 @@ msgstr "خطأ في إنشاء المستخدم"
 #, php-format
 msgid "%d contact not imported"
 msgid_plural "%d contacts not imported"
-msgstr[0] "عدد المتراسيلن غير المستوردين هو %d"
+msgstr[0] "عدد المتراسلين غير المستوردين هو %d"
 msgstr[1] "لم يستورد متراسل واحد %d"
 msgstr[2] "لم يستورد متراسلان %d"
 msgstr[3] "لم يستورد %d متراسلين"
@@ -4260,28 +4015,28 @@ msgstr "تم. يمكنك الآن الولوج باستخدام اسم المس
 #: src/Database/DBStructure.php:65
 #, php-format
 msgid "The database version had been set to %s."
-msgstr "عُين إصدار قاعدة البيانات الى %s."
+msgstr "عُين إصدار قاعدة البيانات إلى %s."
 
 #: src/Database/DBStructure.php:78
 #, php-format
 msgid ""
 "The post update is at version %d, it has to be at %d to safely drop the "
 "tables."
-msgstr ""
+msgstr "تحديث البيانات هو إصدار %d، لكن يجب أن يكون إصدار %d لتتمكن من حذف الجداول بأمان."
 
 #: src/Database/DBStructure.php:91
 msgid "No unused tables found."
-msgstr ""
+msgstr "لم يُعثر على جداول غير مستعملة."
 
 #: src/Database/DBStructure.php:96
 msgid ""
 "These tables are not used for friendica and will be deleted when you execute"
 " \"dbstructure drop -e\":"
-msgstr ""
+msgstr "فرنديكا لا تستخدم هذه الجداول يمكنك حذفها بتنفيذ \"dbstructure drop -e\":"
 
 #: src/Database/DBStructure.php:134
 msgid "There are no tables on MyISAM or InnoDB with the Antelope file format."
-msgstr ""
+msgstr "لا توجد جداول MyISAM أو InnoDB بتنسيق ملف Antelope."
 
 #: src/Database/DBStructure.php:158
 #, php-format
@@ -4289,15 +4044,15 @@ msgid ""
 "\n"
 "Error %d occurred during database update:\n"
 "%s\n"
-msgstr ""
+msgstr "\nحدث خطأ %d أثناء تحديث قاعدة البيانات:\n%s\n"
 
 #: src/Database/DBStructure.php:161
 msgid "Errors encountered performing database changes: "
-msgstr ""
+msgstr "حدثت أخطاء أثناء تحديث قاعدة البيانات: "
 
 #: src/Database/DBStructure.php:549
 msgid "Another database update is currently running."
-msgstr ""
+msgstr "تحديث آخر لقاعدة البيانات قيد التشغيل."
 
 #: src/Database/DBStructure.php:553
 #, php-format
@@ -4311,11 +4066,11 @@ msgstr "%s يحدث %s جدول."
 
 #: src/Factory/Api/Mastodon/Error.php:55
 msgid "Record not found"
-msgstr ""
+msgstr "لم يُعثر على التسجيل"
 
 #: src/Factory/Api/Mastodon/Error.php:65
 msgid "Unprocessable Entity"
-msgstr ""
+msgstr "كيان غير قابل للمعالجة"
 
 #: src/Factory/Api/Mastodon/Error.php:75
 #: src/Module/Special/HTTPException.php:50
@@ -4335,83 +4090,83 @@ msgstr "خطأ داخلي في الخادم"
 #: src/LegacyModule.php:49
 #, php-format
 msgid "Legacy module file not found: %s"
-msgstr ""
+msgstr "لم يُعثر على ملف الوحدة القديم: %s"
 
-#: src/Model/Contact.php:1072 src/Model/Contact.php:1084
+#: src/Model/Contact.php:1073 src/Model/Contact.php:1085
 msgid "UnFollow"
 msgstr "ألغِ المتابعة"
 
-#: src/Model/Contact.php:1090 src/Module/Admin/Users/Pending.php:107
+#: src/Model/Contact.php:1091 src/Module/Admin/Users/Pending.php:107
 #: src/Module/Notifications/Introductions.php:110
 #: src/Module/Notifications/Introductions.php:182
 msgid "Approve"
-msgstr "إقرار"
+msgstr "موافق"
 
-#: src/Model/Contact.php:1499
+#: src/Model/Contact.php:1502
 msgid "Organisation"
 msgstr "المنظّمة"
 
-#: src/Model/Contact.php:1507
+#: src/Model/Contact.php:1510
 msgid "Forum"
 msgstr "المنتدى"
 
-#: src/Model/Contact.php:2366
+#: src/Model/Contact.php:2380
 msgid "Disallowed profile URL."
 msgstr "رابط الملف الشخصي غير مسموح."
 
-#: src/Model/Contact.php:2371 src/Module/Friendica.php:81
+#: src/Model/Contact.php:2385 src/Module/Friendica.php:81
 msgid "Blocked domain"
 msgstr "نطاق المحجوب"
 
-#: src/Model/Contact.php:2376
+#: src/Model/Contact.php:2390
 msgid "Connect URL missing."
 msgstr "رابط الاتصال مفقود."
 
-#: src/Model/Contact.php:2385
+#: src/Model/Contact.php:2399
 msgid ""
 "The contact could not be added. Please check the relevant network "
 "credentials in your Settings -> Social Networks page."
-msgstr ""
+msgstr "تعذر إضافة المتراسل. تحقق من بيانات اعتماد الشبكة المستهدفة في الإعدادات -> صفحة الشبكات الاجتماعية."
 
-#: src/Model/Contact.php:2422
+#: src/Model/Contact.php:2436
 msgid "The profile address specified does not provide adequate information."
-msgstr ""
+msgstr "عنوان الملف الشخصي لا يوفر معلومات كافية."
 
-#: src/Model/Contact.php:2424
+#: src/Model/Contact.php:2438
 msgid "No compatible communication protocols or feeds were discovered."
-msgstr ""
+msgstr "لم تكتشف أي موافيق اتصال أو تغذيات متوافقة."
 
-#: src/Model/Contact.php:2427
+#: src/Model/Contact.php:2441
 msgid "An author or name was not found."
 msgstr ""
 
-#: src/Model/Contact.php:2430
+#: src/Model/Contact.php:2444
 msgid "No browser URL could be matched to this address."
-msgstr ""
+msgstr "لا يوجد رابط تصفح يطابق هذا العنوان."
 
-#: src/Model/Contact.php:2433
+#: src/Model/Contact.php:2447
 msgid ""
 "Unable to match @-style Identity Address with a known protocol or email "
 "contact."
-msgstr ""
+msgstr "غير قادر على مطابقة عنوان المعرف \"@\" بميفاق معروف أو متراسل بريد إلكتروني."
 
-#: src/Model/Contact.php:2434
+#: src/Model/Contact.php:2448
 msgid "Use mailto: in front of address to force email check."
-msgstr ""
+msgstr "استخدم mailto: أمام العنوان للتعرّف عليه كبريد إلكتروني."
 
-#: src/Model/Contact.php:2440
+#: src/Model/Contact.php:2454
 msgid ""
 "The profile address specified belongs to a network which has been disabled "
 "on this site."
-msgstr ""
+msgstr "عنوان الملف الشخصي تابع لشبكة محجوبة في هذا الموقع."
 
-#: src/Model/Contact.php:2445
+#: src/Model/Contact.php:2459
 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
 msgstr ""
 
-#: src/Model/Contact.php:2504
+#: src/Model/Contact.php:2518
 msgid "Unable to retrieve contact information."
 msgstr "تعذر جلب معلومات المتراسل."
 
@@ -4428,19 +4183,19 @@ msgstr "يبدأ:"
 #: src/Model/Event.php:76 src/Model/Event.php:96 src/Model/Event.php:465
 #: src/Model/Event.php:901
 msgid "Finishes:"
-msgstr ""
+msgstr "ينتهي:"
 
 #: src/Model/Event.php:414
 msgid "all-day"
-msgstr ""
+msgstr "كل اليوم"
 
 #: src/Model/Event.php:440
 msgid "Sept"
-msgstr ""
+msgstr "سبتمبر"
 
 #: src/Model/Event.php:462
 msgid "No events to display"
-msgstr ""
+msgstr "لا توجد أحداث لعرضها"
 
 #: src/Model/Event.php:578
 msgid "l, F j"
@@ -4452,7 +4207,7 @@ msgstr "حرّر الحدث"
 
 #: src/Model/Event.php:610
 msgid "Duplicate event"
-msgstr ""
+msgstr "ضاعف الحدث"
 
 #: src/Model/Event.php:611
 msgid "Delete event"
@@ -4472,7 +4227,7 @@ msgstr "أظهر الخريطة"
 
 #: src/Model/Event.php:917
 msgid "Hide map"
-msgstr "إخف الخريطة"
+msgstr "اخف الخريطة"
 
 #: src/Model/Event.php:1009
 #, php-format
@@ -4489,11 +4244,11 @@ msgid ""
 "A deleted group with this name was revived. Existing item permissions "
 "<strong>may</strong> apply to this group and any future members. If this is "
 "not what you intended, please create another group with a different name."
-msgstr ""
+msgstr "تم إحياء مجموعة محذوفة بهذا الاسم. أذونات العنصر الموجودة سبقًا <strong>قد</strong> تنطبق على هذه المجموعة وأي أعضاء في المستقبل. إذا حصل هذا، يرجى إنشاء مجموعة أخرى باسم مختلف."
 
 #: src/Model/Group.php:451
 msgid "Default privacy group for new contacts"
-msgstr ""
+msgstr "المجموعة الافتراضية للمتراسلين الجدد"
 
 #: src/Model/Group.php:483
 msgid "Everybody"
@@ -4513,7 +4268,7 @@ msgstr "حرّر المجموعة"
 
 #: src/Model/Group.php:540 src/Module/Group.php:193
 msgid "Contacts not in any group"
-msgstr "المتراسل لا ينتمي لأي مجموعة"
+msgstr "متراسلون لا ينتمون لأي مجموعة"
 
 #: src/Model/Group.php:542
 msgid "Create a new group"
@@ -4531,7 +4286,7 @@ msgstr "حرّر المجموعات"
 #: src/Model/Item.php:1677
 #, php-format
 msgid "Detected languages in this post:\\n%s"
-msgstr "اللغات المكتشفي في هذه المشاركة:\\n%s"
+msgstr "اللغات المكتشفة في هذه المشاركة:\\n%s"
 
 #: src/Model/Item.php:2628
 msgid "activity"
@@ -4539,7 +4294,7 @@ msgstr "النشاط"
 
 #: src/Model/Item.php:2630
 msgid "comment"
-msgstr ""
+msgstr "تعليق"
 
 #: src/Model/Item.php:2633
 msgid "post"
@@ -4599,7 +4354,7 @@ msgstr "[today]"
 
 #: src/Model/Profile.php:569
 msgid "Birthday Reminders"
-msgstr "تذكيرات أعياد الميلاد"
+msgstr "التذكير أبعياد الميلاد"
 
 #: src/Model/Profile.php:570
 msgid "Birthdays this week:"
@@ -4620,7 +4375,7 @@ msgstr "أحداث لهذا الأسبوع:"
 #: src/Model/Profile.php:846
 #, php-format
 msgid "OpenWebAuth: %1$s welcomes %2$s"
-msgstr ""
+msgstr "OpenWebAuth: %1$s يرحب بـ %2$s"
 
 #: src/Model/Profile.php:978
 msgid "Hometown:"
@@ -4640,7 +4395,7 @@ msgstr "منذ:"
 
 #: src/Model/Profile.php:982
 msgid "Sexual Preference:"
-msgstr ""
+msgstr "التفضيل الجنسي:"
 
 #: src/Model/Profile.php:983
 msgid "Political Views:"
@@ -4704,70 +4459,70 @@ msgstr "معلومات الاتصال وحسابات الشبكات الاجتم
 
 #: src/Model/Storage/FilesystemConfig.php:77
 msgid "Storage base path"
-msgstr ""
+msgstr "المسار الأساسي للتخزين"
 
 #: src/Model/Storage/FilesystemConfig.php:79
 msgid ""
 "Folder where uploaded files are saved. For maximum security, This should be "
 "a path outside web server folder tree"
-msgstr ""
+msgstr "المجلد حيث تحفظ الملفات المرفوعة. لأقصى قدر من الأمان، يجب أن يكون هذا المسار خارج شجرة مجلد الخادم"
 
 #: src/Model/Storage/FilesystemConfig.php:92
 msgid "Enter a valid existing folder"
-msgstr ""
+msgstr "أدخل مجلد موجود وصالح"
 
 #: src/Model/User.php:208 src/Model/User.php:1050
 msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr ""
+msgstr "خطأ فاضح: فشل توليد مفاتيح الأمان."
 
 #: src/Model/User.php:589 src/Model/User.php:622
 msgid "Login failed"
-msgstr ""
+msgstr "فشل الولوج"
 
 #: src/Model/User.php:654
 msgid "Not enough information to authenticate"
-msgstr ""
+msgstr "لا توجد معلومات كافية للمصادقة"
 
 #: src/Model/User.php:749
 msgid "Password can't be empty"
-msgstr ""
+msgstr "لا يمكن أن تكون كلمة المرور فارغة"
 
 #: src/Model/User.php:768
 msgid "Empty passwords are not allowed."
-msgstr ""
+msgstr "لا يسمح بكلمات مرور فارغة."
 
 #: src/Model/User.php:772
 msgid ""
 "The new password has been exposed in a public data dump, please choose "
 "another."
-msgstr ""
+msgstr "كلمة المرور الجديدة جزء من تسريب كلمات مرور عام ، يرجى اختيار كلمة مرور مختلفة."
 
 #: src/Model/User.php:778
 msgid ""
 "The password can't contain accentuated letters, white spaces or colons (:)"
-msgstr ""
+msgstr "لا يمكن أن تحتوي كلمة المرور على أحرف منبورة أو مسافات أو نقطتي تفسير (:)"
 
 #: src/Model/User.php:930
 msgid "Passwords do not match. Password unchanged."
-msgstr ""
+msgstr "كلمتا المرور غير متطابقتين. ولم تغير كلمة المرور."
 
 #: src/Model/User.php:937
 msgid "An invitation is required."
-msgstr ""
+msgstr "الدعوة اجبارية."
 
 #: src/Model/User.php:941
 msgid "Invitation could not be verified."
-msgstr ""
+msgstr "تعذر التحقق من الدعوة."
 
 #: src/Model/User.php:949
 msgid "Invalid OpenID url"
-msgstr ""
+msgstr "رابط OpenID عير صالح"
 
 #: src/Model/User.php:962 src/Security/Authentication.php:223
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
-msgstr ""
+msgstr "واجهنا مشكلة أثناء الولوج باستخدام OpenID. يرجى التحقق من صحة المعرف."
 
 #: src/Model/User.php:962 src/Security/Authentication.php:223
 msgid "The error message was:"
@@ -4775,7 +4530,7 @@ msgstr "رسالة الخطأ:"
 
 #: src/Model/User.php:968
 msgid "Please enter the required information."
-msgstr ""
+msgstr "يرجى إدخال المعلومات المطلوبة."
 
 #: src/Model/User.php:982
 #, php-format
@@ -4788,23 +4543,23 @@ msgstr ""
 #, php-format
 msgid "Username should be at least %s character."
 msgid_plural "Username should be at least %s characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr[0] "يجب أن لا يقل اسم المستخدم عن %s محرف."
+msgstr[1] "يجب أن لا يقل اسم المستخدم عن محرف %s."
+msgstr[2] "يجب أن لا يقل اسم المستخدم عن محرفين %s."
+msgstr[3] "يجب أن لا يقل اسم المستخدم عن %s محارف."
+msgstr[4] "يجب أن لا يقل اسم المستخدم عن %s محرف."
+msgstr[5] "يجب أن لا يقل اسم المستخدم عن %s محرف."
 
 #: src/Model/User.php:993
 #, php-format
 msgid "Username should be at most %s character."
 msgid_plural "Username should be at most %s characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr[0] "يجب أن لا يزيد اسم المستخدم عن %s محرف."
+msgstr[1] "يجب أن لا يزيد اسم المستخدم عن محرف %s."
+msgstr[2] "يجب أن لا يزيد اسم المستخدم عن محرفين %s."
+msgstr[3] "يجب أن لا يزيد اسم المستخدم عن %s محارف."
+msgstr[4] "يجب أن لا يزيد اسم المستخدم عن %s محرف."
+msgstr[5] "يجب أن لا يزيد اسم المستخدم عن %s محرف."
 
 #: src/Model/User.php:1001
 msgid "That doesn't appear to be your full (First Last) name."
@@ -4812,11 +4567,11 @@ msgstr "لا يبدو أن هذا اسمك الكامل."
 
 #: src/Model/User.php:1006
 msgid "Your email domain is not among those allowed on this site."
-msgstr "مجال بريدك الألكتروني غير مسموح به على هذا الموقع."
+msgstr "مجال بريدك الإلكتروني غير مسموح به على هذا الموقع."
 
 #: src/Model/User.php:1010
 msgid "Not a valid email address."
-msgstr "عناوين بريد الكتروني غير صالحة."
+msgstr "عناوين بريد الإكتروني غير صالحة."
 
 #: src/Model/User.php:1013
 msgid "The nickname was blocked from registration by the nodes admin."
@@ -4824,11 +4579,11 @@ msgstr "هذا اللقب محظور من قبل مدير العقدة."
 
 #: src/Model/User.php:1017 src/Model/User.php:1025
 msgid "Cannot use that email."
-msgstr ""
+msgstr "لا يمكن استخدام هذا البريد الإلكتروني."
 
 #: src/Model/User.php:1032
 msgid "Your nickname can only contain a-z, 0-9 and _."
-msgstr ""
+msgstr "يجب أن يتكون اللقب من المحارف a-z، 0-9، _."
 
 #: src/Model/User.php:1040 src/Model/User.php:1097
 msgid "Nickname is already registered. Please choose another."
@@ -4840,7 +4595,7 @@ msgstr "حدث خطأ أثناء التسجيل، رجاء حاول مرة أخ
 
 #: src/Model/User.php:1111
 msgid "An error occurred creating your default profile. Please try again."
-msgstr ""
+msgstr "حدث خطأ أثناء إنشاء الملف الشخصي الافتراضي، رجاء حاول مرة أخرى."
 
 #: src/Model/User.php:1118
 msgid "An error occurred creating your self contact. Please try again."
@@ -4853,7 +4608,7 @@ msgstr "الأصدقاء"
 #: src/Model/User.php:1127
 msgid ""
 "An error occurred creating your default contact group. Please try again."
-msgstr ""
+msgstr "حدث خطأ أثناء إنشاء مجموعة المتراسلين الافتراضية، رجاء حاول مرة أخرى."
 
 #: src/Model/User.php:1165
 msgid "Profile Photos"
@@ -4865,7 +4620,7 @@ msgid ""
 "\n"
 "\t\tDear %1$s,\n"
 "\t\t\tthe administrator of %2$s has set up an account for you."
-msgstr ""
+msgstr "\n\t\tعزيزي %1$s،\n\t\t\tأنشأ مدير %2$s حساب لك."
 
 #: src/Model/User.php:1362
 #, php-format
@@ -4897,12 +4652,12 @@ msgid ""
 "\t\tIf you ever want to delete your account, you can do so at %1$s/removeme\n"
 "\n"
 "\t\tThank you and welcome to %4$s."
-msgstr ""
+msgstr "\n\t\tتفاصيل تسجيل الولوج هي كالتالي:\n\n\t\tالموقع:\t%1$s\n\t\tاسم المستخدم:\t\t%2$s\n\t\tكلمة المرور:\t%3$s\n\n\t\tيمكنك تغيير كلمة المرور من صفحة إعدادات الحساب.\n\n\t\tيرجى أخذ بضع لحظات لمراجعة الإعدادات الأخرى في تلك الصفحة.\n\n\t\tقد ترغب أيضًا في إضافة بعض المعلومات الأساسية إلى صفحة ملفك الشخصية الافتراضي\n\t\t(من صفحة \"الملفات الشخصية\") حتى يتمكن الآخرون من العثور عليك بسهولة.\n\n\t\tنحن نوصي بوضع اسمك الكامل، إضافة لصورة،\n\t\tوإضافة بعض الكلمات المفتاحية (مفيدة جدا في تكوين صداقات) - و\n\t\tربما البلد الذي تعيش فيه.\n\n\t\tنحن نحترم حقك في الخصوصية احتراما كاملا، ولا ضرورة لأي مما سبق.\n\t\tإذا كنت جديداً ولا تعرف أي شخص هنا، فقد تساعدك هذه المعلومات على تكوين صداقات مثيرة للاهتمام.\n\n\t\tإذا كنت ترغب في حذف حسابك، يمكنك فعل ذلك في %1$s/removeme\n\n\t\tشكرا لك ومرحبًا بك في %4$s."
 
 #: src/Model/User.php:1395 src/Model/User.php:1502
 #, php-format
 msgid "Registration details for %s"
-msgstr ""
+msgstr "تفاصيل التسجيل لـ %s"
 
 #: src/Model/User.php:1415
 #, php-format
@@ -4917,12 +4672,12 @@ msgid ""
 "\t\t\tLogin Name:\t\t%4$s\n"
 "\t\t\tPassword:\t\t%5$s\n"
 "\t\t"
-msgstr ""
+msgstr "\n\t\t\tعزيزي %1$s،\n\t\t\t\tشكرا لك على التسجيل في %2$s. حسابك معلق حتى يوافق عليه المدير.\n\n\t\t\tتفاصيل الولوج هي كالتالي:\n\n\t\t\tالموقع:\t%3$s\n\t\t\tاسم المستخدم:\t\t%4$s\n\t\t\tكلمة المرور:\t\t%5$s\n\t\t\t\t"
 
 #: src/Model/User.php:1434
 #, php-format
 msgid "Registration at %s"
-msgstr ""
+msgstr "التسجيل في %s"
 
 #: src/Model/User.php:1458
 #, php-format
@@ -4931,7 +4686,7 @@ msgid ""
 "\t\t\t\tDear %1$s,\n"
 "\t\t\t\tThank you for registering at %2$s. Your account has been created.\n"
 "\t\t\t"
-msgstr ""
+msgstr "\n\t\t\t\t عزيزي %1$s،\n\t\t\t\tشكرا لك على التسجيل في %2$s. نجح إنشاء حسابك.\n\t\t\t\t"
 
 #: src/Model/User.php:1466
 #, php-format
@@ -4963,21 +4718,21 @@ msgid ""
 "\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."
-msgstr ""
+msgstr "\n\t\tتفاصيل تسجيل الولوج هي كالتالي:\n\n\t\tالموقع:\t%3$s\n\t\tاسم المستخدم:\t\t%1$s\n\t\tكلمة المرور:\t%5$s\n\n\t\tيمكنك تغيير كلمة المرور من صفحة إعدادات الحساب.\n\n\t\tيرجى أخذ بضع لحظات لمراجعة الإعدادات الأخرى في تلك الصفحة.\n\n\t\tقد ترغب أيضًا في إضافة بعض المعلومات الأساسية إلى صفحة ملفك الشخصية الافتراضي\n\t\t(من صفحة \"الملفات الشخصية\") حتى يتمكن الآخرون من العثور عليك بسهولة.\n\n\t\tنحن نوصي بوضع اسمك الكامل، إضافة لصورة،\n\t\tوإضافة بعض الكلمات المفتاحية (مفيدة جدا في تكوين صداقات) - و\n\t\tربما البلد الذي تعيش فيه.\n\n\t\tنحن نحترم حقك في الخصوصية احتراما كاملا، ولا ضرورة لأي مما سبق.\n\t\tإذا كنت جديداً ولا تعرف أي شخص هنا، فقد تساعدك هذه المعلومات على تكوين صداقات مثيرة للاهتمام.\n\n\t\tإذا كنت ترغب في حذف حسابك، يمكنك فعل ذلك في %3$s/removeme\n\n\t\tشكرا لك ومرحبًا بك في %2$s."
 
 #: src/Module/Admin/Addons/Details.php:65
 msgid "Addon not found."
-msgstr ""
+msgstr "لم يُعثر على الإضافة."
 
 #: src/Module/Admin/Addons/Details.php:76 src/Module/Admin/Addons/Index.php:49
 #, php-format
 msgid "Addon %s disabled."
-msgstr ""
+msgstr "الإضافة %s معطلة."
 
 #: src/Module/Admin/Addons/Details.php:79 src/Module/Admin/Addons/Index.php:51
 #, php-format
 msgid "Addon %s enabled."
-msgstr ""
+msgstr "الإضافة %s مفعلة."
 
 #: src/Module/Admin/Addons/Details.php:88
 #: src/Module/Admin/Themes/Details.php:46
@@ -4995,7 +4750,7 @@ msgstr "فعّل"
 #: src/Module/Admin/Blocklist/Server.php:88
 #: src/Module/Admin/Federation.php:159 src/Module/Admin/Item/Delete.php:65
 #: src/Module/Admin/Logs/Settings.php:80 src/Module/Admin/Logs/View.php:83
-#: src/Module/Admin/Queue.php:72 src/Module/Admin/Site.php:497
+#: src/Module/Admin/Queue.php:72 src/Module/Admin/Site.php:499
 #: src/Module/Admin/Storage.php:139 src/Module/Admin/Summary.php:233
 #: src/Module/Admin/Themes/Details.php:90
 #: src/Module/Admin/Themes/Index.php:111 src/Module/Admin/Tos.php:58
@@ -5029,16 +4784,16 @@ msgstr "المصين: "
 
 #: src/Module/Admin/Addons/Index.php:42
 msgid "Addons reloaded"
-msgstr ""
+msgstr "أُعيد تحميل الإضافة"
 
 #: src/Module/Admin/Addons/Index.php:53
 #, php-format
 msgid "Addon %s failed to install."
-msgstr ""
+msgstr "فشل تثبيت إضافة %s."
 
 #: src/Module/Admin/Addons/Index.php:70
 msgid "Reload active addons"
-msgstr ""
+msgstr "أعد تحميل الإضافات النشطة"
 
 #: src/Module/Admin/Addons/Index.php:75
 #, php-format
@@ -5046,15 +4801,15 @@ msgid ""
 "There are currently no addons available on your node. You can find the "
 "official addon repository at %1$s and might find other interesting addons in"
 " the open addon registry at %2$s"
-msgstr ""
+msgstr "لا توجد حاليا أي إضافات متاحة في عقدتك. يمكنك العثور على مستودع الإضافات الرسمي في %1$s وقد تجد إضافات أخرى مثيرة للاهتمام في سجل الإضافات المفتوحة في %2$s"
 
 #: src/Module/Admin/BaseUsers.php:53
 msgid "List of all users"
-msgstr ""
+msgstr "قائمة المستخدمين"
 
 #: src/Module/Admin/BaseUsers.php:58
 msgid "Active"
-msgstr ""
+msgstr "نشط"
 
 #: src/Module/Admin/BaseUsers.php:61
 msgid "List of active accounts"
@@ -5092,7 +4847,7 @@ msgstr "منتدى خاص"
 
 #: src/Module/Admin/BaseUsers.php:110
 msgid "Relay"
-msgstr ""
+msgstr "مُرحِل"
 
 #: src/Module/Admin/Blocklist/Contact.php:54
 msgid "You can't block a local contact, please block the user instead"
@@ -5165,12 +4920,12 @@ msgstr "السبب"
 #, php-format
 msgid "%s total blocked contact"
 msgid_plural "%s total blocked contacts"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr[0] "لم يحجب أي متراسل %s"
+msgstr[1] "متراسل%s محجوب"
+msgstr[2] "متراسلان %s محجوبان"
+msgstr[3] "%s متراسلين محجوبين"
+msgstr[4] "%s متراسلًا محجوبًا"
+msgstr[5] "%s متراسل محجوب"
 
 #: src/Module/Admin/Blocklist/Contact.php:116
 msgid "URL of the remote contact to block."
@@ -5178,13 +4933,13 @@ msgstr "رابط المتراسل البعيد المراد حجبه."
 
 #: src/Module/Admin/Blocklist/Contact.php:117
 msgid "Also purge contact"
-msgstr ""
+msgstr "امسح المتراسل أيضًا"
 
 #: src/Module/Admin/Blocklist/Contact.php:117
 msgid ""
 "Removes all content related to this contact from the node. Keeps the contact"
 " record. This action canoot be undone."
-msgstr ""
+msgstr "يزيل جميع المحتويات المتعلقة بهذا المتراسل من العقدة. ويحتفظ بسجل للمتراسل. لا يمكن التراجع عن هذا الإجراء."
 
 #: src/Module/Admin/Blocklist/Contact.php:118
 msgid "Block Reason"
@@ -5585,7 +5340,7 @@ msgstr ""
 
 #: src/Module/Admin/Logs/View.php:103
 msgid "Process ID"
-msgstr ""
+msgstr "مُعرّف العملية"
 
 #: src/Module/Admin/Logs/View.php:104
 msgid "Close"
@@ -5593,23 +5348,23 @@ msgstr "أغلق"
 
 #: src/Module/Admin/Queue.php:50
 msgid "Inspect Deferred Worker Queue"
-msgstr ""
+msgstr "فحص طابور المهام المؤجلة"
 
 #: src/Module/Admin/Queue.php:51
 msgid ""
 "This page lists the deferred worker jobs. This are jobs that couldn't be "
 "executed at the first time."
-msgstr ""
+msgstr "تسرد هذه الصفحة العمليات المؤجلة. هذه العمليات لا يمكن تنفيذها لأول مرة."
 
 #: src/Module/Admin/Queue.php:54
 msgid "Inspect Worker Queue"
-msgstr ""
+msgstr "فحص طابور المهام"
 
 #: src/Module/Admin/Queue.php:55
 msgid ""
 "This page lists the currently queued worker jobs. These jobs are handled by "
 "the worker cronjob you've set up during install."
-msgstr ""
+msgstr "تسرد هذه الصفحة العمليات المتواجدة في الطابور حاليا. هذه العمليات تديرها المهام التي أعددتها أثناء التثبيت."
 
 #: src/Module/Admin/Queue.php:75
 msgid "ID"
@@ -5617,7 +5372,7 @@ msgstr "المعرف"
 
 #: src/Module/Admin/Queue.php:76
 msgid "Command"
-msgstr ""
+msgstr "أمر"
 
 #: src/Module/Admin/Queue.php:77
 msgid "Job Parameters"
@@ -5635,453 +5390,453 @@ msgstr ""
 msgid "Relocation started. Could take a while to complete."
 msgstr "بدأ النقل. قد يستغرق بعض الوقت."
 
-#: src/Module/Admin/Site.php:402 src/Module/Settings/Display.php:139
+#: src/Module/Admin/Site.php:404 src/Module/Settings/Display.php:139
 msgid "No special theme for mobile devices"
-msgstr ""
+msgstr "لا توجد سمة مخصصة للهتف"
 
-#: src/Module/Admin/Site.php:419 src/Module/Settings/Display.php:149
+#: src/Module/Admin/Site.php:421 src/Module/Settings/Display.php:149
 #, php-format
 msgid "%s - (Experimental)"
-msgstr ""
+msgstr "%s - (اختباري)"
 
-#: src/Module/Admin/Site.php:431
+#: src/Module/Admin/Site.php:433
 msgid "No community page for local users"
 msgstr "لا توجد صفحة مجتمع للمستخدمين المحليين"
 
-#: src/Module/Admin/Site.php:432
+#: src/Module/Admin/Site.php:434
 msgid "No community page"
 msgstr "لا توجد صفحة مجتمع"
 
-#: src/Module/Admin/Site.php:433
-msgid "Public postings from users of this site"
-msgstr "المشركات العامومية لمستخدمي هذا الموقع"
-
-#: src/Module/Admin/Site.php:434
-msgid "Public postings from the federated network"
-msgstr "المشركات العمومية من الشبكة الموحدة"
-
 #: src/Module/Admin/Site.php:435
+msgid "Public postings from users of this site"
+msgstr "المشاركات العلنية لمستخدمي هذا الموقع"
+
+#: src/Module/Admin/Site.php:436
+msgid "Public postings from the federated network"
+msgstr "المشاركات العلنية من الشبكة الموحدة"
+
+#: src/Module/Admin/Site.php:437
 msgid "Public postings from local users and the federated network"
-msgstr "المشركات العامومية من الشبكة الموحدة والشبكة المحلية"
+msgstr "المشركات العلنية من الشبكة الموحدة والشبكة المحلية"
 
-#: src/Module/Admin/Site.php:441
+#: src/Module/Admin/Site.php:443
 msgid "Multi user instance"
-msgstr ""
+msgstr "مثيل متعدد المستخدمين"
 
-#: src/Module/Admin/Site.php:468
+#: src/Module/Admin/Site.php:470
 msgid "Closed"
 msgstr "مغلق"
 
-#: src/Module/Admin/Site.php:469
+#: src/Module/Admin/Site.php:471
 msgid "Requires approval"
 msgstr "تتطلب الحصول على موافقة"
 
-#: src/Module/Admin/Site.php:470
+#: src/Module/Admin/Site.php:472
 msgid "Open"
 msgstr "افتح"
 
-#: src/Module/Admin/Site.php:474 src/Module/Install.php:215
+#: src/Module/Admin/Site.php:476 src/Module/Install.php:215
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: src/Module/Admin/Site.php:475 src/Module/Install.php:216
+#: src/Module/Admin/Site.php:477 src/Module/Install.php:216
 msgid "Force all links to use SSL"
 msgstr "فرض استخدام الروابط ل SSL"
 
-#: src/Module/Admin/Site.php:476 src/Module/Install.php:217
+#: src/Module/Admin/Site.php:478 src/Module/Install.php:217
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: src/Module/Admin/Site.php:480
+#: src/Module/Admin/Site.php:482
 msgid "Don't check"
 msgstr "لا تتحقق"
 
-#: src/Module/Admin/Site.php:481
+#: src/Module/Admin/Site.php:483
 msgid "check the stable version"
 msgstr "تحقق من الاصدار المستقر"
 
-#: src/Module/Admin/Site.php:482
+#: src/Module/Admin/Site.php:484
 msgid "check the development version"
 msgstr "تحقق من الاصدار التطويري"
 
-#: src/Module/Admin/Site.php:486
+#: src/Module/Admin/Site.php:488
 msgid "none"
 msgstr "لا شيﺀ"
 
-#: src/Module/Admin/Site.php:487
+#: src/Module/Admin/Site.php:489
 msgid "Local contacts"
 msgstr "المُتراسِلون المحليون"
 
-#: src/Module/Admin/Site.php:488
+#: src/Module/Admin/Site.php:490
 msgid "Interactors"
-msgstr ""
+msgstr "المتفاعلون"
 
-#: src/Module/Admin/Site.php:498 src/Module/BaseAdmin.php:90
+#: src/Module/Admin/Site.php:500 src/Module/BaseAdmin.php:90
 msgid "Site"
 msgstr "موقع"
 
-#: src/Module/Admin/Site.php:499
-msgid "General Information"
-msgstr ""
-
 #: src/Module/Admin/Site.php:501
-msgid "Republish users to directory"
-msgstr ""
+msgid "General Information"
+msgstr "معلومات عامة"
 
-#: src/Module/Admin/Site.php:502 src/Module/Register.php:141
+#: src/Module/Admin/Site.php:503
+msgid "Republish users to directory"
+msgstr "أعد نشر المستخدمين في الدليل"
+
+#: src/Module/Admin/Site.php:504 src/Module/Register.php:141
 msgid "Registration"
 msgstr "التسجيل"
 
-#: src/Module/Admin/Site.php:503
+#: src/Module/Admin/Site.php:505
 msgid "File upload"
 msgstr "رفع الملف"
 
-#: src/Module/Admin/Site.php:504
+#: src/Module/Admin/Site.php:506
 msgid "Policies"
 msgstr "السياسات"
 
-#: src/Module/Admin/Site.php:506
+#: src/Module/Admin/Site.php:508
 msgid "Auto Discovered Contact Directory"
 msgstr ""
 
-#: src/Module/Admin/Site.php:507
+#: src/Module/Admin/Site.php:509
 msgid "Performance"
 msgstr "الأداء"
 
-#: src/Module/Admin/Site.php:508
-msgid "Worker"
-msgstr ""
-
-#: src/Module/Admin/Site.php:509
-msgid "Message Relay"
-msgstr ""
-
 #: src/Module/Admin/Site.php:510
+msgid "Worker"
+msgstr "مهمة"
+
+#: src/Module/Admin/Site.php:511
+msgid "Message Relay"
+msgstr "ترحيل الرسالة"
+
+#: src/Module/Admin/Site.php:512
 msgid ""
 "Use the command \"console relay\" in the command line to add or remove "
 "relays."
 msgstr ""
 
-#: src/Module/Admin/Site.php:511
+#: src/Module/Admin/Site.php:513
 msgid "The system is not subscribed to any relays at the moment."
-msgstr ""
-
-#: src/Module/Admin/Site.php:512
-msgid "The system is currently subscribed to the following relays:"
-msgstr ""
+msgstr "هذا الخادم ليس مشترك في أي مرحلات حاليًا."
 
 #: src/Module/Admin/Site.php:514
+msgid "The system is currently subscribed to the following relays:"
+msgstr "هذا الخادم مشترك حاليًا في المرحلات التالية:"
+
+#: src/Module/Admin/Site.php:516
 msgid "Relocate Instance"
 msgstr "انقل المثيل"
 
-#: src/Module/Admin/Site.php:515
+#: src/Module/Admin/Site.php:517
 msgid ""
 "<strong>Warning!</strong> Advanced function. Could make this server "
 "unreachable."
 msgstr "<strong>تحذير!</strong> وظيفة متقدمة. يمكن أن تجعل هذا الخادم غير قابل للوصول."
 
-#: src/Module/Admin/Site.php:519
+#: src/Module/Admin/Site.php:521
 msgid "Site name"
 msgstr "اسم الموقع"
 
-#: src/Module/Admin/Site.php:520
+#: src/Module/Admin/Site.php:522
 msgid "Sender Email"
 msgstr "بريد المرسل"
 
-#: src/Module/Admin/Site.php:520
+#: src/Module/Admin/Site.php:522
 msgid ""
 "The email address your server shall use to send notification emails from."
 msgstr "عنوان البريد الإلكتروني الذي سيستخدمه الخادم لإرسال رسائل التنبيه."
 
-#: src/Module/Admin/Site.php:521
+#: src/Module/Admin/Site.php:523
 msgid "Name of the system actor"
 msgstr "اسم حساب النظام"
 
-#: src/Module/Admin/Site.php:521
+#: src/Module/Admin/Site.php:523
 msgid ""
 "Name of the internal system account that is used to perform ActivityPub "
 "requests. This must be an unused username. If set, this can't be changed "
 "again."
 msgstr "اسم حساب النظام الداخلي المستخدم لتنفيذ طلبات ActivityPub. يجب أن لا يكون هذا الاسم محجوز. إذا عُين لا يمكن تغييره."
 
-#: src/Module/Admin/Site.php:522
+#: src/Module/Admin/Site.php:524
 msgid "Banner/Logo"
 msgstr "اللافتة/الشعار"
 
-#: src/Module/Admin/Site.php:523
+#: src/Module/Admin/Site.php:525
 msgid "Email Banner/Logo"
 msgstr "شعار\\لافتة البريد الإلكتروني"
 
-#: src/Module/Admin/Site.php:524
+#: src/Module/Admin/Site.php:526
 msgid "Shortcut icon"
 msgstr "أيقونة الاختصار"
 
-#: src/Module/Admin/Site.php:524
+#: src/Module/Admin/Site.php:526
 msgid "Link to an icon that will be used for browsers."
-msgstr ""
+msgstr "رابط إلى أيقونة سيتم استخدامها للمتصفحات."
 
-#: src/Module/Admin/Site.php:525
+#: src/Module/Admin/Site.php:527
 msgid "Touch icon"
 msgstr "أيقونة الأجهزة اللمسية"
 
-#: src/Module/Admin/Site.php:525
+#: src/Module/Admin/Site.php:527
 msgid "Link to an icon that will be used for tablets and mobiles."
 msgstr "رابط إلى أيقونة سيتم استخدامها للأجهزة اللوحية والهواتف."
 
-#: src/Module/Admin/Site.php:526
+#: src/Module/Admin/Site.php:528
 msgid "Additional Info"
 msgstr "معلومات إضافية"
 
-#: src/Module/Admin/Site.php:526
+#: src/Module/Admin/Site.php:528
 #, php-format
 msgid ""
 "For public servers: you can add additional information here that will be "
 "listed at %s/servers."
-msgstr ""
+msgstr "للخوادم العامة: يمكنك إضافة معلومات إضافية لتدرج في %s/servers."
 
-#: src/Module/Admin/Site.php:527
+#: src/Module/Admin/Site.php:529
 msgid "System language"
 msgstr "لغة النظام"
 
-#: src/Module/Admin/Site.php:528
+#: src/Module/Admin/Site.php:530
 msgid "System theme"
 msgstr "سمة النظام"
 
-#: src/Module/Admin/Site.php:528
+#: src/Module/Admin/Site.php:530
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a "
 "href=\"/admin/themes\" id=\"cnftheme\">Change default theme settings</a>"
 msgstr ""
 
-#: src/Module/Admin/Site.php:529
+#: src/Module/Admin/Site.php:531
 msgid "Mobile system theme"
 msgstr "سمة الهاتف"
 
-#: src/Module/Admin/Site.php:529
+#: src/Module/Admin/Site.php:531
 msgid "Theme for mobile devices"
 msgstr "سمة للأجهزة المحمولة"
 
-#: src/Module/Admin/Site.php:530 src/Module/Install.php:225
+#: src/Module/Admin/Site.php:532 src/Module/Install.php:225
 msgid "SSL link policy"
 msgstr "سياسة روابط SSL"
 
-#: src/Module/Admin/Site.php:530 src/Module/Install.php:227
+#: src/Module/Admin/Site.php:532 src/Module/Install.php:227
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "يحدد ما إذا كان ينبغي إجبار الروابط المولدة على استخدام SSL"
 
-#: src/Module/Admin/Site.php:531
+#: src/Module/Admin/Site.php:533
 msgid "Force SSL"
 msgstr "فرض SSL"
 
-#: src/Module/Admin/Site.php:531
+#: src/Module/Admin/Site.php:533
 msgid ""
 "Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
 " to endless loops."
 msgstr ""
 
-#: src/Module/Admin/Site.php:532
+#: src/Module/Admin/Site.php:534
 msgid "Show help entry from navigation menu"
 msgstr ""
 
-#: src/Module/Admin/Site.php:532
+#: src/Module/Admin/Site.php:534
 msgid ""
 "Displays the menu entry for the Help pages from the navigation menu. It is "
 "always accessible by calling /help directly."
 msgstr ""
 
-#: src/Module/Admin/Site.php:533
+#: src/Module/Admin/Site.php:535
 msgid "Single user instance"
 msgstr "مثيل لمستخدم وحيد"
 
-#: src/Module/Admin/Site.php:533
+#: src/Module/Admin/Site.php:535
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr "اجعل هذا المثيل إما لمستخدم واحد أوعدة مستخدمين"
 
-#: src/Module/Admin/Site.php:535
+#: src/Module/Admin/Site.php:537
 msgid "Maximum image size"
 msgstr "الحجم الأقصى للصورة"
 
-#: src/Module/Admin/Site.php:535
+#: src/Module/Admin/Site.php:537
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "حد حجم الصورة المرفوعة بالبايت. الافتراضي هو 0 والذي يعني حجمًا غير محدود."
 
-#: src/Module/Admin/Site.php:536
+#: src/Module/Admin/Site.php:538
 msgid "Maximum image length"
 msgstr "الطول الأقصى للصورة"
 
-#: src/Module/Admin/Site.php:536
+#: src/Module/Admin/Site.php:538
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr ""
 
-#: src/Module/Admin/Site.php:537
+#: src/Module/Admin/Site.php:539
 msgid "JPEG image quality"
 msgstr ""
 
-#: src/Module/Admin/Site.php:537
+#: src/Module/Admin/Site.php:539
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr ""
 
-#: src/Module/Admin/Site.php:539
+#: src/Module/Admin/Site.php:541
 msgid "Register policy"
 msgstr ""
 
-#: src/Module/Admin/Site.php:540
+#: src/Module/Admin/Site.php:542
 msgid "Maximum Daily Registrations"
 msgstr ""
 
-#: src/Module/Admin/Site.php:540
+#: src/Module/Admin/Site.php:542
 msgid ""
 "If registration is permitted above, this sets the maximum number of new user"
 " registrations to accept per day.  If register is set to closed, this "
 "setting has no effect."
 msgstr ""
 
-#: src/Module/Admin/Site.php:541
+#: src/Module/Admin/Site.php:543
 msgid "Register text"
 msgstr ""
 
-#: src/Module/Admin/Site.php:541
+#: src/Module/Admin/Site.php:543
 msgid ""
 "Will be displayed prominently on the registration page. You can use BBCode "
 "here."
 msgstr ""
 
-#: src/Module/Admin/Site.php:542
+#: src/Module/Admin/Site.php:544
 msgid "Forbidden Nicknames"
 msgstr ""
 
-#: src/Module/Admin/Site.php:542
+#: src/Module/Admin/Site.php:544
 msgid ""
 "Comma separated list of nicknames that are forbidden from registration. "
 "Preset is a list of role names according RFC 2142."
 msgstr ""
 
-#: src/Module/Admin/Site.php:543
+#: src/Module/Admin/Site.php:545
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: src/Module/Admin/Site.php:543
+#: src/Module/Admin/Site.php:545
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: src/Module/Admin/Site.php:544
+#: src/Module/Admin/Site.php:546
 msgid "Allowed friend domains"
 msgstr ""
 
-#: src/Module/Admin/Site.php:544
+#: src/Module/Admin/Site.php:546
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: src/Module/Admin/Site.php:545
+#: src/Module/Admin/Site.php:547
 msgid "Allowed email domains"
 msgstr "نطاقات البريد الإلكتروني المسموحة"
 
-#: src/Module/Admin/Site.php:545
+#: src/Module/Admin/Site.php:547
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 
-#: src/Module/Admin/Site.php:546
+#: src/Module/Admin/Site.php:548
 msgid "No OEmbed rich content"
 msgstr ""
 
-#: src/Module/Admin/Site.php:546
+#: src/Module/Admin/Site.php:548
 msgid ""
 "Don't show the rich content (e.g. embedded PDF), except from the domains "
 "listed below."
 msgstr ""
 
-#: src/Module/Admin/Site.php:547
+#: src/Module/Admin/Site.php:549
 msgid "Trusted third-party domains"
 msgstr ""
 
-#: src/Module/Admin/Site.php:547
+#: src/Module/Admin/Site.php:549
 msgid ""
 "Comma separated list of domains from which content is allowed to be embedded"
 " in posts like with OEmbed. All sub-domains of the listed domains are "
 "allowed as well."
 msgstr ""
 
-#: src/Module/Admin/Site.php:548
+#: src/Module/Admin/Site.php:550
 msgid "Block public"
 msgstr ""
 
-#: src/Module/Admin/Site.php:548
+#: src/Module/Admin/Site.php:550
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
-#: src/Module/Admin/Site.php:549
+#: src/Module/Admin/Site.php:551
 msgid "Force publish"
 msgstr ""
 
-#: src/Module/Admin/Site.php:549
+#: src/Module/Admin/Site.php:551
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: src/Module/Admin/Site.php:549
+#: src/Module/Admin/Site.php:551
 msgid "Enabling this may violate privacy laws like the GDPR"
 msgstr ""
 
-#: src/Module/Admin/Site.php:550
+#: src/Module/Admin/Site.php:552
 msgid "Global directory URL"
 msgstr ""
 
-#: src/Module/Admin/Site.php:550
+#: src/Module/Admin/Site.php:552
 msgid ""
 "URL to the global directory. If this is not set, the global directory is "
 "completely unavailable to the application."
 msgstr ""
 
-#: src/Module/Admin/Site.php:551
+#: src/Module/Admin/Site.php:553
 msgid "Private posts by default for new users"
 msgstr ""
 
-#: src/Module/Admin/Site.php:551
+#: src/Module/Admin/Site.php:553
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr ""
 
-#: src/Module/Admin/Site.php:552
+#: src/Module/Admin/Site.php:554
 msgid "Don't include post content in email notifications"
 msgstr ""
 
-#: src/Module/Admin/Site.php:552
+#: src/Module/Admin/Site.php:554
 msgid ""
 "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."
 msgstr ""
 
-#: src/Module/Admin/Site.php:553
+#: src/Module/Admin/Site.php:555
 msgid "Disallow public access to addons listed in the apps menu."
 msgstr ""
 
-#: src/Module/Admin/Site.php:553
+#: src/Module/Admin/Site.php:555
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
 msgstr ""
 
-#: src/Module/Admin/Site.php:554
+#: src/Module/Admin/Site.php:556
 msgid "Don't embed private images in posts"
 msgstr ""
 
-#: src/Module/Admin/Site.php:554
+#: src/Module/Admin/Site.php:556
 msgid ""
 "Don't replace locally-hosted private photos in posts with an embedded copy "
 "of the image. This means that contacts who receive posts containing private "
@@ -6089,309 +5844,319 @@ msgid ""
 "while."
 msgstr ""
 
-#: src/Module/Admin/Site.php:555
+#: src/Module/Admin/Site.php:557
 msgid "Explicit Content"
 msgstr ""
 
-#: src/Module/Admin/Site.php:555
+#: src/Module/Admin/Site.php:557
 msgid ""
 "Set this to announce that your node is used mostly for explicit content that"
 " might not be suited for minors. This information will be published in the "
 "node information and might be used, e.g. by the global directory, to filter "
 "your node from listings of nodes to join. Additionally a note about this "
 "will be shown at the user registration page."
-msgstr ""
+msgstr "عيّن هذا الخيار للإعلان عن أن عقدتك تحتوي محتوى حساس قد لا يكون مناسباً للقصر. وسوف تنشر هذه المعلومات في معلومات العقدة وصفحة التسجيل، ويستخدم هذا الخيار في الدليل العالمي، فأثناء استعراض هذه العقدة في الدليل ستظهر لهم هذه المعلومة."
 
-#: src/Module/Admin/Site.php:556
+#: src/Module/Admin/Site.php:558
 msgid "Proxify external content"
-msgstr ""
+msgstr "توجيه المحتوى الخارجي عبر الوكيل"
 
-#: src/Module/Admin/Site.php:556
+#: src/Module/Admin/Site.php:558
 msgid ""
 "Route external content via the proxy functionality. This is used for example"
 " for some OEmbed accesses and in some other rare cases."
+msgstr "توجيه المحتوى الخارجي عن طريق وميل. يستخدم هذا على سبيل المثال وصول OEmbed وفي بعض الحالات النادرة الأخرى."
+
+#: src/Module/Admin/Site.php:559
+msgid "Cache contact avatars"
 msgstr ""
 
-#: src/Module/Admin/Site.php:557
+#: src/Module/Admin/Site.php:559
+msgid ""
+"Locally store the avatar pictures of the contacts. This uses a lot of "
+"storage space but it increases the performance."
+msgstr ""
+
+#: src/Module/Admin/Site.php:560
 msgid "Allow Users to set remote_self"
-msgstr ""
+msgstr "اسمح للمستخدمين بتعيين remote_self"
 
-#: src/Module/Admin/Site.php:557
+#: src/Module/Admin/Site.php:560
 msgid ""
 "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."
-msgstr ""
+msgstr "يتيح تأشير هذا المربع للميتخدمين تعريف مل المتراسلين علئ أنهم remote_self في مربع حوار اصلاح المتراسلين. سيؤدي تنشيط هذه الميزة على متراسل إلى نسخ جميع منشوراته في دفق المستخدم."
 
-#: src/Module/Admin/Site.php:558
+#: src/Module/Admin/Site.php:561
 msgid "Enable multiple registrations"
-msgstr ""
+msgstr "فعّل تعدد التسجيل"
 
-#: src/Module/Admin/Site.php:558
+#: src/Module/Admin/Site.php:561
 msgid "Enable users to register additional accounts for use as pages."
-msgstr ""
+msgstr "يمكن المستخدمين من تسجيل حسابات إضافية لتستخدم كصفحات."
 
-#: src/Module/Admin/Site.php:559
+#: src/Module/Admin/Site.php:562
 msgid "Enable OpenID"
-msgstr ""
+msgstr "فعّل OpenID"
 
-#: src/Module/Admin/Site.php:559
+#: src/Module/Admin/Site.php:562
 msgid "Enable OpenID support for registration and logins."
-msgstr ""
+msgstr "فعّل دعم OpenID للتسجيل والولوج."
 
-#: src/Module/Admin/Site.php:560
+#: src/Module/Admin/Site.php:563
 msgid "Enable Fullname check"
-msgstr ""
+msgstr "افرض استخدام الأسماء الكاملة"
 
-#: src/Module/Admin/Site.php:560
+#: src/Module/Admin/Site.php:563
 msgid ""
 "Enable check to only allow users to register with a space between the first "
 "name and the last name in their full name."
-msgstr ""
+msgstr "يفرض على المستخدمين تضمين مسافة واحدة في اسم المستخدم الخاص بهم بين الاسم الأول والاسم الأخير."
 
-#: src/Module/Admin/Site.php:561
+#: src/Module/Admin/Site.php:564
 msgid "Community pages for visitors"
-msgstr ""
+msgstr "عرض صفحة المجتمع للزوار"
 
-#: src/Module/Admin/Site.php:561
+#: src/Module/Admin/Site.php:564
 msgid ""
 "Which community pages should be available for visitors. Local users always "
 "see both pages."
-msgstr ""
+msgstr "صفحات المجتمع المتاحة للزوار. المستخدمون المحليون يمكنهم مشاهدة كلا النوعين."
 
-#: src/Module/Admin/Site.php:562
+#: src/Module/Admin/Site.php:565
 msgid "Posts per user on community page"
-msgstr ""
+msgstr "حد المشاركات لكل مستخدم في صفحة المجتمع"
 
-#: src/Module/Admin/Site.php:562
+#: src/Module/Admin/Site.php:565
 msgid ""
 "The maximum number of posts per user on the community page. (Not valid for "
 "\"Global Community\")"
 msgstr ""
 
-#: src/Module/Admin/Site.php:564
+#: src/Module/Admin/Site.php:567
 msgid "Enable Mail support"
 msgstr ""
 
-#: src/Module/Admin/Site.php:564
+#: src/Module/Admin/Site.php:567
 msgid ""
 "Enable built-in mail support to poll IMAP folders and to reply via mail."
 msgstr ""
 
-#: src/Module/Admin/Site.php:565
+#: src/Module/Admin/Site.php:568
 msgid ""
 "Mail support can't be enabled because the PHP IMAP module is not installed."
 msgstr ""
 
-#: src/Module/Admin/Site.php:566
+#: src/Module/Admin/Site.php:569
 msgid "Enable OStatus support"
 msgstr ""
 
-#: src/Module/Admin/Site.php:566
+#: src/Module/Admin/Site.php:569
 msgid ""
 "Enable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
 "communications in OStatus are public."
 msgstr ""
 
-#: src/Module/Admin/Site.php:568
+#: src/Module/Admin/Site.php:571
 msgid ""
 "Diaspora support can't be enabled because Friendica was installed into a sub"
 " directory."
 msgstr ""
 
-#: src/Module/Admin/Site.php:569
+#: src/Module/Admin/Site.php:572
 msgid "Enable Diaspora support"
 msgstr ""
 
-#: src/Module/Admin/Site.php:569
+#: src/Module/Admin/Site.php:572
 msgid ""
 "Enable built-in Diaspora network compatibility for communicating with "
 "diaspora servers."
 msgstr ""
 
-#: src/Module/Admin/Site.php:570
+#: src/Module/Admin/Site.php:573
 msgid "Verify SSL"
 msgstr ""
 
-#: src/Module/Admin/Site.php:570
+#: src/Module/Admin/Site.php:573
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you"
 " cannot connect (at all) to self-signed SSL sites."
 msgstr ""
 
-#: src/Module/Admin/Site.php:571
+#: src/Module/Admin/Site.php:574
 msgid "Proxy user"
-msgstr ""
+msgstr "مستخدم الوكيل"
 
-#: src/Module/Admin/Site.php:572
+#: src/Module/Admin/Site.php:575
 msgid "Proxy URL"
-msgstr ""
+msgstr "رابط الوكيل"
 
-#: src/Module/Admin/Site.php:573
+#: src/Module/Admin/Site.php:576
 msgid "Network timeout"
 msgstr "انتهت مهلة الاتصال بالشبكة"
 
-#: src/Module/Admin/Site.php:573
+#: src/Module/Admin/Site.php:576
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "القيمة بالثواني. تعيينها لـ 0 يعني مهلة غير محدودة (غير مستحسن)."
 
-#: src/Module/Admin/Site.php:574
+#: src/Module/Admin/Site.php:577
 msgid "Maximum Load Average"
 msgstr ""
 
-#: src/Module/Admin/Site.php:574
+#: src/Module/Admin/Site.php:577
 #, php-format
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default %d."
 msgstr ""
 
-#: src/Module/Admin/Site.php:575
+#: src/Module/Admin/Site.php:578
 msgid "Maximum Load Average (Frontend)"
 msgstr ""
 
-#: src/Module/Admin/Site.php:575
+#: src/Module/Admin/Site.php:578
 msgid "Maximum system load before the frontend quits service - default 50."
 msgstr ""
 
-#: src/Module/Admin/Site.php:576
+#: src/Module/Admin/Site.php:579
 msgid "Minimal Memory"
-msgstr ""
+msgstr "الحد الأدنى للذاكرة"
 
-#: src/Module/Admin/Site.php:576
+#: src/Module/Admin/Site.php:579
 msgid ""
 "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
 "default 0 (deactivated)."
-msgstr ""
-
-#: src/Module/Admin/Site.php:577
-msgid "Periodically optimize tables"
-msgstr ""
-
-#: src/Module/Admin/Site.php:577
-msgid "Periodically optimize tables like the cache and the workerqueue"
-msgstr ""
-
-#: src/Module/Admin/Site.php:579
-msgid "Discover followers/followings from contacts"
-msgstr ""
-
-#: src/Module/Admin/Site.php:579
-msgid ""
-"If enabled, contacts are checked for their followers and following contacts."
-msgstr ""
+msgstr "الحد الأدنى لذاكرة الحرة للمهمة بالميغابايت. تحتاج إذن الوصول إلى /proc/meminfo - الافتراضي 0 (معطل)."
 
 #: src/Module/Admin/Site.php:580
-msgid "None - deactivated"
-msgstr ""
+msgid "Periodically optimize tables"
+msgstr "تحسين الجداول بصفة دورية"
 
-#: src/Module/Admin/Site.php:581
+#: src/Module/Admin/Site.php:580
+msgid "Periodically optimize tables like the cache and the workerqueue"
+msgstr "حسن بانتظام بعض جداول قاعدة البيانات المستخدمة على نطاق واسع مثل ذاكرة التخزين المؤقت أو الأقفال أو الجلسة أو طابور المهام"
+
+#: src/Module/Admin/Site.php:582
+msgid "Discover followers/followings from contacts"
+msgstr "اكتشف قائمة متابِعي/متابَعي متراسليك"
+
+#: src/Module/Admin/Site.php:582
+msgid ""
+"If enabled, contacts are checked for their followers and following contacts."
+msgstr "اذا فُعل سيقوم هذا الخادم بتجميع قائمة متابِعي ومتابَعي متراسليك."
+
+#: src/Module/Admin/Site.php:583
+msgid "None - deactivated"
+msgstr "لا شيء - معطل"
+
+#: src/Module/Admin/Site.php:584
 msgid ""
 "Local contacts - contacts of our local contacts are discovered for their "
 "followers/followings."
 msgstr ""
 
-#: src/Module/Admin/Site.php:582
+#: src/Module/Admin/Site.php:585
 msgid ""
 "Interactors - contacts of our local contacts and contacts who interacted on "
 "locally visible postings are discovered for their followers/followings."
 msgstr ""
 
-#: src/Module/Admin/Site.php:584
+#: src/Module/Admin/Site.php:587
 msgid "Synchronize the contacts with the directory server"
-msgstr ""
+msgstr "زامن المتراسلين مع خادم الدليل"
 
-#: src/Module/Admin/Site.php:584
+#: src/Module/Admin/Site.php:587
 msgid ""
 "if enabled, the system will check periodically for new contacts on the "
 "defined directory server."
-msgstr ""
+msgstr "إذا فُعل سيقوم النظام بالتحقق دوريا للبحث عن متراسلين جدد على خادم الدليل المحدد."
 
-#: src/Module/Admin/Site.php:586
+#: src/Module/Admin/Site.php:589
 msgid "Days between requery"
 msgstr ""
 
-#: src/Module/Admin/Site.php:586
+#: src/Module/Admin/Site.php:589
 msgid "Number of days after which a server is requeried for his contacts."
 msgstr ""
 
-#: src/Module/Admin/Site.php:587
+#: src/Module/Admin/Site.php:590
 msgid "Discover contacts from other servers"
-msgstr ""
+msgstr "اكتشف متراسلين من خوادم أخرى"
 
-#: src/Module/Admin/Site.php:587
+#: src/Module/Admin/Site.php:590
 msgid ""
 "Periodically query other servers for contacts. The system queries Friendica,"
 " Mastodon and Hubzilla servers."
-msgstr ""
+msgstr "يجلب دوريا متراسلين من خوادم أخرى. يطبق على خوادم فرنديكا وماستدون وهوبزيلا."
 
-#: src/Module/Admin/Site.php:588
+#: src/Module/Admin/Site.php:591
 msgid "Search the local directory"
-msgstr ""
+msgstr "ابحث في الدليل المحلي"
 
-#: src/Module/Admin/Site.php:588
+#: src/Module/Admin/Site.php:591
 msgid ""
 "Search the local directory instead of the global directory. When searching "
 "locally, every search will be executed on the global directory in the "
 "background. This improves the search results when the search is repeated."
-msgstr ""
+msgstr "يبحث في الدليل المحلي بدلاً من الدليل العالمي. عند إجراء بحث محلي ، يجرى نفس البحث في الدليل العالمي في الخلفية. هذا يحسن نتائج البحث إذا تكررت."
 
-#: src/Module/Admin/Site.php:590
+#: src/Module/Admin/Site.php:593
 msgid "Publish server information"
-msgstr ""
+msgstr "انشر معلومات الخادم"
 
-#: src/Module/Admin/Site.php:590
+#: src/Module/Admin/Site.php:593
 msgid ""
 "If enabled, general server and usage data will be published. The data "
 "contains the name and version of the server, number of users with public "
 "profiles, number of posts and the activated protocols and connectors. See <a"
 " href=\"http://the-federation.info/\">the-federation.info</a> for details."
-msgstr ""
+msgstr "إذا فعل ستنشر البيانات العامة للخادم وبيانات استخدامه. تحتوي هذه البيانات على اسم وإصدار الخادم ، وعدد المستخدمين الذين لهم ملف شخصي علني، وعدد المنشورات وقائمة الموصّلات والموافيق النشطة. راجع <a href=\"http://the-federation.info/\">federation.info</a> للحصول على التفاصيل."
 
-#: src/Module/Admin/Site.php:592
+#: src/Module/Admin/Site.php:595
 msgid "Check upstream version"
-msgstr ""
+msgstr "تحقق من الاصدار المنبعي"
 
-#: src/Module/Admin/Site.php:592
+#: src/Module/Admin/Site.php:595
 msgid ""
 "Enables checking for new Friendica versions at github. If there is a new "
 "version, you will be informed in the admin panel overview."
 msgstr ""
 
-#: src/Module/Admin/Site.php:593
+#: src/Module/Admin/Site.php:596
 msgid "Suppress Tags"
-msgstr ""
+msgstr "اخف الوسوم"
 
-#: src/Module/Admin/Site.php:593
+#: src/Module/Admin/Site.php:596
 msgid "Suppress showing a list of hashtags at the end of the posting."
-msgstr ""
+msgstr "اخف قائمة الوسوم من أسفل المشاركة."
 
-#: src/Module/Admin/Site.php:594
+#: src/Module/Admin/Site.php:597
 msgid "Clean database"
-msgstr ""
+msgstr "امسح قاعدة البيانات"
 
-#: src/Module/Admin/Site.php:594
+#: src/Module/Admin/Site.php:597
 msgid ""
 "Remove old remote items, orphaned database records and old content from some"
 " other helper tables."
 msgstr ""
 
-#: src/Module/Admin/Site.php:595
+#: src/Module/Admin/Site.php:598
 msgid "Lifespan of remote items"
 msgstr ""
 
-#: src/Module/Admin/Site.php:595
+#: src/Module/Admin/Site.php:598
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "remote items will be deleted. Own items, and marked or filed items are "
 "always kept. 0 disables this behaviour."
 msgstr ""
 
-#: src/Module/Admin/Site.php:596
+#: src/Module/Admin/Site.php:599
 msgid "Lifespan of unclaimed items"
 msgstr ""
 
-#: src/Module/Admin/Site.php:596
+#: src/Module/Admin/Site.php:599
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "unclaimed remote items (mostly content from the relay) will be deleted. "
@@ -6399,144 +6164,144 @@ msgid ""
 "items if set to 0."
 msgstr ""
 
-#: src/Module/Admin/Site.php:597
+#: src/Module/Admin/Site.php:600
 msgid "Lifespan of raw conversation data"
 msgstr ""
 
-#: src/Module/Admin/Site.php:597
+#: src/Module/Admin/Site.php:600
 msgid ""
 "The conversation data is used for ActivityPub and OStatus, as well as for "
 "debug purposes. It should be safe to remove it after 14 days, default is 90 "
 "days."
 msgstr ""
 
-#: src/Module/Admin/Site.php:598
+#: src/Module/Admin/Site.php:601
 msgid "Maximum numbers of comments per post"
 msgstr ""
 
-#: src/Module/Admin/Site.php:598
+#: src/Module/Admin/Site.php:601
 msgid "How much comments should be shown for each post? Default value is 100."
 msgstr ""
 
-#: src/Module/Admin/Site.php:599
+#: src/Module/Admin/Site.php:602
 msgid "Maximum numbers of comments per post on the display page"
 msgstr ""
 
-#: src/Module/Admin/Site.php:599
+#: src/Module/Admin/Site.php:602
 msgid ""
 "How many comments should be shown on the single view for each post? Default "
 "value is 1000."
 msgstr ""
 
-#: src/Module/Admin/Site.php:600
+#: src/Module/Admin/Site.php:603
 msgid "Temp path"
 msgstr "مسار التخزين المؤقت"
 
-#: src/Module/Admin/Site.php:600
+#: src/Module/Admin/Site.php:603
 msgid ""
 "If you have a restricted system where the webserver can't access the system "
 "temp path, enter another path here."
 msgstr ""
 
-#: src/Module/Admin/Site.php:601
+#: src/Module/Admin/Site.php:604
 msgid "Only search in tags"
 msgstr "ابحث في الوسوم فقط"
 
-#: src/Module/Admin/Site.php:601
+#: src/Module/Admin/Site.php:604
 msgid "On large systems the text search can slow down the system extremely."
 msgstr "في النظم الكبيرة، يمكن أن يؤدي البحث عن النصوص إلى إبطاء النظام."
 
-#: src/Module/Admin/Site.php:603
+#: src/Module/Admin/Site.php:606
 msgid "New base url"
-msgstr ""
+msgstr "رابط أساسي جديد"
 
-#: src/Module/Admin/Site.php:603
+#: src/Module/Admin/Site.php:606
 msgid ""
 "Change base url for this server. Sends relocate message to all Friendica and"
 " Diaspora* contacts of all users."
 msgstr ""
 
-#: src/Module/Admin/Site.php:605
+#: src/Module/Admin/Site.php:608
 msgid "Maximum number of parallel workers"
-msgstr ""
+msgstr "الحد الأقصى لعدد المهام"
 
-#: src/Module/Admin/Site.php:605
+#: src/Module/Admin/Site.php:608
 #, php-format
 msgid ""
 "On shared hosters set this to %d. On larger systems, values of %d are great."
 " Default value is %d."
 msgstr ""
 
-#: src/Module/Admin/Site.php:606
+#: src/Module/Admin/Site.php:609
 msgid "Enable fastlane"
 msgstr ""
 
-#: src/Module/Admin/Site.php:606
+#: src/Module/Admin/Site.php:609
 msgid ""
 "When enabed, the fastlane mechanism starts an additional worker if processes"
 " with higher priority are blocked by processes of lower priority."
 msgstr ""
 
-#: src/Module/Admin/Site.php:608
+#: src/Module/Admin/Site.php:611
 msgid "Direct relay transfer"
 msgstr ""
 
-#: src/Module/Admin/Site.php:608
+#: src/Module/Admin/Site.php:611
 msgid ""
 "Enables the direct transfer to other servers without using the relay servers"
 msgstr ""
 
-#: src/Module/Admin/Site.php:609
+#: src/Module/Admin/Site.php:612
 msgid "Relay scope"
 msgstr ""
 
-#: src/Module/Admin/Site.php:609
+#: src/Module/Admin/Site.php:612
 msgid ""
 "Can be \"all\" or \"tags\". \"all\" means that every public post should be "
 "received. \"tags\" means that only posts with selected tags should be "
 "received."
 msgstr ""
 
-#: src/Module/Admin/Site.php:609 src/Module/Contact.php:473
+#: src/Module/Admin/Site.php:612 src/Module/Contact.php:473
 #: src/Module/Settings/TwoFactor/Index.php:118
 msgid "Disabled"
 msgstr "معطل"
 
-#: src/Module/Admin/Site.php:609
+#: src/Module/Admin/Site.php:612
 msgid "all"
 msgstr "الكل"
 
-#: src/Module/Admin/Site.php:609
+#: src/Module/Admin/Site.php:612
 msgid "tags"
 msgstr "الوسوم"
 
-#: src/Module/Admin/Site.php:610
+#: src/Module/Admin/Site.php:613
 msgid "Server tags"
 msgstr "وسوم الخادم"
 
-#: src/Module/Admin/Site.php:610
+#: src/Module/Admin/Site.php:613
 msgid "Comma separated list of tags for the \"tags\" subscription."
 msgstr ""
 
-#: src/Module/Admin/Site.php:611
+#: src/Module/Admin/Site.php:614
 msgid "Deny Server tags"
 msgstr ""
 
-#: src/Module/Admin/Site.php:611
+#: src/Module/Admin/Site.php:614
 msgid "Comma separated list of tags that are rejected."
 msgstr ""
 
-#: src/Module/Admin/Site.php:612
+#: src/Module/Admin/Site.php:615
 msgid "Allow user tags"
 msgstr ""
 
-#: src/Module/Admin/Site.php:612
+#: src/Module/Admin/Site.php:615
 msgid ""
 "If enabled, the tags from the saved searches will used for the \"tags\" "
 "subscription in addition to the \"relay_server_tags\"."
 msgstr ""
 
-#: src/Module/Admin/Site.php:615
+#: src/Module/Admin/Site.php:618
 msgid "Start Relocation"
 msgstr "ابدأ النقل"
 
@@ -6644,7 +6409,7 @@ msgstr ""
 
 #: src/Module/Admin/Summary.php:101
 msgid "The worker was never executed. Please check your database structure!"
-msgstr ""
+msgstr "لم يتم تنفيذ المهمة أبداً. يرجى التحقق من بنية قاعدة البيانات!"
 
 #: src/Module/Admin/Summary.php:103
 #, php-format
@@ -7027,7 +6792,7 @@ msgstr[5] ""
 
 #: src/Module/Admin/Users/Pending.php:81
 msgid "Account approved."
-msgstr ""
+msgstr "قُبل الحساب."
 
 #: src/Module/Admin/Users/Pending.php:87
 msgid "Registration revoked"
@@ -7035,7 +6800,7 @@ msgstr ""
 
 #: src/Module/Admin/Users/Pending.php:102
 msgid "User registrations awaiting review"
-msgstr ""
+msgstr "تسجيلات تنتظر المعاينة"
 
 #: src/Module/Admin/Users/Pending.php:104
 msgid "Request date"
@@ -7043,7 +6808,7 @@ msgstr "تاريخ الطلب"
 
 #: src/Module/Admin/Users/Pending.php:105
 msgid "No registrations."
-msgstr ""
+msgstr "لا توجد تسجيلات."
 
 #: src/Module/Admin/Users/Pending.php:106
 msgid "Note from the user"
@@ -7073,7 +6838,7 @@ msgstr ""
 #: src/Module/Api/Mastodon/Statuses/Reblog.php:53
 #, php-format
 msgid "Posts from %s can't be shared"
-msgstr ""
+msgstr "لا تمكن مشاركة مشاركات %s"
 
 #: src/Module/Api/Mastodon/Statuses/Unbookmark.php:51
 msgid "Only starting posts can be unbookmarked"
@@ -7086,7 +6851,7 @@ msgstr ""
 #: src/Module/Api/Mastodon/Statuses/Unreblog.php:53
 #, php-format
 msgid "Posts from %s can't be unshared"
-msgstr ""
+msgstr "لا يمكن إلغاء مشاركة مشاركات %s"
 
 #: src/Module/Api/Twitter/ContactEndpoint.php:63 src/Module/Contact.php:343
 #: src/Module/Contact.php:358
@@ -7107,7 +6872,7 @@ msgstr "التطبيقات"
 
 #: src/Module/Attach.php:49 src/Module/Attach.php:61
 msgid "Item was not found."
-msgstr ""
+msgstr "لم يُعثر على العنصر."
 
 #: src/Module/BaseAdmin.php:54 src/Module/BaseAdmin.php:58
 msgid "Please login to continue."
@@ -7129,7 +6894,7 @@ msgstr "نظرة عامّة"
 
 #: src/Module/BaseAdmin.php:89
 msgid "Configuration"
-msgstr "تضبيط"
+msgstr "الضبط"
 
 #: src/Module/BaseAdmin.php:95 src/Module/BaseSettings.php:65
 msgid "Additional features"
@@ -7145,11 +6910,11 @@ msgstr "تحديثات قاعدة البيانات"
 
 #: src/Module/BaseAdmin.php:100
 msgid "Inspect Deferred Workers"
-msgstr ""
+msgstr "فحص المهام المؤجلة"
 
 #: src/Module/BaseAdmin.php:101
 msgid "Inspect worker Queue"
-msgstr ""
+msgstr "فحص طابور المهام"
 
 #: src/Module/BaseAdmin.php:103
 msgid "Tools"
@@ -7185,7 +6950,7 @@ msgstr ""
 
 #: src/Module/BaseAdmin.php:118 src/Module/Debug/ActivityPubConversion.php:138
 msgid "ActivityPub Conversion"
-msgstr ""
+msgstr "محادثة عبر ActivityPub"
 
 #: src/Module/BaseAdmin.php:127
 msgid "Addon Features"
@@ -7208,28 +6973,23 @@ msgstr ""
 #: src/Module/BaseApi.php:293 src/Module/BaseApi.php:309
 #: src/Module/BaseApi.php:325
 msgid "Too Many Requests"
-msgstr ""
+msgstr "طلبات كثيرة"
 
 #: src/Module/BaseProfile.php:51 src/Module/Contact.php:849
 msgid "Profile Details"
 msgstr "تفاصيل الملف الشخصي"
 
-#: src/Module/BaseProfile.php:72 src/Module/BaseProfile.php:75
-#: src/Module/Contact.php:838
-msgid "Media"
-msgstr ""
-
 #: src/Module/BaseProfile.php:109
 msgid "Only You Can See This"
 msgstr "فقط أنت من يمكنه رؤية هذا"
 
 #: src/Module/BaseProfile.php:114 src/Module/Profile/Schedule.php:82
 msgid "Scheduled Posts"
-msgstr ""
+msgstr "المشاركات المبرمجة"
 
 #: src/Module/BaseProfile.php:117
 msgid "Posts that are scheduled for publishing"
-msgstr ""
+msgstr "المشاركات المقرر نشرها"
 
 #: src/Module/BaseProfile.php:136 src/Module/BaseProfile.php:139
 msgid "Tips for New Members"
@@ -7238,12 +6998,12 @@ msgstr "تلميحات للأعضاء الجدد"
 #: src/Module/BaseSearch.php:69
 #, php-format
 msgid "People Search - %s"
-msgstr ""
+msgstr "البحث عن أشخاص - %s"
 
 #: src/Module/BaseSearch.php:79
 #, php-format
 msgid "Forum Search - %s"
-msgstr ""
+msgstr "البحث عن منتديات - %s"
 
 #: src/Module/BaseSettings.php:43
 msgid "Account"
@@ -7303,7 +7063,7 @@ msgstr "فشل تحديث سجل التراسل."
 
 #: src/Module/Contact.php:375
 msgid "You can't block yourself"
-msgstr ""
+msgstr "لا يمكنك حجب نفسك"
 
 #: src/Module/Contact.php:381
 msgid "Contact has been blocked"
@@ -7315,7 +7075,7 @@ msgstr "أُلغي حجب المتراسل"
 
 #: src/Module/Contact.php:389
 msgid "You can't ignore yourself"
-msgstr ""
+msgstr "لا يمكنك تجاهل نفسك"
 
 #: src/Module/Contact.php:395
 msgid "Contact has been ignored"
@@ -7342,11 +7102,11 @@ msgstr "%s يشارك معك"
 
 #: src/Module/Contact.php:447
 msgid "Private communications are not available for this contact."
-msgstr ""
+msgstr "المراسلات الخاصة غير متوفرة لهذا المتراسل."
 
 #: src/Module/Contact.php:449
 msgid "Never"
-msgstr "ابدا"
+msgstr "أبدا"
 
 #: src/Module/Contact.php:452
 msgid "(Update was not successful)"
@@ -7474,11 +7234,11 @@ msgstr "متجاهَل حاليا"
 
 #: src/Module/Contact.php:551
 msgid "Currently archived"
-msgstr "مُأرشف حاليا"
+msgstr "مُؤرشف حاليا"
 
 #: src/Module/Contact.php:552
 msgid "Awaiting connection acknowledge"
-msgstr ""
+msgstr "ينتظر قبول الاتصال"
 
 #: src/Module/Contact.php:553 src/Module/Notifications/Introductions.php:170
 msgid "Hide this contact from others"
@@ -7491,21 +7251,21 @@ msgstr "<strong>قد</strong> تبقى الإعجابات/الردود على م
 
 #: src/Module/Contact.php:554
 msgid "Notification for new posts"
-msgstr "تنبيهات على المشاركات الجديدة"
+msgstr "تنبيه للمشاركات الجديدة"
 
 #: src/Module/Contact.php:554
 msgid "Send a notification of every new post of this contact"
-msgstr "أرسل تنبيها لكل مشاركات الجديدة هذا المتراسل"
+msgstr "أرسل تنبيها عند نشر هذا المتراسل لمشاركات الجديدة"
 
 #: src/Module/Contact.php:556
 msgid "Keyword Deny List"
-msgstr ""
+msgstr "قائمة الكلمات المفتاحية المرفوضة"
 
 #: src/Module/Contact.php:556
 msgid ""
 "Comma separated list of keywords that should not be converted to hashtags, "
 "when \"Fetch information and keywords\" is selected"
-msgstr ""
+msgstr "قائمة بالكلمات المفتاحية مفصولة بفواصل والتي لا تخول الى وسوم عند اختيار \"اجلب المعلومات والكلمات المفتاحية\""
 
 #: src/Module/Contact.php:574 src/Module/Settings/TwoFactor/Index.php:132
 msgid "Actions"
@@ -7519,7 +7279,7 @@ msgstr ""
 msgid ""
 "Mark this contact as remote_self, this will cause friendica to repost new "
 "entries from this contact."
-msgstr ""
+msgstr "علّم هذا المتراسل على أنه remote_self ، سيقوم فرنديكا بإعادة نشر المدخلات الجديدة لهذا المتراسل."
 
 #: src/Module/Contact.php:698
 msgid "Show all contacts"
@@ -7548,7 +7308,7 @@ msgstr "مؤرشف"
 
 #: src/Module/Contact.php:730
 msgid "Only show archived contacts"
-msgstr "أظهِر المتراسلين المأرشفين فقط"
+msgstr "أظهِر المتراسلين المؤرشفين فقط"
 
 #: src/Module/Contact.php:735 src/Module/Contact.php:765
 msgid "Hidden"
@@ -7577,7 +7337,7 @@ msgstr "حدّث"
 
 #: src/Module/Contact.php:790
 msgid "Batch Actions"
-msgstr ""
+msgstr "إجراءات متعددة"
 
 #: src/Module/Contact.php:825
 msgid "Conversations started by this contact"
@@ -7589,7 +7349,7 @@ msgstr "التعليقات والمشاركات"
 
 #: src/Module/Contact.php:841
 msgid "Posts containing media objects"
-msgstr ""
+msgstr "مشاركات تحوي وسائط"
 
 #: src/Module/Contact.php:856
 msgid "View all known contacts"
@@ -7601,7 +7361,7 @@ msgstr "إعدادات المتراسلين المُتقدّمة"
 
 #: src/Module/Contact.php:960
 msgid "Mutual Friendship"
-msgstr "الصداقة المشتركة"
+msgstr "صداقة متبادلة"
 
 #: src/Module/Contact.php:964
 msgid "is a fan of yours"
@@ -7609,15 +7369,15 @@ msgstr "أحد معجبيك"
 
 #: src/Module/Contact.php:968
 msgid "you are a fan of"
-msgstr "أنت أحد معجبي"
+msgstr "أنت معجب"
 
 #: src/Module/Contact.php:986
 msgid "Pending outgoing contact request"
-msgstr "الطلبات الصادرة و المعلقة للتراسل"
+msgstr "طلب تراسل صادر معلق"
 
 #: src/Module/Contact.php:988
 msgid "Pending incoming contact request"
-msgstr "الطلبات الواردة و المعلقة للتراسل"
+msgstr "طلب تراسل وارد معلق"
 
 #: src/Module/Contact.php:1055
 msgid "Refetch contact data"
@@ -7625,19 +7385,19 @@ msgstr "أعد جلب بيانات المتراسل"
 
 #: src/Module/Contact.php:1066
 msgid "Toggle Blocked status"
-msgstr ""
+msgstr "بدّل حالة الحجب"
 
 #: src/Module/Contact.php:1074
 msgid "Toggle Ignored status"
-msgstr ""
+msgstr "بدّل حالة التجاهل"
 
 #: src/Module/Contact.php:1081 src/Module/Contact/Revoke.php:96
 msgid "Revoke Follow"
-msgstr ""
+msgstr "أبطل المتابعة"
 
 #: src/Module/Contact.php:1083
 msgid "Revoke the follow from this contact"
-msgstr ""
+msgstr "أبطل المتابعة من هذا المتراسل"
 
 #: src/Module/Contact/Advanced.php:93
 msgid "Contact update failed."
@@ -7673,7 +7433,7 @@ msgstr "رابط الحساب"
 
 #: src/Module/Contact/Advanced.php:139
 msgid "Account URL Alias"
-msgstr ""
+msgstr "الرابط البديل للحساب"
 
 #: src/Module/Contact/Advanced.php:140
 msgid "Friend Request URL"
@@ -7701,7 +7461,7 @@ msgstr "متراسل غير صالح."
 
 #: src/Module/Contact/Contacts.php:54
 msgid "No known contacts."
-msgstr ""
+msgstr "لا يوجد متراسل معروف."
 
 #: src/Module/Contact/Contacts.php:68 src/Module/Profile/Common.php:98
 msgid "No common contacts."
@@ -7743,7 +7503,7 @@ msgstr[5] "%s صديق مشترك"
 #: src/Module/Contact/Contacts.php:90 src/Module/Profile/Contacts.php:104
 #, php-format
 msgid "These contacts both follow and are followed by <strong>%s</strong>."
-msgstr ""
+msgstr "هؤلاء المتراسلون يتابعون <strong>%s</strong> وهو يتابعهم."
 
 #: src/Module/Contact/Contacts.php:96 src/Module/Profile/Common.php:86
 #, php-format
@@ -7761,7 +7521,7 @@ msgstr[5] "%s متراسل مشترك"
 msgid ""
 "Both <strong>%s</strong> and yourself have publicly interacted with these "
 "contacts (follow, comment or likes on public posts)."
-msgstr ""
+msgstr "أنت و <strong>%s</strong> تفاعلتم مع نفس المتراسلين (متابعة، تعليق، إعجاب بمشاركة)."
 
 #: src/Module/Contact/Contacts.php:104 src/Module/Profile/Contacts.php:110
 #, php-format
@@ -7780,7 +7540,7 @@ msgstr ""
 
 #: src/Module/Contact/Poke.php:129 src/Module/Search/Acl.php:55
 msgid "You must be logged in to use this module."
-msgstr ""
+msgstr "يجب عليك الولوج لاستخدام هذه الوحدة."
 
 #: src/Module/Contact/Poke.php:152
 msgid "Poke/Prod"
@@ -7792,15 +7552,15 @@ msgstr ""
 
 #: src/Module/Contact/Poke.php:155
 msgid "Choose what you wish to do to recipient"
-msgstr ""
+msgstr "اختر ما تريد فعله للمتلقي"
 
 #: src/Module/Contact/Poke.php:156
 msgid "Make this post private"
-msgstr ""
+msgstr "اجعل هذه المشاركة خاصة"
 
 #: src/Module/Contact/Revoke.php:48
 msgid "Unknown contact."
-msgstr ""
+msgstr "متراسل مجهول."
 
 #: src/Module/Contact/Revoke.php:58 src/Module/Group.php:109
 msgid "Contact is deleted."
@@ -7808,23 +7568,23 @@ msgstr "حُذف المتراسل."
 
 #: src/Module/Contact/Revoke.php:62
 msgid "Contact is being deleted."
-msgstr ""
+msgstr "المتراسل يحذف."
 
 #: src/Module/Contact/Revoke.php:76
 msgid "Follow was successfully revoked."
-msgstr ""
+msgstr "نجح إبطال المتابعة."
 
 #: src/Module/Contact/Revoke.php:78
 msgid ""
 "Follow was successfully revoked, however the remote contact won't be aware "
 "of this revokation."
-msgstr ""
+msgstr "نجح إبطال المتابعة ولن يعلم بها المتراسل البعيد."
 
 #: src/Module/Contact/Revoke.php:80
 msgid ""
 "Unable to revoke follow, please try again later or contact the "
 "administrator."
-msgstr ""
+msgstr "يتعذر إبطال متابعة هذا المتراسل، يرجى إعادة المحاولة بعد بضع دقائق أو الاتصال بمدير الموقع."
 
 #: src/Module/Contact/Revoke.php:97
 msgid ""
@@ -7852,11 +7612,11 @@ msgstr "مجتمع عالمي"
 
 #: src/Module/Conversation/Community.php:82
 msgid "Posts from users of the whole federated network"
-msgstr "المشركات العامومية من الشبكة الموحدة"
+msgstr "مشركات من الشبكة الموحدة"
 
 #: src/Module/Conversation/Community.php:115
 msgid "Own Contacts"
-msgstr ""
+msgstr "مشاركات متراسليك"
 
 #: src/Module/Conversation/Community.php:119
 msgid "Include"
@@ -7911,13 +7671,13 @@ msgid "Sort by post received date"
 msgstr "رتب حسب تاريخ استلام المشاركة"
 
 #: src/Module/Conversation/Network.php:250
-#: src/Module/Settings/Profile/Index.php:226
+#: src/Module/Settings/Profile/Index.php:228
 msgid "Personal"
 msgstr "شخصي"
 
 #: src/Module/Conversation/Network.php:253
 msgid "Posts that mention or involve you"
-msgstr ""
+msgstr "المشاركات التي تذكرك أو تتعلق بك"
 
 #: src/Module/Conversation/Network.php:258 src/Object/Post.php:321
 msgid "Starred"
@@ -7952,11 +7712,11 @@ msgstr "بيانات الكائن"
 
 #: src/Module/Debug/ActivityPubConversion.php:125
 msgid "Result Item"
-msgstr ""
+msgstr "النتيجة"
 
 #: src/Module/Debug/ActivityPubConversion.php:139
 msgid "Source activity"
-msgstr ""
+msgstr "نشاط المصدر"
 
 #: src/Module/Debug/Babel.php:51
 msgid "Source input"
@@ -8135,7 +7895,7 @@ msgid "Twitter Source / Tweet URL (requires API key)"
 msgstr ""
 
 #: src/Module/Debug/Feed.php:38 src/Module/Filer/SaveTag.php:40
-#: src/Module/Settings/Profile/Index.php:140
+#: src/Module/Settings/Profile/Index.php:142
 msgid "You must be logged in to use this module"
 msgstr "يجب عليك الولوج لاستخدام هذه الوحدة"
 
@@ -8220,15 +7980,15 @@ msgstr "لا توجد مدخلات (قد تكون بعض المدخلات مخف
 
 #: src/Module/Directory.php:93
 msgid "Find on this site"
-msgstr "تجد في هذا الموقع"
+msgstr "ابحث في هذا الموقع"
 
 #: src/Module/Directory.php:95
 msgid "Results for:"
-msgstr "النتائج عن:"
+msgstr "نتائج:"
 
 #: src/Module/Directory.php:97
 msgid "Site Directory"
-msgstr ""
+msgstr "دليل الموقع"
 
 #: src/Module/Filer/RemoveTag.php:68
 msgid "Item was not removed"
@@ -8246,35 +8006,35 @@ msgstr "- اختر -"
 msgid "Suggested contact not found."
 msgstr "المتراسل المقترح غير موجود."
 
-#: src/Module/FriendSuggest.php:84
+#: src/Module/FriendSuggest.php:83
 msgid "Friend suggestion sent."
-msgstr "أُرسل إقتراح لصديق."
+msgstr "أُرسل إقتراح الصداقة."
 
-#: src/Module/FriendSuggest.php:121
+#: src/Module/FriendSuggest.php:120
 msgid "Suggest Friends"
 msgstr "اقترح أصدقاء"
 
-#: src/Module/FriendSuggest.php:124
+#: src/Module/FriendSuggest.php:123
 #, php-format
 msgid "Suggest a friend for %s"
 msgstr "أقترح أصدقاء لـ %s"
 
 #: src/Module/Friendica.php:62
 msgid "Installed addons/apps:"
-msgstr ""
+msgstr "التطبيقات/الإضافات المثبتة:"
 
 #: src/Module/Friendica.php:67
 msgid "No installed addons/apps"
-msgstr ""
+msgstr "لم تُثبت أي تطبيقات/إضافات"
 
 #: src/Module/Friendica.php:72
 #, php-format
 msgid "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
-msgstr ""
+msgstr "اقرأ عن <a href=\"%1$s/tos\">شروط الخدمة</a> لهذه العقدة."
 
 #: src/Module/Friendica.php:79
 msgid "On this server the following remote servers are blocked."
-msgstr ""
+msgstr "الخوادم البعيدة المحجوبة عن هذا الموقع."
 
 #: src/Module/Friendica.php:97
 #, php-format
@@ -8291,11 +8051,11 @@ msgstr "رجاء زر <a href=\"https://friendi.ca\">Friendi.ca</a> لمعرفة
 
 #: src/Module/Friendica.php:103
 msgid "Bug reports and issues: please visit"
-msgstr ""
+msgstr "لبلاغات العلل والمشاكل: زر"
 
 #: src/Module/Friendica.php:103
 msgid "the bugtracker at github"
-msgstr ""
+msgstr "متعقب العلل على غيت-هب"
 
 #: src/Module/Friendica.php:104
 msgid "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
@@ -8387,7 +8147,7 @@ msgstr "أضف المتراسل لمجموعة"
 
 #: src/Module/HCard.php:46
 msgid "No profile"
-msgstr ""
+msgstr "لا ملفًا شخصيًا"
 
 #: src/Module/HTTPException/MethodNotAllowed.php:32
 msgid "Method Not Allowed."
@@ -8404,7 +8164,7 @@ msgstr "مرحبًا بك في %s"
 
 #: src/Module/Install.php:188
 msgid "Friendica Communications Server - Setup"
-msgstr ""
+msgstr "خادم شبكة فرنديكا - تثبيت"
 
 #: src/Module/Install.php:199
 msgid "System check"
@@ -8413,15 +8173,15 @@ msgstr "التحقق من النظام"
 #: src/Module/Install.php:201 src/Module/Install.php:258
 #: src/Module/Install.php:341
 msgid "Requirement not satisfied"
-msgstr ""
+msgstr "لم يستوف المتطلبات"
 
 #: src/Module/Install.php:202
 msgid "Optional requirement not satisfied"
-msgstr ""
+msgstr "لم يستوف المتطلبات الاختيارية"
 
 #: src/Module/Install.php:203
 msgid "OK"
-msgstr "OK\nموافقة"
+msgstr "موافق"
 
 #: src/Module/Install.php:208
 msgid "Check again"
@@ -8454,7 +8214,7 @@ msgstr ""
 
 #: src/Module/Install.php:240
 msgid "Sub path of the URL"
-msgstr ""
+msgstr "المسار الفرعي للرابط"
 
 #: src/Module/Install.php:242
 msgid ""
@@ -8477,13 +8237,13 @@ msgstr ""
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
-msgstr ""
+msgstr "يرجى الاتصال بموفر الاستضافة أو مدير الموقع إذا كان لديك أسئلة حول هذه الإعدادات."
 
 #: src/Module/Install.php:256
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
-msgstr ""
+msgstr "قاعدة البيانات التي ستحددها أدناه يجب أن تكون موجودة سلفًا. إذا لم تكن موجودة، أنشئها قبل المتابعة."
 
 #: src/Module/Install.php:265
 msgid "Database Server Name"
@@ -8521,7 +8281,7 @@ msgstr "البريد الالكتروني للمدير الموقع"
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
-msgstr ""
+msgstr "يجب أن يتطابق عنوان بريدك الإلكتروني مع هذا من أجل استخدام لوحة الإدارة."
 
 #: src/Module/Install.php:319
 msgid "System Language:"
@@ -8539,7 +8299,7 @@ msgstr "ثُبتت قاعدة بيانات فرنديكا."
 
 #: src/Module/Install.php:343
 msgid "Installation finished"
-msgstr ""
+msgstr "انتهى التثبيت"
 
 #: src/Module/Install.php:363
 msgid "<h1>What next</h1>"
@@ -8557,7 +8317,7 @@ msgid ""
 "Go to your new Friendica node <a href=\"%s/register\">registration page</a> "
 "and register as new user. Remember to use the same email you have entered as"
 " administrator email. This will allow you to enter the site admin panel."
-msgstr ""
+msgstr "انتقل إلى <a href=\"%s/register\">صفحة التسجيل</a> وسجل كمستخدم جديد. تذكر أن تستخدم نفس البريد الإلكتروني الذي أدخلته للمدير. هذا سيسمح لك بالدخول إلى لوحة الإدارة."
 
 #: src/Module/Invite.php:56
 msgid "Total invitation limit exceeded."
@@ -8677,7 +8437,7 @@ msgstr ""
 
 #: src/Module/Item/Compose.php:90
 msgid "Compose new personal note"
-msgstr ""
+msgstr "أكتب ملاحظة شخصية جديدة"
 
 #: src/Module/Item/Compose.php:99
 msgid "Compose new post"
@@ -8685,15 +8445,15 @@ msgstr "أكتب مشاركة جديدة"
 
 #: src/Module/Item/Compose.php:141
 msgid "Visibility"
-msgstr ""
+msgstr "الظّهور"
 
 #: src/Module/Item/Compose.php:162
 msgid "Clear the location"
-msgstr ""
+msgstr "امسح الموقع الجغرافي"
 
 #: src/Module/Item/Compose.php:163
 msgid "Location services are unavailable on your device"
-msgstr ""
+msgstr "خدمات الموقع الجغرافي غير متاحة على جهازك"
 
 #: src/Module/Item/Compose.php:164
 msgid ""
@@ -8703,7 +8463,7 @@ msgstr ""
 
 #: src/Module/Item/Follow.php:52
 msgid "Unable to follow this item."
-msgstr ""
+msgstr "تتعذر متابعة هذا العنصر."
 
 #: src/Module/Maintenance.php:48 src/Module/Maintenance.php:53
 msgid "System down for maintenance"
@@ -8782,7 +8542,7 @@ msgstr "لا توجد تقديمات."
 msgid "No more %s notifications."
 msgstr "لا مزيد من تنبيهات %s."
 
-#: src/Module/Notifications/Notification.php:104
+#: src/Module/Notifications/Notification.php:107
 msgid "You must be logged in to show this page."
 msgstr "يجب أن تلج لتصل لهذه الصفحة."
 
@@ -8840,15 +8600,15 @@ msgstr ""
 msgid "Wrong type \"%s\", expected one of: %s"
 msgstr "نوع خاطئ \"%s\" ، يُتوقع أن يكون: %s"
 
-#: src/Module/PermissionTooltip.php:38
+#: src/Module/PermissionTooltip.php:42
 msgid "Model not found"
 msgstr ""
 
-#: src/Module/PermissionTooltip.php:60
+#: src/Module/PermissionTooltip.php:64
 msgid "Remote privacy information not available."
 msgstr ""
 
-#: src/Module/PermissionTooltip.php:69
+#: src/Module/PermissionTooltip.php:73
 msgid "Visible to:"
 msgstr "مرئي لـ:"
 
@@ -8903,12 +8663,12 @@ msgid "Birthday:"
 msgstr "تاريخ الميلاد:"
 
 #: src/Module/Profile/Profile.php:167
-#: src/Module/Settings/Profile/Index.php:244 src/Util/Temporal.php:165
+#: src/Module/Settings/Profile/Index.php:246 src/Util/Temporal.php:165
 msgid "Age: "
 msgstr "العمر: "
 
 #: src/Module/Profile/Profile.php:167
-#: src/Module/Settings/Profile/Index.php:244 src/Util/Temporal.php:165
+#: src/Module/Settings/Profile/Index.php:246 src/Util/Temporal.php:165
 #, php-format
 msgid "%d year old"
 msgid_plural "%d years old"
@@ -9148,19 +8908,19 @@ msgstr ""
 #: src/Module/Search/Index.php:192
 #, php-format
 msgid "Items tagged with: %s"
-msgstr ""
+msgstr "عناصر موسمة بـ: %s"
 
 #: src/Module/Search/Saved.php:45
 msgid "Search term was not saved."
-msgstr ""
+msgstr "لم يُحفظ مصطلح البحث."
 
 #: src/Module/Search/Saved.php:48
 msgid "Search term already saved."
-msgstr ""
+msgstr "حُفظ مصطلح البحث سلفًا."
 
 #: src/Module/Search/Saved.php:54
 msgid "Search term was not removed."
-msgstr ""
+msgstr "لم يُزل مصطلح البحث."
 
 #: src/Module/Security/Login.php:105
 msgid "Create a New Account"
@@ -9276,7 +9036,7 @@ msgstr "يرجى إدخال رمز من تطبيق الاستيثاق"
 
 #: src/Module/Security/TwoFactor/Verify.php:101
 msgid "This is my two-factor authenticator app device"
-msgstr ""
+msgstr "هذا هو جهاز الذي استخدمه للاستيثاق بعاملين"
 
 #: src/Module/Security/TwoFactor/Verify.php:102
 msgid "Verify code and complete login"
@@ -9284,7 +9044,7 @@ msgstr "تحقق من الرمز وأكمل الولوج"
 
 #: src/Module/Settings/Delegation.php:53
 msgid "Delegation successfully granted."
-msgstr ""
+msgstr "منح التفويض بنجاح."
 
 #: src/Module/Settings/Delegation.php:55
 msgid "Parent user not found, unavailable or password doesn't match."
@@ -9292,7 +9052,7 @@ msgstr ""
 
 #: src/Module/Settings/Delegation.php:59
 msgid "Delegation successfully revoked."
-msgstr ""
+msgstr "نجح إبطال التفويض."
 
 #: src/Module/Settings/Delegation.php:81
 #: src/Module/Settings/Delegation.php:103
@@ -9302,26 +9062,26 @@ msgstr ""
 
 #: src/Module/Settings/Delegation.php:95
 msgid "Delegate user not found."
-msgstr ""
+msgstr "لم يُعثر على المندوب."
 
 #: src/Module/Settings/Delegation.php:143
 msgid "No parent user"
-msgstr ""
+msgstr "لا يوجد وليٌ"
 
 #: src/Module/Settings/Delegation.php:154
 #: src/Module/Settings/Delegation.php:165
 msgid "Parent User"
-msgstr ""
+msgstr "وليٌ"
 
 #: src/Module/Settings/Delegation.php:162
 msgid "Additional Accounts"
-msgstr ""
+msgstr "الحسابات الإضافية"
 
 #: src/Module/Settings/Delegation.php:163
 msgid ""
 "Register additional accounts that are automatically connected to your "
 "existing account so you can manage them from this account."
-msgstr ""
+msgstr "سجل حسابات إضافية مرتبطة تلقائيا بحسابك الحالي ويمكنك إدارتها عبر هذا الحساب."
 
 #: src/Module/Settings/Delegation.php:164
 msgid "Register an additional account"
@@ -9469,11 +9229,11 @@ msgstr "يعرض زر لم يعجبني والتفاعلات السلبية في
 
 #: src/Module/Settings/Display.php:217
 msgid "Display the resharer"
-msgstr ""
+msgstr "اعرض صاحب إعادة النشر"
 
 #: src/Module/Settings/Display.php:217
 msgid "Display the first resharer as icon and text on a reshared item."
-msgstr ""
+msgstr "اعرض صورة صاحب المشاركة الأصلية كأيقونة بالإضافة إلى نص على المشاركة."
 
 #: src/Module/Settings/Display.php:218
 msgid "Stay local"
@@ -9495,126 +9255,126 @@ msgstr "اسم الملف الشخصي مطلوب."
 msgid "Profile couldn't be updated."
 msgstr "تعذر تحديث الملف الشخصي."
 
-#: src/Module/Settings/Profile/Index.php:171
-#: src/Module/Settings/Profile/Index.php:191
+#: src/Module/Settings/Profile/Index.php:173
+#: src/Module/Settings/Profile/Index.php:193
 msgid "Label:"
 msgstr "التسمية:"
 
-#: src/Module/Settings/Profile/Index.php:172
-#: src/Module/Settings/Profile/Index.php:192
+#: src/Module/Settings/Profile/Index.php:174
+#: src/Module/Settings/Profile/Index.php:194
 msgid "Value:"
 msgstr "القيمة:"
 
-#: src/Module/Settings/Profile/Index.php:182
-#: src/Module/Settings/Profile/Index.php:202
+#: src/Module/Settings/Profile/Index.php:184
+#: src/Module/Settings/Profile/Index.php:204
 msgid "Field Permissions"
-msgstr "صلاحيات الحقل"
+msgstr "أذونات الحقل"
 
-#: src/Module/Settings/Profile/Index.php:183
-#: src/Module/Settings/Profile/Index.php:203
+#: src/Module/Settings/Profile/Index.php:185
+#: src/Module/Settings/Profile/Index.php:205
 msgid "(click to open/close)"
 msgstr "(أنقر للفتح/للإغلاق)"
 
-#: src/Module/Settings/Profile/Index.php:189
+#: src/Module/Settings/Profile/Index.php:191
 msgid "Add a new profile field"
 msgstr "أضف حقلًا جديدًا للملف الشخصي"
 
-#: src/Module/Settings/Profile/Index.php:219
+#: src/Module/Settings/Profile/Index.php:221
 msgid "Profile Actions"
 msgstr "إجراءات الملف الشخصي"
 
-#: src/Module/Settings/Profile/Index.php:220
+#: src/Module/Settings/Profile/Index.php:222
 msgid "Edit Profile Details"
 msgstr "حرّر تفاصيل الملف الشخصي"
 
-#: src/Module/Settings/Profile/Index.php:222
+#: src/Module/Settings/Profile/Index.php:224
 msgid "Change Profile Photo"
 msgstr "غيّر صورة الملف الشخصي"
 
-#: src/Module/Settings/Profile/Index.php:227
+#: src/Module/Settings/Profile/Index.php:229
 msgid "Profile picture"
 msgstr "صورة الملف الشخصي"
 
-#: src/Module/Settings/Profile/Index.php:228
+#: src/Module/Settings/Profile/Index.php:230
 msgid "Location"
 msgstr "الموقع"
 
-#: src/Module/Settings/Profile/Index.php:229 src/Util/Temporal.php:93
+#: src/Module/Settings/Profile/Index.php:231 src/Util/Temporal.php:93
 #: src/Util/Temporal.php:95
 msgid "Miscellaneous"
 msgstr "متنوّع"
 
-#: src/Module/Settings/Profile/Index.php:230
+#: src/Module/Settings/Profile/Index.php:232
 msgid "Custom Profile Fields"
 msgstr "حقول مخصصة للملف الشخصي"
 
-#: src/Module/Settings/Profile/Index.php:232 src/Module/Welcome.php:58
+#: src/Module/Settings/Profile/Index.php:234 src/Module/Welcome.php:58
 msgid "Upload Profile Photo"
 msgstr "ارفع صورة الملف الشخصي"
 
-#: src/Module/Settings/Profile/Index.php:236
+#: src/Module/Settings/Profile/Index.php:238
 msgid "Display name:"
 msgstr "الاسم العلني:"
 
-#: src/Module/Settings/Profile/Index.php:239
+#: src/Module/Settings/Profile/Index.php:241
 msgid "Street Address:"
 msgstr "عنوان الشارع:"
 
-#: src/Module/Settings/Profile/Index.php:240
+#: src/Module/Settings/Profile/Index.php:242
 msgid "Locality/City:"
 msgstr "المدينة:"
 
-#: src/Module/Settings/Profile/Index.php:241
+#: src/Module/Settings/Profile/Index.php:243
 msgid "Region/State:"
 msgstr "الولاية:"
 
-#: src/Module/Settings/Profile/Index.php:242
+#: src/Module/Settings/Profile/Index.php:244
 msgid "Postal/Zip Code:"
 msgstr "الرمز البريدي:"
 
-#: src/Module/Settings/Profile/Index.php:243
+#: src/Module/Settings/Profile/Index.php:245
 msgid "Country:"
 msgstr "الدّولة:"
 
-#: src/Module/Settings/Profile/Index.php:245
+#: src/Module/Settings/Profile/Index.php:247
 msgid "XMPP (Jabber) address:"
 msgstr "عنوان XMPP (Jabber):"
 
-#: src/Module/Settings/Profile/Index.php:245
+#: src/Module/Settings/Profile/Index.php:247
 msgid ""
 "The XMPP address will be published so that people can follow you there."
 msgstr "سيتم نشر عنوان XMPP حتى يتمكن الناس من متابعتك هناك."
 
-#: src/Module/Settings/Profile/Index.php:246
+#: src/Module/Settings/Profile/Index.php:248
 msgid "Matrix (Element) address:"
 msgstr "عنوان مايتركس:"
 
-#: src/Module/Settings/Profile/Index.php:246
+#: src/Module/Settings/Profile/Index.php:248
 msgid ""
 "The Matrix address will be published so that people can follow you there."
 msgstr "سيتم نشر عنوان مايتركس حتى يتمكن الناس من متابعتك هناك."
 
-#: src/Module/Settings/Profile/Index.php:247
+#: src/Module/Settings/Profile/Index.php:249
 msgid "Homepage URL:"
 msgstr "رابط الصفحة الرئيسية:"
 
-#: src/Module/Settings/Profile/Index.php:248
+#: src/Module/Settings/Profile/Index.php:250
 msgid "Public Keywords:"
-msgstr "الكلمات المفتاحية العمومية:"
+msgstr "الكلمات المفتاحية العلنية:"
 
-#: src/Module/Settings/Profile/Index.php:248
+#: src/Module/Settings/Profile/Index.php:250
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr "(يستخدم لاقتراح أصدقاء، يمكن للآخرين رؤيتهم)"
 
-#: src/Module/Settings/Profile/Index.php:249
+#: src/Module/Settings/Profile/Index.php:251
 msgid "Private Keywords:"
 msgstr "الكلمات المفتاحية الخاصة:"
 
-#: src/Module/Settings/Profile/Index.php:249
+#: src/Module/Settings/Profile/Index.php:251
 msgid "(Used for searching profiles, never shown to others)"
 msgstr "(يستخدم للبحث عن ملفات الشخصية، لا يظهر للآخرين)"
 
-#: src/Module/Settings/Profile/Index.php:250
+#: src/Module/Settings/Profile/Index.php:252
 #, php-format
 msgid ""
 "<p>Custom fields appear on <a href=\"%s\">your profile page</a>.</p>\n"
@@ -9622,44 +9382,44 @@ msgid ""
 "\t\t\t\t<p>Reorder by dragging the field title.</p>\n"
 "\t\t\t\t<p>Empty the label field to remove a custom field.</p>\n"
 "\t\t\t\t<p>Non-public fields can only be seen by the selected Friendica contacts or the Friendica contacts in the selected groups.</p>"
-msgstr "<p>الحقول المخصصة تظهر في <a href=\"%s\">صفحة ملفك الشخصي</a>.</p>\n\t\t\t\t<p>يمكنك استخدام رموز BBCCode في حقول القيم.</p>\n\t\t\t\t<p>أعد الترتيب بسحب عنوان الحقل.</p>\n\t\t\t\t<p>أفرغ حقل التسمية لإزالة الحقل مخصص.</p>\n\t\t\t\t<p>لن يتمكن إلاّ المتراسلين المختارين والمجموعات المختارة من رؤية الحقول غير العامة.</p>"
+msgstr "<p>الحقول المخصصة تظهر في <a href=\"%s\">صفحة ملفك الشخصي</a>.</p>\n\t\t\t\t<p>يمكنك استخدام رموز BBCCode في حقول القيم.</p>\n\t\t\t\t<p>أعد الترتيب بسحب عنوان الحقل.</p>\n\t\t\t\t<p>أفرغ حقل التسمية لإزالة الحقل مخصص.</p>\n\t\t\t\t<p>لن يتمكن إلاّ المتراسلين المختارين والمجموعات المختارة من رؤية الحقول غير العلنية.</p>"
 
-#: src/Module/Settings/Profile/Photo/Crop.php:106
-#: src/Module/Settings/Profile/Photo/Crop.php:122
-#: src/Module/Settings/Profile/Photo/Crop.php:138
+#: src/Module/Settings/Profile/Photo/Crop.php:108
+#: src/Module/Settings/Profile/Photo/Crop.php:126
+#: src/Module/Settings/Profile/Photo/Crop.php:144
 #: src/Module/Settings/Profile/Photo/Index.php:102
 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr "فشل تقليص حجم الصورة [%s]."
 
-#: src/Module/Settings/Profile/Photo/Crop.php:143
+#: src/Module/Settings/Profile/Photo/Crop.php:151
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr ""
 
-#: src/Module/Settings/Profile/Photo/Crop.php:148
+#: src/Module/Settings/Profile/Photo/Crop.php:156
 msgid "Unable to process image"
 msgstr "تعذرت معالجة الصورة"
 
-#: src/Module/Settings/Profile/Photo/Crop.php:167
+#: src/Module/Settings/Profile/Photo/Crop.php:175
 msgid "Photo not found."
 msgstr "لم يُعثر على الصورة."
 
-#: src/Module/Settings/Profile/Photo/Crop.php:189
+#: src/Module/Settings/Profile/Photo/Crop.php:197
 msgid "Profile picture successfully updated."
 msgstr "نجح تحديث صورة الملف الشخصي."
 
-#: src/Module/Settings/Profile/Photo/Crop.php:215
-#: src/Module/Settings/Profile/Photo/Crop.php:219
+#: src/Module/Settings/Profile/Photo/Crop.php:223
+#: src/Module/Settings/Profile/Photo/Crop.php:227
 msgid "Crop Image"
 msgstr "قص الصورة"
 
-#: src/Module/Settings/Profile/Photo/Crop.php:216
+#: src/Module/Settings/Profile/Photo/Crop.php:224
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: src/Module/Settings/Profile/Photo/Crop.php:218
+#: src/Module/Settings/Profile/Photo/Crop.php:226
 msgid "Use Image As Is"
 msgstr "استخدم الصورة كما هي"
 
@@ -10402,7 +10162,7 @@ msgstr "علق %1$s على نقاشهم"
 #: src/Navigation/Notifications/Factory/Notification.php:193
 #, php-format
 msgid "%1$s commented in the thread %2$s from %3$s"
-msgstr ""
+msgstr "علق %1$s على المحدثة %2$s من %3$s"
 
 #: src/Navigation/Notifications/Factory/Notification.php:195
 #, php-format
@@ -10417,7 +10177,7 @@ msgstr "علق %1$s على نقاشك %2$s"
 #: src/Navigation/Notifications/Factory/Notification.php:205
 #, php-format
 msgid "%1$s shared the post %2$s from %3$s"
-msgstr ""
+msgstr "شارك %1$s المشاركة %2$s من %3$s"
 
 #: src/Navigation/Notifications/Factory/Notification.php:207
 #, php-format
@@ -10434,6 +10194,263 @@ msgstr "شارك %1$s المشاركة %2$s"
 msgid "%1$s shared a post"
 msgstr "شارك %1$s مشاركة"
 
+#: src/Navigation/Notifications/Repository/Notify.php:192
+#: src/Navigation/Notifications/Repository/Notify.php:675
+msgid "[Friendica:Notify]"
+msgstr "[Friendica:Notify]"
+
+#: src/Navigation/Notifications/Repository/Notify.php:256
+#, php-format
+msgid "%s New mail received at %s"
+msgstr "أُستلم %s بريد جديد على %s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:258
+#, php-format
+msgid "%1$s sent you a new private message at %2$s."
+msgstr "أرسل %1$s لك رسالة خاصة على %2$s."
+
+#: src/Navigation/Notifications/Repository/Notify.php:259
+msgid "a private message"
+msgstr "رسالة خاصة"
+
+#: src/Navigation/Notifications/Repository/Notify.php:259
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "أرسل %1$s لك %2$s."
+
+#: src/Navigation/Notifications/Repository/Notify.php:261
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "من فضلك زر %s لعرض و/أو الرد على الرسائل الخاصة."
+
+#: src/Navigation/Notifications/Repository/Notify.php:292
+#, php-format
+msgid "%1$s commented on %2$s's %3$s %4$s"
+msgstr "علق %1$s على %3$s %2$s %4$s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:297
+#, php-format
+msgid "%1$s commented on your %2$s %3$s"
+msgstr "علق %1$s على %2$s تخصك %3$s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:301
+#, php-format
+msgid "%1$s commented on their %2$s %3$s"
+msgstr "علق %1$s على %2$s له %3$s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:305
+#: src/Navigation/Notifications/Repository/Notify.php:710
+#, php-format
+msgid "%1$s Comment to conversation #%2$d by %3$s"
+msgstr "علق %1$s على محادثة %3$s #%2$d"
+
+#: src/Navigation/Notifications/Repository/Notify.php:307
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
+msgstr "علق %s على محادثة/عنصر تتابعه."
+
+#: src/Navigation/Notifications/Repository/Notify.php:311
+#: src/Navigation/Notifications/Repository/Notify.php:326
+#: src/Navigation/Notifications/Repository/Notify.php:345
+#: src/Navigation/Notifications/Repository/Notify.php:725
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "من فضلك زر %s لعرض و/أو الرد على المحادثة."
+
+#: src/Navigation/Notifications/Repository/Notify.php:318
+#, php-format
+msgid "%s %s posted to your profile wall"
+msgstr "نشر %s%s على حائط ملفك الشخصي"
+
+#: src/Navigation/Notifications/Repository/Notify.php:320
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
+msgstr "نشر %1$s على حائط ملفك الشخصي على %2$s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:321
+#, php-format
+msgid "%1$s posted to [url=%2$s]your wall[/url]"
+msgstr "نشر %1$s على [url=%2$s]حائطك[/url]"
+
+#: src/Navigation/Notifications/Repository/Notify.php:333
+#, php-format
+msgid "%1$s %2$s poked you"
+msgstr "لكزك %1$s %2$s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:335
+#, php-format
+msgid "%1$s poked you at %2$s"
+msgstr "لكزك %1$s على %2$s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:336
+#, php-format
+msgid "%1$s [url=%2$s]poked you[/url]."
+msgstr "[url=%2$s]لكزك[/url] %1$s."
+
+#: src/Navigation/Notifications/Repository/Notify.php:353
+#, php-format
+msgid "%s Introduction received"
+msgstr "تلقيت تقديما من %s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:355
+#, php-format
+msgid "You've received an introduction from '%1$s' at %2$s"
+msgstr "تلقيت تقديما من '%1$s' على %2$s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:356
+#, php-format
+msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+msgstr "تلقيت [url=%1$s]تقديما[/url] من %2$s."
+
+#: src/Navigation/Notifications/Repository/Notify.php:361
+#: src/Navigation/Notifications/Repository/Notify.php:407
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "يمكنك زيارة ملفهم الشخصي على %s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:363
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr "من فضلك زر %s لقبول أو رفض التقديم."
+
+#: src/Navigation/Notifications/Repository/Notify.php:370
+#, php-format
+msgid "%s A new person is sharing with you"
+msgstr "%s شخص جديد يشارك معك"
+
+#: src/Navigation/Notifications/Repository/Notify.php:372
+#: src/Navigation/Notifications/Repository/Notify.php:373
+#, php-format
+msgid "%1$s is sharing with you at %2$s"
+msgstr "يشارك %1$s معك على %2$s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:380
+#, php-format
+msgid "%s You have a new follower"
+msgstr "لديك متابِع جديد %s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:382
+#: src/Navigation/Notifications/Repository/Notify.php:383
+#, php-format
+msgid "You have a new follower at %2$s : %1$s"
+msgstr "لديك متابِع جديد على %2$s : %1$s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:396
+#, php-format
+msgid "%s Friend suggestion received"
+msgstr "تلقيت إقتراح صديق %s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:398
+#, php-format
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
+msgstr "تلقيت اقتراح صديق من '%1$s' على %2$s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:399
+#, php-format
+msgid ""
+"You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
+msgstr " تلقيت [url=%1$s]اقتراح %2$s كصديق[/url] من %3$s."
+
+#: src/Navigation/Notifications/Repository/Notify.php:405
+msgid "Name:"
+msgstr "الاسم:"
+
+#: src/Navigation/Notifications/Repository/Notify.php:406
+msgid "Photo:"
+msgstr "الصورة:"
+
+#: src/Navigation/Notifications/Repository/Notify.php:409
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "من فضلك زر %s لقبول  أو رفض الاقتراح."
+
+#: src/Navigation/Notifications/Repository/Notify.php:417
+#: src/Navigation/Notifications/Repository/Notify.php:432
+#, php-format
+msgid "%s Connection accepted"
+msgstr "قُبِل الاقتران %s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:419
+#: src/Navigation/Notifications/Repository/Notify.php:434
+#, php-format
+msgid "'%1$s' has accepted your connection request at %2$s"
+msgstr "قبِل '%1$s' طلب الاقتران على %2$s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:420
+#: src/Navigation/Notifications/Repository/Notify.php:435
+#, php-format
+msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
+msgstr "قبِل %2$s [url=%1$s]طلب الاقتران[/url]"
+
+#: src/Navigation/Notifications/Repository/Notify.php:425
+msgid ""
+"You are now mutual friends and may exchange status updates, photos, and "
+"email without restriction."
+msgstr "أصبحتما صديقين من كلا الطرفين ويمكنكما تبادل تحديثات الحالة، والصور، والبريد دون قيود."
+
+#: src/Navigation/Notifications/Repository/Notify.php:427
+#, php-format
+msgid "Please visit %s if you wish to make any changes to this relationship."
+msgstr "من فضلك زر %s إن أردت تغيير هذه العلاقة."
+
+#: src/Navigation/Notifications/Repository/Notify.php:440
+#, php-format
+msgid ""
+"'%1$s' has chosen to accept you a fan, which restricts some forms of "
+"communication - such as private messaging and some profile interactions. If "
+"this is a celebrity or community page, these settings were applied "
+"automatically."
+msgstr "قبِلك '%1$s' كمعجب، هذا يحدُّ من أشكال التواصل بينكما مثل الرسائل الخاصة وبعض التفاعلات. يتم هذا تلقائيا اذا كانت صفحة مشهور أو مجتمع."
+
+#: src/Navigation/Notifications/Repository/Notify.php:442
+#, php-format
+msgid ""
+"'%1$s' may choose to extend this into a two-way or more permissive "
+"relationship in the future."
+msgstr "قد يختار '%1$s' توسيعها إلى علاقة ذات اتجاهين أو أكثر في المستقبل."
+
+#: src/Navigation/Notifications/Repository/Notify.php:444
+#, php-format
+msgid "Please visit %s  if you wish to make any changes to this relationship."
+msgstr "من فضلك زر %s إن أردت تغيير هذه العلاقة."
+
+#: src/Navigation/Notifications/Repository/Notify.php:454
+msgid "registration request"
+msgstr "طلب تسجيل"
+
+#: src/Navigation/Notifications/Repository/Notify.php:456
+#, php-format
+msgid "You've received a registration request from '%1$s' at %2$s"
+msgstr "تلقيت طلب تسجيل من '%1$s' على %2$s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:457
+#, php-format
+msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
+msgstr "تلقيت [url=%1$s]طلب تسجيل[/url] من %2$s."
+
+#: src/Navigation/Notifications/Repository/Notify.php:462
+#, php-format
+msgid ""
+"Full Name:\t%s\n"
+"Site Location:\t%s\n"
+"Login Name:\t%s (%s)"
+msgstr "الاسم الكامل:\t%s\nالموقع:\t%s\nاسم الولوج:\t%s (%s)"
+
+#: src/Navigation/Notifications/Repository/Notify.php:468
+#, php-format
+msgid "Please visit %s to approve or reject the request."
+msgstr "من فضلك زر %s لقبول أو رفض الطلب."
+
+#: src/Navigation/Notifications/Repository/Notify.php:704
+#, php-format
+msgid "%s %s tagged you"
+msgstr "ذكرك %s%s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:707
+#, php-format
+msgid "%s %s shared a new post"
+msgstr "شارك %s%s مشاركة جديدة"
+
 #: src/Object/EMail/ItemCCEMail.php:42
 #, php-format
 msgid ""
@@ -10548,15 +10565,15 @@ msgstr "أضف وسما"
 
 #: src/Object/Post.php:352
 msgid "Quote share this"
-msgstr ""
+msgstr "اقتبس وشارك"
 
 #: src/Object/Post.php:352
 msgid "Quote Share"
-msgstr "مشاركة الاقتباس"
+msgstr "اقتبس وشارك"
 
 #: src/Object/Post.php:355
 msgid "Reshare this"
-msgstr "شارك هذا"
+msgstr "أعاد نشر هذا"
 
 #: src/Object/Post.php:355
 msgid "Reshare"
@@ -10618,7 +10635,7 @@ msgstr "المزيد"
 
 #: src/Object/Post.php:518
 msgid "Notifier task is pending"
-msgstr ""
+msgstr "مهمة التنبيه معلقة"
 
 #: src/Object/Post.php:519
 msgid "Delivery to remote servers is pending"
@@ -10792,7 +10809,7 @@ msgstr "في %1$d %2$s"
 msgid "%1$d %2$s ago"
 msgstr "منذ %1$d %2$s"
 
-#: src/Worker/Delivery.php:521
+#: src/Worker/Delivery.php:525
 msgid "(no subject)"
 msgstr "(بدون موضوع)"
 
@@ -10854,7 +10871,7 @@ msgstr "ملاحظة"
 
 #: view/theme/frio/config.php:156
 msgid "Check image permissions if all users are allowed to see the image"
-msgstr "تحقق من أذون الصورة إذا كان مسموح للجميع مشاهدتها"
+msgstr "تحقق من أذونات الصورة إذا كان مسموح للجميع مشاهدتها"
 
 #: view/theme/frio/config.php:162
 msgid "Custom"
diff --git a/view/lang/ar/strings.php b/view/lang/ar/strings.php
index 83fbec936..895124eeb 100644
--- a/view/lang/ar/strings.php
+++ b/view/lang/ar/strings.php
@@ -22,63 +22,10 @@ $a->strings['Weekly posting limit of %d post reached. The post was rejected.'] =
 	5 => 'رُفضت المشاركة. تجاوزت الحد الأسبوعي وهو %d مشاركة.',
 ];
 $a->strings['Monthly posting limit of %d post reached. The post was rejected.'] = 'رُفضت المشاركة. تجاوزت الحد الشهري وهو %d مشاركة.';
-$a->strings['[Friendica:Notify]'] = '[Friendica:Notify]';
-$a->strings['%s New mail received at %s'] = 'أُستلم بريد جديد %s على %s';
-$a->strings['%1$s sent you a new private message at %2$s.'] = 'أرسل %1$s لك رسالة خاصة على %2$s.';
-$a->strings['a private message'] = 'رسالة خاصة';
-$a->strings['%1$s sent you %2$s.'] = 'أرسل %1$s لك %2$s.';
-$a->strings['Please visit %s to view and/or reply to your private messages.'] = 'من فضلك.زر %s لعرض و/أو الرد على الرسائل الخاصة.';
-$a->strings['%1$s commented on %2$s\'s %3$s %4$s'] = 'علق %1$s على %3$s %2$s %4$s';
-$a->strings['%1$s commented on your %2$s %3$s'] = 'علق %1$s على %2$s تخصك %3$s';
-$a->strings['%1$s commented on their %2$s %3$s'] = 'علق %1$s على %2$s له %3$s';
-$a->strings['%1$s Comment to conversation #%2$d by %3$s'] = 'علق %1$s على محادثة %3$s #%2$d';
-$a->strings['%s commented on an item/conversation you have been following.'] = 'علق %s على محادثة/عنصر تتابعه.';
-$a->strings['Please visit %s to view and/or reply to the conversation.'] = 'من فضلك.زر %s لعرض و/أو الرد على المحادثة.';
-$a->strings['%s %s posted to your profile wall'] = 'نشر %s%s على حائط ملفك الشخصي';
-$a->strings['%1$s posted to your profile wall at %2$s'] = 'نشر %1$s على حائط ملفك الشخصي على %2$s';
-$a->strings['%1$s posted to [url=%2$s]your wall[/url]'] = '"نشر %1$s على [%2$s=url]حائطك[/url]';
-$a->strings['%1$s %2$s poked you'] = 'لكزك %1$s %2$s';
-$a->strings['%1$s poked you at %2$s'] = 'لكزك %1$s على %2$s';
-$a->strings['%1$s [url=%2$s]poked you[/url].'] = '[url=%2$s]لكزك[/url] %1$s.';
-$a->strings['%s Introduction received'] = 'تلقيت تقديما من %s';
-$a->strings['You\'ve received an introduction from \'%1$s\' at %2$s'] = 'تلقيت تقديما من \'%1$s\' على %2$s';
-$a->strings['You\'ve received [url=%1$s]an introduction[/url] from %2$s.'] = 'تلقيت [url=%1$s]تقديما[/url] من %2$s.';
-$a->strings['You may visit their profile at %s'] = 'يمكنك زيارة ملفهم الخصي على %s';
-$a->strings['Please visit %s to approve or reject the introduction.'] = 'من فضلك زر %s لقبول أو رفض التقديم.';
-$a->strings['%s A new person is sharing with you'] = '%s شخص جديد يشارك معك';
-$a->strings['%1$s is sharing with you at %2$s'] = 'يشارك %1$s معك على %2$s';
-$a->strings['%s You have a new follower'] = 'لديك متابِع جديد %s';
-$a->strings['You have a new follower at %2$s : %1$s'] = 'لديك متابِع جديد على %2$s : %1$s';
-$a->strings['%s Friend suggestion received'] = 'تلقيت إقتراح صديق %s';
-$a->strings['You\'ve received a friend suggestion from \'%1$s\' at %2$s'] = 'تلقيت اقتراح صديق من \'%1$s\' على %2$s';
-$a->strings['You\'ve received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s.'] = ' تلقيت [url=%1$s]اقتراح %2$s كصديق[/url] من %3$s.';
-$a->strings['Name:'] = 'الاسم:';
-$a->strings['Photo:'] = 'الصورة:';
-$a->strings['Please visit %s to approve or reject the suggestion.'] = 'من فضلك زر %s لقبول  أو رفض الاقتراح.';
-$a->strings['%s Connection accepted'] = 'قُبِل الاقتران %s';
-$a->strings['\'%1$s\' has accepted your connection request at %2$s'] = 'قبِل \'%1$s\' طلب الاقتران على %2$s';
-$a->strings['%2$s has accepted your [url=%1$s]connection request[/url].'] = 'قبِل %2$s [url=%1$s]طلب الاقتران[/url]';
-$a->strings['You are now mutual friends and may exchange status updates, photos, and email without restriction.'] = 'أصبحتما صديقين من كلا الطرفين ويمكنكما تبادل تحديثات الحالة، والصور، والبريد دون قيود.';
-$a->strings['Please visit %s if you wish to make any changes to this relationship.'] = 'من فضلك زر %s إن أردت تغيير هذه العلاقة.';
-$a->strings['\'%1$s\' has chosen to accept you a fan, which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically.'] = 'قبِلك \'%1$s\' كمعجب، هذا يحدُّ من أشكال التواصل بينكما مثل الزسائل الخاصة وبعض التفاعلات. يتم هذا تلقائيا اذا كانت صفحة مشهور أو مجتمع.';
-$a->strings['\'%1$s\' may choose to extend this into a two-way or more permissive relationship in the future.'] = 'قد يختار \'%1$s\' توسيعها إلى علاقة ذات اتجاهين أو أكثر في المستقبل.';
-$a->strings['Please visit %s  if you wish to make any changes to this relationship.'] = 'من فضلك زر %s إن أردت تغيير هذه العلاقة.';
-$a->strings['[Friendica System Notify]'] = '[Friendica System Notify]';
-$a->strings['registration request'] = 'طلب تسجيل';
-$a->strings['You\'ve received a registration request from \'%1$s\' at %2$s'] = 'تلقيت طلب تسجيل من \'%1$s\' على %2$s';
-$a->strings['You\'ve received a [url=%1$s]registration request[/url] from %2$s.'] = 'تلقيت [url=%1$s]طلب تسجيل[/url] من %2$s';
-$a->strings['Full Name:	%s
-Site Location:	%s
-Login Name:	%s (%s)'] = 'الاسم الكامل:	%s
-الموقع:	%s
-اسم الولوج:	%s (%s)';
-$a->strings['Please visit %s to approve or reject the request.'] = 'من فضلك زر %s لقبول  أو رفض الطلب.';
-$a->strings['%s %s tagged you'] = 'ذكرك %s%s';
-$a->strings['%s %s shared a new post'] = 'شارك %s%s مشاركة جديدة';
 $a->strings['Permission denied.'] = 'رُفض الإذن.';
-$a->strings['Access denied.'] = 'رُفض الإذن.';
+$a->strings['Access denied.'] = 'رُفض الوصول.';
 $a->strings['User not found.'] = 'لم يُعثر على المستخدم.';
-$a->strings['Access to this profile has been restricted.'] = 'قُيد الوصول لهذا الملف الشخصي.';
+$a->strings['Access to this profile has been restricted.'] = 'قُيِّد الوصول لهذا الملف الشخصي.';
 $a->strings['Events'] = 'الأحداث';
 $a->strings['View'] = 'اعرض';
 $a->strings['Previous'] = 'السابق';
@@ -92,43 +39,43 @@ $a->strings['User not found'] = 'لم يُعثر على المستخدم';
 $a->strings['This calendar format is not supported'] = 'تنسيق هذا التقويم غير مدعوم';
 $a->strings['No exportable data found'] = 'لم يُعثر على بيانات قابلة للتصدير';
 $a->strings['calendar'] = 'تقويم';
-$a->strings['Public access denied.'] = 'رُفض الوصول العمومي.';
+$a->strings['Public access denied.'] = 'رُفض الوصول العلني.';
 $a->strings['The requested item doesn\'t exist or has been deleted.'] = 'العنصر غير موجود أو حُذف.';
-$a->strings['The feed for this item is unavailable.'] = 'خلاصة هذا العنصر غير متوفرة.';
+$a->strings['The feed for this item is unavailable.'] = 'تغذية هذا العنصر غير متوفرة.';
 $a->strings['Item not found'] = 'لم يُعثر على العنصر';
-$a->strings['Edit post'] = 'حرر المشاركة';
+$a->strings['Edit post'] = 'عدّل المشاركة';
 $a->strings['Save'] = 'احفظ';
 $a->strings['Loading...'] = 'يحمل...';
 $a->strings['Upload photo'] = 'ارفع صورة';
 $a->strings['upload photo'] = 'ارفع صورة';
-$a->strings['Attach file'] = 'أرفق ملفا';
-$a->strings['attach file'] = 'أرفق ملفا';
+$a->strings['Attach file'] = 'أرفق ملفًا';
+$a->strings['attach file'] = 'أرفق ملفًا';
 $a->strings['Insert web link'] = 'أدرج رابط ويب';
 $a->strings['web link'] = 'رابط ويب';
 $a->strings['Insert video link'] = 'أدرج رابط فيديو';
 $a->strings['video link'] = 'رابط فيديو';
 $a->strings['Insert audio link'] = 'إدراج رابط ملف صوتي';
 $a->strings['audio link'] = 'رابط ملف صوتي';
-$a->strings['Set your location'] = 'موقعك';
-$a->strings['set location'] = 'عين موقعك';
+$a->strings['Set your location'] = 'عيّن موقعك';
+$a->strings['set location'] = 'عين الموقع';
 $a->strings['Clear browser location'] = 'امسح موقع المتصفح';
 $a->strings['clear location'] = 'امسح الموقع';
 $a->strings['Please wait'] = 'يرجى الانتظار';
-$a->strings['Permission settings'] = 'إعدادات الأذون';
+$a->strings['Permission settings'] = 'إعدادات الأذونات';
 $a->strings['CC: email addresses'] = 'أرسله إلى عناوين البريد الإلكتروني';
 $a->strings['Public post'] = 'مشاركة علنية';
 $a->strings['Set title'] = 'عين العنوان';
-$a->strings['Categories (comma-separated list)'] = 'فئات (قائمة مقسمة بفاصلة)';
+$a->strings['Categories (comma-separated list)'] = 'الفئات (قائمة مفصولة بفاصلة)';
 $a->strings['Example: bob@example.com, mary@example.com'] = 'مثل: bob@example.com, mary@example.com';
 $a->strings['Preview'] = 'معاينة';
 $a->strings['Cancel'] = 'ألغ';
-$a->strings['Message'] = 'رسالة';
-$a->strings['Browser'] = 'متصفح';
-$a->strings['Permissions'] = 'أُذون';
-$a->strings['Open Compose page'] = 'افتح صفحة التأليف';
+$a->strings['Message'] = 'الرسالة';
+$a->strings['Browser'] = 'المتصفح';
+$a->strings['Permissions'] = 'الأُذونات';
+$a->strings['Open Compose page'] = 'افتح صفحة الإنشاء';
 $a->strings['Event can not end before it has started.'] = 'لا يمكن أن ينتهي الحدث قبل أن يبدأ.';
 $a->strings['Event title and start time are required.'] = 'عنوان الحدث و وقت بدئه إلزاميان.';
-$a->strings['Create New Event'] = 'أنشئ حدثاً جديد';
+$a->strings['Create New Event'] = 'أنشئ حدثاً جديدًا';
 $a->strings['Event details'] = 'تفاصيل الحدث';
 $a->strings['Starting date and Title are required.'] = 'تاريخ البدء والعنوان إلزاميان.';
 $a->strings['Event Starts:'] = 'يبدأ الحدث في:';
@@ -142,26 +89,26 @@ $a->strings['Share this event'] = 'شارك هذا الحدث';
 $a->strings['Submit'] = 'أرسل';
 $a->strings['Basic'] = 'أساسي';
 $a->strings['Advanced'] = 'متقدم';
-$a->strings['Failed to remove event'] = 'فشلت إزالت الحدث';
+$a->strings['Failed to remove event'] = 'فشلت إزالة الحدث';
 $a->strings['Photos'] = 'الصور';
 $a->strings['Upload'] = 'ارفع';
 $a->strings['Files'] = 'الملفات';
 $a->strings['Submit Request'] = 'أرسل الطلب';
-$a->strings['You already added this contact.'] = 'لقد أضفت هذا المتراسل بالفعل.';
+$a->strings['You already added this contact.'] = 'أضفت هذا المتراسل سلفًا.';
 $a->strings['The network type couldn\'t be detected. Contact can\'t be added.'] = 'تعذر اكتشاف نوع الشبكة. لا يمكن إضافة المتراسل.';
 $a->strings['Diaspora support isn\'t enabled. Contact can\'t be added.'] = 'دعم دياسبورا غير مفعل. لا يمكن إضافة المتراسل.';
 $a->strings['OStatus support is disabled. Contact can\'t be added.'] = 'دعم OStatus غير مفعل. لا يمكن إضافة المتراسل.';
 $a->strings['Connect/Follow'] = 'اقترن\تابع';
 $a->strings['Please answer the following:'] = 'من فضلك أجب على ما يلي:';
 $a->strings['Your Identity Address:'] = 'عنوان معرّفك:';
-$a->strings['Profile URL'] = 'رابط الصفحة الشخصية';
+$a->strings['Profile URL'] = 'رابط الملف الشخصي';
 $a->strings['Tags:'] = 'الوسوم:';
 $a->strings['%s knows you'] = '%s يعرفك';
 $a->strings['Add a personal note:'] = 'أضف ملاحظة شخصية:';
-$a->strings['Status Messages and Posts'] = 'رسائل ومشاركات الحالة';
-$a->strings['The contact could not be added.'] = 'لا يمكن إضافة المتراسل.';
+$a->strings['Status Messages and Posts'] = 'مشاركات ورسائل الحالة';
+$a->strings['The contact could not be added.'] = 'تعذر إضافة المتراسل.';
 $a->strings['Unable to locate original post.'] = 'تعذر إيجاد المشاركة الأصلية.';
-$a->strings['Empty post discarded.'] = 'تُجوهلت المشاركة الفارغة.';
+$a->strings['Empty post discarded.'] = 'رُفضت المشاركة الفارغة.';
 $a->strings['Post updated.'] = 'حُدثت المشاركة.';
 $a->strings['Item wasn\'t stored.'] = 'لم يخزن العنصر.';
 $a->strings['Item couldn\'t be fetched.'] = 'تعذر جلب العنصر.';
@@ -214,13 +161,13 @@ $a->strings['
 		اسم الولوج:	%3$s';
 $a->strings['Password reset requested at %s'] = 'طُلب إعادة تعيين كلمة المرور على %s';
 $a->strings['Request could not be verified. (You may have previously submitted it.) Password reset failed.'] = 'تعذر التحقق من الطلب (ربما تكون قد أرسلته مسبقاً). فشلت إعادة تعيين كلمة المرور.';
-$a->strings['Request has expired, please make a new one.'] = 'انتهت صلاحيته، يرجى طلب واحد جديد.';
+$a->strings['Request has expired, please make a new one.'] = 'انتهت صلاحيته، أرسل طلب واحد جديد.';
 $a->strings['Forgot your Password?'] = 'نسيت كلمة المرور؟';
 $a->strings['Enter your email address and submit to have your password reset. Then check your email for further instructions.'] = 'أدخل عنوان بريدك الإلكتروني وأرسله من أجل إعادة تعيين كلمة المرور. بعد ذلك تحقق من بريدك الإلكتروني لمزيد من التعليمات.';
 $a->strings['Nickname or Email: '] = 'اللقب أو البريد الإلكتروني: ';
 $a->strings['Reset'] = 'أعد التعيين';
 $a->strings['Password Reset'] = 'إعادة تعيين كلمة المرور';
-$a->strings['Your password has been reset as requested.'] = 'أُعيذ تعيين كلمة المرور كما طلبت.';
+$a->strings['Your password has been reset as requested.'] = 'أُعيد تعيين كلمة المرور بناء على طلبك.';
 $a->strings['Your new password is'] = 'كلمة مرورك الجديدة هي';
 $a->strings['Save or copy your new password - and then'] = 'احفظ أو انسخ كلمة المرور الجديدة - ثم';
 $a->strings['click here to login'] = 'أنقر هنا للولوج';
@@ -254,22 +201,22 @@ $a->strings['
 			يمكنك تغيير كلمة المرور من صفحة إعدادات الحساب.
 			';
 $a->strings['Your password has been changed at %s'] = 'غُيرت كلمة المرور على %s';
-$a->strings['No keywords to match. Please add keywords to your profile.'] = 'لا توجد كلمات مفتاحية لمطابقتها. من فضلك أضاف كلمات مفتاحية إلى ملفك الشخصي.';
+$a->strings['No keywords to match. Please add keywords to your profile.'] = 'لا توجد كلمات مفتاحية لمطابقتها. من فضلك أضف كلمات مفتاحية إلى ملفك الشخصي.';
 $a->strings['No matches'] = 'لا تطابق';
 $a->strings['Profile Match'] = 'الملفات الشخصية المطابقة';
 $a->strings['New Message'] = 'رسالة جديدة';
 $a->strings['No recipient selected.'] = 'لم تختر متلقيا.';
 $a->strings['Unable to locate contact information.'] = 'تعذر العثور على معلومات المتراسل.';
-$a->strings['Message could not be sent.'] = 'تعذر ارسال الرسالة.';
+$a->strings['Message could not be sent.'] = 'تعذر إرسال الرسالة.';
 $a->strings['Message collection failure.'] = 'فشل جمع الرسائل.';
-$a->strings['Discard'] = 'تجاهل';
-$a->strings['Messages'] = 'رسائل';
+$a->strings['Discard'] = 'ارفض';
+$a->strings['Messages'] = 'الرسائل';
 $a->strings['Conversation not found.'] = 'لم يُعثر على المُحادثة.';
 $a->strings['Message was not deleted.'] = 'لم تحذف الرسالة.';
-$a->strings['Conversation was not removed.'] = 'لم تزل المحادثة.';
-$a->strings['Please enter a link URL:'] = 'يرجى ادخال عنوان الرابط:';
+$a->strings['Conversation was not removed.'] = 'لم تُزل المحادثة.';
+$a->strings['Please enter a link URL:'] = 'يرجى إدخال الرابط:';
 $a->strings['Send Private Message'] = 'أرسل رسالة خاصة';
-$a->strings['To:'] = 'الى:';
+$a->strings['To:'] = 'إلى:';
 $a->strings['Subject:'] = 'الموضوع:';
 $a->strings['Your message:'] = 'رسالتك:';
 $a->strings['No messages.'] = 'لا رسائل.';
@@ -292,9 +239,9 @@ $a->strings['%d message'] = [
 ];
 $a->strings['Personal Notes'] = 'ملاحظات شخصية';
 $a->strings['Personal notes are visible only by yourself.'] = 'الملاحظات الشخصية مرئية لك فقط.';
-$a->strings['Subscribing to contacts'] = 'يشتراك في متراسلين';
+$a->strings['Subscribing to contacts'] = 'يشترك في متراسلين';
 $a->strings['No contact provided.'] = 'لم يُقدم متراسلين.';
-$a->strings['Couldn\'t fetch information for contact.'] = 'تعذر جلب معلومات التمراسل.';
+$a->strings['Couldn\'t fetch information for contact.'] = 'تعذر جلب معلومات المتراسل.';
 $a->strings['Couldn\'t fetch friends for contact.'] = 'تعذر جلب أصدقاء المتراسل.';
 $a->strings['Couldn\'t fetch following contacts.'] = 'تعذر جلب متابِعي المتراسل.';
 $a->strings['Couldn\'t fetch remote profile.'] = 'تعذر جلب الملف الشخصي البعيد.';
@@ -302,7 +249,7 @@ $a->strings['Unsupported network'] = 'شبكة غير مدعومة';
 $a->strings['Done'] = 'تم';
 $a->strings['success'] = 'نجح';
 $a->strings['failed'] = 'فشل';
-$a->strings['ignored'] = 'تجاهل';
+$a->strings['ignored'] = 'متجاهل';
 $a->strings['Keep this window open until done.'] = 'أبق هذه النافذة مفتوحة حتى ينتهي.';
 $a->strings['Photo Albums'] = 'ألبومات الصور';
 $a->strings['Recent Photos'] = 'الصور الأخيرة';
@@ -367,14 +314,15 @@ $a->strings['View Album'] = 'اعرض الألبوم';
 $a->strings['{0} wants to be your friend'] = '{0} يريد أن يكون صديقك';
 $a->strings['{0} requested registration'] = '{0} طلب التسجيل';
 $a->strings['{0} and %d others requested registration'] = '{0} و %d يطلبون التسجيل';
-$a->strings['Bad Request.'] = 'طلب خاطئ';
+$a->strings['Bad Request.'] = 'طلب خاطئ.';
 $a->strings['Contact not found.'] = 'لم يُعثر على المتراسل.';
+$a->strings['[Friendica System Notify]'] = '[Friendica System Notify]';
 $a->strings['User deleted their account'] = 'حذف المستخدم حسابه';
 $a->strings['On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups.'] = 'حذف مستخدم حسابه على عقدة فرَندِكا خاصتك. من فضلك تأكد أن بياناتهم أُزيلت من النسخ الاحتياطية.';
 $a->strings['The user id is %d'] = 'معرف المستخدم هو %d';
 $a->strings['Remove My Account'] = 'أزل حسابي';
 $a->strings['This will completely remove your account. Once this has been done it is not recoverable.'] = 'سيزيل حسابك كليا. لا مجال لتراجع عند انتهائه.';
-$a->strings['Please enter your password for verification:'] = 'يرجى ادخال كلمة المرور لتأكيد:';
+$a->strings['Please enter your password for verification:'] = 'يرجى إدخال كلمة المرور لتأكيد:';
 $a->strings['Resubscribing to OStatus contacts'] = 'يعيد الاشتراك في متراسلي OStatus';
 $a->strings['Error'] = [
 	0 => 'لا أخطاء',
@@ -392,13 +340,13 @@ $a->strings['Passwords do not match.'] = 'كلمتا المرور غير متط
 $a->strings['Password update failed. Please try again.'] = 'فشل تحديث كلمة المرور. من فضلك أعد المحاولة.';
 $a->strings['Password changed.'] = 'غُيّرت كلمة المرور.';
 $a->strings['Password unchanged.'] = 'لم تُغير كلمة المرور.';
-$a->strings['Please use a shorter name.'] = 'يرجى إستخدام اسم أقصر.';
+$a->strings['Please use a shorter name.'] = 'يرجى استخدام اسم أقصر.';
 $a->strings['Name too short.'] = 'الاسم قصير جداً.';
 $a->strings['Wrong Password.'] = 'كلمة مرور خاطئة.';
-$a->strings['Invalid email.'] = 'البريد الالكتروني غير صالح.';
+$a->strings['Invalid email.'] = 'البريد الإلكتروني غير صالح.';
 $a->strings['Cannot change to that email.'] = 'لا يمكن التغيير إلى هذا البريد الإلكتروني.';
-$a->strings['Private forum has no privacy permissions. Using default privacy group.'] = 'المنتدى الخاص ليس لديه أذون الخصوصية. يستخدم مجموعة الخصوصية الافتراضية.';
-$a->strings['Private forum has no privacy permissions and no default privacy group.'] = 'المنتدى الخاص ليس لديه أذون الخصوصية ولا مجموعة خصوصية افتراضية.';
+$a->strings['Private forum has no privacy permissions. Using default privacy group.'] = 'المنتدى الخاص ليس لديه أذونات خصوصية. يستخدم مجموعة الخصوصية الافتراضية.';
+$a->strings['Private forum has no privacy permissions and no default privacy group.'] = 'المنتدى الخاص ليس لديه أذونات خصوصية ولا مجموعة خصوصية افتراضية.';
 $a->strings['Settings were not updated.'] = 'لم تُحدث الإعدادات.';
 $a->strings['Connected Apps'] = 'التطبيقات المتصلة';
 $a->strings['Name'] = 'الاسم';
@@ -415,7 +363,7 @@ $a->strings['disabled'] = 'معطل';
 $a->strings['Built-in support for %s connectivity is %s'] = 'دعم مدمج لـ %s باتصال %s';
 $a->strings['OStatus (GNU Social)'] = 'OStatus (GNU Social)';
 $a->strings['Email access is disabled on this site.'] = 'الوصول إلى البريد الإلكتروني معطل في هذا الموقع.';
-$a->strings['None'] = 'لا شيﺀ';
+$a->strings['None'] = 'لا شيء';
 $a->strings['Social Networks'] = 'الشبكات الاجتماعية';
 $a->strings['General Social Media Settings'] = 'إعدادات وسائل التواصل الاجتماعي العامة';
 $a->strings['Accept only top level posts by contacts you follow'] = 'قبول المشاركات الأصلية للمتراسلين الذين تتابعهم';
@@ -430,13 +378,13 @@ $a->strings['When activated, the title of the attached link will be added as a t
 $a->strings['Your legacy ActivityPub/GNU Social account'] = 'حساب GNU Social\ActivityPub القديم خاصتك';
 $a->strings['If you enter your old account name from an ActivityPub based system or your GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.'] = 'إذا قمت بإدخال اسم حساب ActivityPub/GNU Social/Statusnet القديم هنا (بنسق user@domain.tld)، سيضاف متراسلوك في هذا الحساب تلقائيا. سيصفر الحقل عند الانتهاء.';
 $a->strings['Repair OStatus subscriptions'] = 'أصلح اشتراكات OStatus';
-$a->strings['Email/Mailbox Setup'] = 'تثبيت بريد الكتروني/صندوق بريد';
+$a->strings['Email/Mailbox Setup'] = 'إعداد بريد الكتروني/صندوق بريد';
 $a->strings['If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox.'] = 'إذا كنت ترغب في التواصل مع متراسلي البريد الإلكتروني باستخدام هذه الخدمة (اختيارية)، من فضلك حدد كيفية الاتصال بصندوق بريدك.';
 $a->strings['Last successful email check:'] = 'آخر تحقق ناجح للبريد الإلكتروني:';
 $a->strings['IMAP server name:'] = 'اسم خادم IMAP:';
 $a->strings['IMAP port:'] = 'منفذ IMAP:';
 $a->strings['Security:'] = 'الحماية:';
-$a->strings['Email login name:'] = 'اسم الولوج للبريد الالكتروني:';
+$a->strings['Email login name:'] = 'اسم الولوج للبريد الإلكتروني:';
 $a->strings['Email password:'] = 'كلمة مرور البريد الإلكتروني:';
 $a->strings['Reply-to address:'] = 'الرد على عنوان:';
 $a->strings['Send public posts to all email contacts:'] = 'أرسل المشاركات العلنية لجميع متراسلي البريد الإلكتروني:';
@@ -453,12 +401,13 @@ $a->strings['Account for a personal profile.'] = 'حساب ملف شخصي خا
 $a->strings['Organisation Page'] = 'صفحة منظمة';
 $a->strings['Account for an organisation that automatically approves contact requests as "Followers".'] = 'حساب المنظمة يوافق تلقائياً على طلبات المراسلة "كمتابعين".';
 $a->strings['News Page'] = 'صفحة إخبارية';
+$a->strings['Account for a news reflector that automatically approves contact requests as "Followers".'] = 'حساب إخباري يوافق تلقائياً على طلبات المراسلة "كمتابعين".';
 $a->strings['Community Forum'] = 'منتدى مجتمعي';
 $a->strings['Account for community discussions.'] = 'حساب مناقشات مجتمعية.';
 $a->strings['Normal Account Page'] = 'صفحة حساب عادي';
 $a->strings['Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'] = 'حساب ملف شخصي عادي يتطلب الموافقة اليدوية على "الأصدقاء" و "المتابعين".';
 $a->strings['Soapbox Page'] = 'صفحة سياسي';
-$a->strings['Account for a public profile that automatically approves contact requests as "Followers".'] = 'حساب ملف شخصي عمومي يوافق تلقائياً على طلبات المراسلة "كمتابعين".';
+$a->strings['Account for a public profile that automatically approves contact requests as "Followers".'] = 'حساب شخصي علني يوافق تلقائياً على طلبات المراسلة "كمتابعين".';
 $a->strings['Public Forum'] = 'منتدى عمومي';
 $a->strings['Automatically approves all contact requests.'] = 'الموافقة تلقائياً على جميع طلبات المراسلة.';
 $a->strings['Automatic Friend Page'] = 'صفحة تصادق تلقائي';
@@ -468,13 +417,13 @@ $a->strings['Requires manual approval of contact requests.'] = 'يتطلب ال
 $a->strings['OpenID:'] = 'OpenID:';
 $a->strings['(Optional) Allow this OpenID to login to this account.'] = '(اختياري) اسمح لمعرف OpenID بالولوج إلى هذا الحساب.';
 $a->strings['Publish your profile in your local site directory?'] = 'أتريد نشر ملفك الشخصي في الدليل المحلي للموقع؟';
-$a->strings['Your profile will be published in this node\'s <a href="%s">local directory</a>. Your profile details may be publicly visible depending on the system settings.'] = 'سيتشر ملفك الشخصي في <a href="%s"> الدليل المحلي</a> لهذه العقدة. تعتمد خصوصية معلوماتك على إعدادات النظام.';
-$a->strings['Your profile will also be published in the global friendica directories (e.g. <a href="%s">%s</a>).'] = 'سينشر ملفك الشخصي كذلك في الأدلة العالمية لفرَندِكا (مثال <a href="%s">%s</a>).';
+$a->strings['Your profile will be published in this node\'s <a href="%s">local directory</a>. Your profile details may be publicly visible depending on the system settings.'] = 'سينشر ملفك الشخصي في <a href="%s"> الدليل المحلي</a> لهذه العقدة. تعتمد خصوصية معلوماتك على إعدادات النظام.';
+$a->strings['Your profile will also be published in the global friendica directories (e.g. <a href="%s">%s</a>).'] = 'سينشر ملفك الشخصي كذلك في الأدلة العالمية لفرَندِيكا (مثال <a href="%s">%s</a>).';
 $a->strings['Your Identity Address is <strong>\'%s\'</strong> or \'%s\'.'] = 'عنوان معرفك هو <strong>\'%s\'</strong> أو \'%s\'.';
 $a->strings['Account Settings'] = 'إعدادات الحساب';
 $a->strings['Password Settings'] = 'إعدادات كلمة المرور';
 $a->strings['New Password:'] = 'كلمة المرور الجديدة:';
-$a->strings['Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:).'] = 'المحارف المسموح بها هي a-z، A-Z، 0-9 والأحرف الخاصة باستثناء المساحات، الأحرف المنبورة والكولون (:).';
+$a->strings['Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:).'] = 'المحارف المسموح بها هي a-z، A-Z، 0-9 والأحرف الخاصة باستثناء المساحات، الأحرف المنبورة ونقطتي التفسير (:).';
 $a->strings['Confirm:'] = 'التأكيد:';
 $a->strings['Leave password fields blank unless changing'] = 'اترك حقول كلمة المرور فارغة ما لم ترد تغييرها';
 $a->strings['Current Password:'] = 'كلمة المرور الحالية:';
@@ -484,7 +433,7 @@ $a->strings['Your current password to confirm the changes of the email address']
 $a->strings['Delete OpenID URL'] = 'احذف رابط OpenID';
 $a->strings['Basic Settings'] = 'الإعدادات الأساسيّة';
 $a->strings['Full Name:'] = 'الاسم الكامل:';
-$a->strings['Email Address:'] = 'البريد الالكتروني:';
+$a->strings['Email Address:'] = 'البريد الإلكتروني:';
 $a->strings['Your Timezone:'] = 'المنطقة الزمنية:';
 $a->strings['Your Language:'] = 'لغتك:';
 $a->strings['Set the language we use to show you friendica interface and to send you emails'] = 'عيّن اللغة واجهة فرَندِكا ورسائل البريد الإلكتروني';
@@ -500,16 +449,17 @@ $a->strings['A list of your contacts is displayed on your profile page. Activate
 $a->strings['Hide your profile details from anonymous viewers?'] = 'اخف معلومات ملفك الشخص عن المتصفحين المجهولين؟';
 $a->strings['Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means.'] = 'سيرى الزوار المجهولون صورة ملفك الشخصي واسمك العلني ولقبك. وستظل مشاركتك العامة وردودك متاحة عبر وسائل أخرى.';
 $a->strings['Make public posts unlisted'] = 'لا تدرج المشاركات العلنية';
-$a->strings['Your public posts will not appear on the community pages or in search results, nor be sent to relay servers. However they can still appear on public feeds on remote servers.'] = 'لن تظهر مشاركتك العامومية على صفحات المجتمع أو في نتائج البحث، ولن يتم إرسالها إلى خوادم الترحيل. بيد أنها لا تزال تظهر في التغذية العامومية للخوادم البعيدة.';
+$a->strings['Your public posts will not appear on the community pages or in search results, nor be sent to relay servers. However they can still appear on public feeds on remote servers.'] = 'لن تظهر مشاركتك العلنية على صفحات المجتمع أو في نتائج البحث، ولن يتم إرسالها إلى خوادم الترحيل. بيد أنها لا تزال تظهر في التغذية العمومية للخوادم البعيدة.';
 $a->strings['Make all posted pictures accessible'] = 'أتح كل الصور المنشورة';
-$a->strings['This option makes every posted picture accessible via the direct link. This is a workaround for the problem that most other networks can\'t handle permissions on pictures. Non public pictures still won\'t be visible for the public on your photo albums though.'] = 'يسمح هذا الخيار بالوصول للصورة المنشورة عبر رابط مباشر. هذا حل لمعظم الشبكات التي لا يمكنها التعامل مع الأذون. صورك غير العلنية ستبقى مخفية.';
+$a->strings['This option makes every posted picture accessible via the direct link. This is a workaround for the problem that most other networks can\'t handle permissions on pictures. Non public pictures still won\'t be visible for the public on your photo albums though.'] = 'يسمح هذا الخيار بالوصول للصورة المنشورة عبر رابط مباشر. هذا حل لمعظم الشبكات التي لا يمكنها التعامل مع الأذونات. صورك غير العلنية ستبقى مخفية.';
 $a->strings['Allow friends to post to your profile page?'] = 'أتسمح لأصدقائك بالنشر في صفحة ملفك الشخصي؟';
+$a->strings['Your contacts may write posts on your profile wall. These posts will be distributed to your contacts'] = 'يمكن لمتراسليك كتابة مشاركات على حائط ملفك الشخصي. ستكون هذه المشركات مرئية لمتراسليك';
 $a->strings['Allow friends to tag your posts?'] = 'أتسمح لأصدقائك بوسم مشاركاتك؟';
 $a->strings['Your contacts can add additional tags to your posts.'] = 'يمكن لأصدقائك إضافة وسوم لمشاركاتك.';
 $a->strings['Permit unknown people to send you private mail?'] = 'أتسمح لأشخاص مجهولين بإرسال بريد خاص لك؟';
 $a->strings['Friendica network users may send you private messages even if they are not in your contact list.'] = 'يمكن لمستخدمي شبكة فرَندِكا إرسال رسائل خاصة لك حتى إن لم يكونوا في قائمة متراسليك.';
 $a->strings['Maximum private messages per day from unknown people:'] = 'حد الرسائل اليومي المستلمة من مجهولين:';
-$a->strings['Default Post Permissions'] = 'أذون النشر الافتراضية';
+$a->strings['Default Post Permissions'] = 'أذونات النشر الافتراضية';
 $a->strings['Expiration settings'] = 'إعدادات انتهاء الصلاحية';
 $a->strings['Automatically expire posts after this many days:'] = 'أنهي صلاحية المشاركات تلقائياً بعد هذا العدد من الأيام:';
 $a->strings['If empty, posts will not expire. Expired posts will be deleted'] = 'إذا كان فارغاً، لن تنتهي صلاحية المشاركات. وإلا بعد المهلة ستحذف المشاركات المنتهية صلاحيتها';
@@ -524,12 +474,12 @@ $a->strings['When activated, photos will be expired.'] = 'عند تفعيله،
 $a->strings['Only expire posts by others'] = 'أنهي صلاحية مشاركات الآخرين فقط';
 $a->strings['When activated, your own posts never expire. Then the settings above are only valid for posts you received.'] = 'عند تفعيله، لا نهاية لصلاحية مشاركاتك. ثم تكون الإعدادات أعلاه صالحة فقط للمشاركات التي استلمتها.';
 $a->strings['Notification Settings'] = 'إعدادات التنبيهات';
-$a->strings['Send a notification email when:'] = 'أرسل تنبيها لبريدي الإلكتروتي عند:';
+$a->strings['Send a notification email when:'] = 'أرسل تنبيها للبريدي الإلكتروني عند:';
 $a->strings['You receive an introduction'] = 'تلقيت تقديما';
 $a->strings['Your introductions are confirmed'] = 'أُكدت تقديماتك';
 $a->strings['Someone writes on your profile wall'] = 'يكتب شخص ما على جدار ملفك الشخصي';
 $a->strings['Someone writes a followup comment'] = 'يكتب شخص ما تعليق متابعة';
-$a->strings['You receive a private message'] = 'تلقيت رسالت خاصة';
+$a->strings['You receive a private message'] = 'تلقيت رسالة خاصة';
 $a->strings['You receive a friend suggestion'] = 'تلقيت اقتراح صديق';
 $a->strings['You are tagged in a post'] = 'ذُكرتَ في مشاركة';
 $a->strings['Create a desktop notification when:'] = 'أنشئ تنبيه سطح المكتب عند:';
@@ -538,11 +488,11 @@ $a->strings['Someone shared your content'] = 'شارك شخص محتواك';
 $a->strings['Activate desktop notifications'] = 'مكن تنبيهات سطح المكتب';
 $a->strings['Show desktop popup on new notifications'] = 'أظهر منبثقات للتنبيهات الجديدة';
 $a->strings['Text-only notification emails'] = 'رسائل تنبيهية كنص فقط';
-$a->strings['Send text only notification emails, without the html part'] = 'أرسال بريد التنبيه كنص فقط، بدون وسوم html';
+$a->strings['Send text only notification emails, without the html part'] = 'أرسل بريد التنبيه كنص فقط، بدون وسوم html';
 $a->strings['Show detailled notifications'] = 'اعرض تنبيهات مفصلة';
 $a->strings['Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed.'] = 'افتراضيًا، تُجمع التنبيهات في تنبيه واحد لكل عنصر. عند تمكينه ستُعرض كل التنبيهات.';
 $a->strings['Show notifications of ignored contacts'] = 'أظهر تنبيهات للمتراسلين المتجاهلين';
-$a->strings['You don\'t see posts from ignored contacts. But you still see their comments. This setting controls if you want to still receive regular notifications that are caused by ignored contacts or not.'] = 'أنت لا ترى مشاركات المنراسلين المتجاهلين. لكن لا يزال بإمكانك رؤية تعليقاتهم. هذا الإعداد يتحكم إذا كنت ترغب في الاستمرار في تلقي تنبيهات سببها المتراسلون المتجاهلون.';
+$a->strings['You don\'t see posts from ignored contacts. But you still see their comments. This setting controls if you want to still receive regular notifications that are caused by ignored contacts or not.'] = 'أنت لا ترى مشاركات المتراسلين المتجاهلين. لكن لا يزال بإمكانك رؤية تعليقاتهم. هذا الإعداد يتحكم إذا كنت ترغب في الاستمرار في تلقي تنبيهات سببها المتراسلون المتجاهلون.';
 $a->strings['Advanced Account/Page Type Settings'] = 'إعدادات الحساب المتقدمة/نوع الصفحة';
 $a->strings['Change the behaviour of this account for special situations'] = 'غيّر سلوك هذا الحساب للحالات الخاصة';
 $a->strings['Import Contacts'] = 'استيراد متراسلين';
@@ -565,6 +515,7 @@ $a->strings['Import'] = 'استورد';
 $a->strings['Move account'] = 'أنقل الحساب';
 $a->strings['You can import an account from another Friendica server.'] = 'يمكنك استيراد حساب من خادم فرَندِكا آخر.';
 $a->strings['You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.'] = 'تحتاج إلى تصدير حسابك من الخادم القديم ورفعه هنا. سوف نقوم بإعادة إنشاء حسابك القديم هنا مع إضافة كل متراسليك. سوف نحاول أيضًا إبلاغهم أنك انتقلت إلى هنا.';
+$a->strings['This feature is experimental. We can\'t import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora'] = 'هذه الميزة تجريبية. لا يمكن استيراد متراسلين من شبكة OStatus (GNU Social/Statusnet) أو من شبكة Diaspora';
 $a->strings['Account file'] = 'ملف الحساب';
 $a->strings['To export your account, go to "Settings->Export your personal data" and select "Export account"'] = 'لتصدير حسابك، انتقل إلى "إعدادات-> صدر بياناتك الشخصية" واختر "صدر الحساب"';
 $a->strings['You aren\'t following this contact.'] = 'لا تتابع هذا المتراسل.';
@@ -589,7 +540,7 @@ $a->strings['Delete this item?'] = 'أتريد حذف العنصر؟';
 $a->strings['Block this author? They won\'t be able to follow you nor see your public posts, and you won\'t be able to see their posts and their notifications.'] = 'أتريد حظر هذا المتراسل؟ لن يتمكن من متابعتك أو رؤية مشاركاتك العمومية، ولن تكون قادراً على رؤية مشاركاتهم واستلام تنبيهات عنهم.';
 $a->strings['toggle mobile'] = 'بدّل واجهة الهاتف';
 $a->strings['Method not allowed for this module. Allowed method(s): %s'] = 'هذه الطريقة غير مسموح بها لهذه الوحدة. الطرق المسموح بها: %s';
-$a->strings['Page not found.'] = 'لم يتم العثور على الصفحة.';
+$a->strings['Page not found.'] = 'لم يُعثر على الصفحة.';
 $a->strings['The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it.'] = 'رمز الأمان للنموذج غير صحيح. ربما لأن النموذج فُتح لفترة طويلة (أكثر من 3 ساعات) قبل تقديمه.';
 $a->strings['All contacts'] = 'كل المتراسلين';
 $a->strings['Followers'] = 'متابِعون';
@@ -705,6 +656,7 @@ $a->strings['General Features'] = 'الميّزات العامة';
 $a->strings['Photo Location'] = 'موقع الصورة';
 $a->strings['Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map.'] = 'عادة ما تتم إزالة البيانات الوصفية للصور. هذا يجعل من الممكن حفظ الموقع (قبل إزالة البيانات) ووضع الصورة على الخريطة.';
 $a->strings['Trending Tags'] = 'الوسوم الشائعة';
+$a->strings['Show a community page widget with a list of the most popular tags in recent public posts.'] = 'أظهر ودجة صفحة المجتمع تحوي قائمة الوسوم المتداولة في المشاركات العلنية الأخيرة.';
 $a->strings['Post Composition Features'] = 'مميزات إنشاء المشاركة';
 $a->strings['Auto-mention Forums'] = 'ذكر المنتديات تلقائيا';
 $a->strings['Explicit Mentions'] = 'ذِكر صريح';
@@ -749,8 +701,8 @@ $a->strings['Your posts and conversations'] = 'مشاركاتك ومحادثات
 $a->strings['Profile'] = 'الملف شخصي';
 $a->strings['Your profile page'] = 'صفحة ملفك الشخصي';
 $a->strings['Your photos'] = 'صورك';
-$a->strings['Videos'] = 'الفيديوهات';
-$a->strings['Your videos'] = 'فيديوهاتك';
+$a->strings['Media'] = 'الوسائط';
+$a->strings['Your postings with media'] = 'مشاركاتك التي تحوي وسائط';
 $a->strings['Your events'] = 'أحداثك';
 $a->strings['Personal notes'] = 'الملاحظات الشخصية';
 $a->strings['Your personal notes'] = 'ملاحظاتك الشخصية';
@@ -858,9 +810,9 @@ $a->strings['Export calendar as ical'] = 'صدّر الرزنامة كملف ica
 $a->strings['Export calendar as csv'] = 'صدّر الرزنامة كملف csv';
 $a->strings['No contacts'] = 'لا متراسلين';
 $a->strings['%d Contact'] = [
-	0 => 'لا متراسلين',
-	1 => 'متراسل واحد',
-	2 => 'متراسلان',
+	0 => 'لا متراسلين %d',
+	1 => 'متراسل %d',
+	2 => 'متراسلان %d',
 	3 => '%d متراسلين',
 	4 => '%d متراسلا',
 	5 => '%d متراسل',
@@ -869,9 +821,9 @@ $a->strings['View Contacts'] = 'اعرض المتراسلين';
 $a->strings['Remove term'] = 'أزل العنصر';
 $a->strings['Saved Searches'] = 'عمليات البحث المحفوظة';
 $a->strings['Trending Tags (last %d hour)'] = [
-	0 => 'الوسوم الشائعة (أقل من ساعة)',
-	1 => 'الوسوم الشائعة (آخر ساعة)',
-	2 => 'الوسوم الشائعة (آخر ساعتين)',
+	0 => 'الوسوم الشائعة (أقل من ساعة %d)',
+	1 => 'الوسوم الشائعة (آخر ساعة %d)',
+	2 => 'الوسوم الشائعة (آخر ساعتين %d)',
 	3 => 'الوسوم الشائعة (آخر %d ساعات)',
 	4 => 'الوسوم الشائعة (آخر %d ساعة)',
 	5 => 'الوسوم الشائعة (آخر %d ساعة)',
@@ -882,6 +834,7 @@ $a->strings['Matrix:'] = 'مايتركس:';
 $a->strings['Network:'] = 'الشبكة:';
 $a->strings['Unfollow'] = 'ألغِ المتابعة';
 $a->strings['Yourself'] = 'أنت';
+$a->strings['Mutuals'] = 'المشتركة';
 $a->strings['Post to Email'] = 'أنشر عبر البريد الإلكتروني';
 $a->strings['Public'] = 'علني';
 $a->strings['This content will be shown to all your followers and can be seen in the community pages and by anyone with its link.'] = 'سيتم عرض هذا المحتوى لكل متابِعيك ويمكن مشاهدته في صفحات المجتمع ومن قبل أي شخص عبر الرابط.';
@@ -896,9 +849,18 @@ $a->strings['Please see the file "doc/INSTALL.md".'] = 'يرجى مراجعة م
 $a->strings['PHP executable path'] = 'مسار الملف التنفيذي لـ PHP';
 $a->strings['Enter full path to php executable. You can leave this blank to continue the installation.'] = 'أدخل المسار الكامل للملف التتفيذي لـ php. يمكنك تركه فارغًا لمتابعة التثبيت.';
 $a->strings['Command line PHP'] = 'سطر أوامر PHP';
+$a->strings['PHP executable is not the php cli binary (could be cgi-fgci version)'] = 'ملف PHP التنفيذي ليس ملفًا ثنائيًا (قد يكون إصدار cgi-fcgi)';
 $a->strings['Found PHP version: '] = 'اصدار PHP: ';
+$a->strings['PHP cli binary'] = 'الملف الثنائي لـ PHP';
+$a->strings['The command line version of PHP on your system does not have "register_argc_argv" enabled.'] = 'إصدار سطر أوامر PHP المثبت على النظام ليس مفعلًا فيه "register_argc_argv".';
 $a->strings['If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".'] = 'إذا كنت تستعمل ويندوز راجع "http://www.php.net/manual/en/openssl.installation.php".';
 $a->strings['Generate encryption keys'] = 'ولّد مفاتيح التشفير';
+$a->strings['Error: Apache webserver mod-rewrite module is required but not installed.'] = 'خطأ: وحدة mod-rewrite لخادم أباتشي مطلوبة لكنها لم تثبت.';
+$a->strings['Apache mod_rewrite module'] = 'وحدة Apache mod_rewrite';
+$a->strings['Program execution functions'] = 'مهام تنفيذ البرنامج';
+$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.'] = 'مثبِت الويب غير قادر على إنشاء ملف "local.config.php" في مجلد "config" التابع للخادم.';
+$a->strings['Please ensure that the connection to the server is secure.'] = 'يرجى التأكد من أن الاتصال بالخادم آمن.';
+$a->strings['ImageMagick supports GIF'] = 'ImageMagick يدعم GIF';
 $a->strings['Database already in use.'] = 'قاعدة البيانات قيد الاستخدام.';
 $a->strings['Could not connect to database.'] = 'يتعذر الاتصال بقاعدة البيانات.';
 $a->strings['Monday'] = 'الإثنين';
@@ -942,9 +904,13 @@ $a->strings['poke'] = 'ألكز';
 $a->strings['poked'] = 'لُكز';
 $a->strings['slap'] = 'اصفع';
 $a->strings['slapped'] = 'صُفع';
-$a->strings['Friendica can\'t display this page at the moment, please contact the administrator.'] = 'لا يمكن لفرَندِكا عرض هذه الصفحة حاليا، رجاء اتصل بالمدير.';
+$a->strings['Friendica can\'t display this page at the moment, please contact the administrator.'] = 'لا يمكن لفرَندِيكا عرض هذه الصفحة حاليا، رجاء اتصل بالمدير.';
 $a->strings['template engine cannot be registered without a name.'] = 'لا يمكن تسجيل محرك القوالب بدون اسم.';
 $a->strings['template engine is not registered!'] = 'لم يسجل محرك القوالب!';
+$a->strings['Updates from version %s are not supported. Please update at least to version 2021.01 and wait until the postupdate finished version 1383.'] = 'التحديثات التلقائية غير مدعومة من الإصدار %s. يرجى التحديث يدويًا إلى الإصدار 2021.01 وانتظر تحديث البيانات للوصول إلى الإصدار 1383.';
+$a->strings['Updates from postupdate version %s are not supported. Please update at least to version 2021.01 and wait until the postupdate finished version 1383.'] = 'التحديث التلقائي للبيانات من الإصدار %s غير مدعوم. يرجى التحديث يدويًا إلى الإصدار 2021.01 وانتظر تحديث البيانات للوصول إلى الإصدار 1383.';
+$a->strings['%s: executing pre update %d'] = '%s: ينفذ التحديث الاستباقي %d';
+$a->strings['%s: executing post update %d'] = '%s: ينفذ تحديث البيانات %d';
 $a->strings['Update %s failed. See error logs.'] = 'فشل تحديث %s. راجع سجل الأخطاء.';
 $a->strings['
 				The friendica developers released update %s recently,
@@ -959,12 +925,13 @@ $a->strings['The error message is\n[pre]%s[/pre]'] = 'رسالة الخطأ\n[pr
 $a->strings['[Friendica Notify] Database update'] = '[تنبيهات فرنديكا] تحديث قاعدة البيانات';
 $a->strings['
 					The friendica database was successfully updated from %s to %s.'] = '
-					حُدثت قاعدة البيانات بنجاح من الاصدار %s الى %s.';
+					حُدثت قاعدة البيانات بنجاح من الإصدار %s إلى %s.';
 $a->strings['Error decoding account file'] = 'خطأ أثناء فك ترميز ملف الحساب';
+$a->strings['Error! No version data in file! This is not a Friendica account file?'] = 'خطأ! لا توجد بيانات إصدار في الملف! هذا ليس ملف شخصي؟';
 $a->strings['User \'%s\' already exists on this server!'] = 'المستخدم \'%s\' موجود مسبقًا على هذا الخادم!';
 $a->strings['User creation error'] = 'خطأ في إنشاء المستخدم';
 $a->strings['%d contact not imported'] = [
-	0 => 'عدد المتراسيلن غير المستوردين هو %d',
+	0 => 'عدد المتراسلين غير المستوردين هو %d',
 	1 => 'لم يستورد متراسل واحد %d',
 	2 => 'لم يستورد متراسلان %d',
 	3 => 'لم يستورد %d متراسلين',
@@ -973,37 +940,68 @@ $a->strings['%d contact not imported'] = [
 ];
 $a->strings['User profile creation error'] = 'خطأ في إنشاء الملف الشخصي للمستخدم';
 $a->strings['Done. You can now login with your username and password'] = 'تم. يمكنك الآن الولوج باستخدام اسم المستخدم وكلمة المرور';
-$a->strings['The database version had been set to %s.'] = 'عُين إصدار قاعدة البيانات الى %s.';
+$a->strings['The database version had been set to %s.'] = 'عُين إصدار قاعدة البيانات إلى %s.';
+$a->strings['The post update is at version %d, it has to be at %d to safely drop the tables.'] = 'تحديث البيانات هو إصدار %d، لكن يجب أن يكون إصدار %d لتتمكن من حذف الجداول بأمان.';
+$a->strings['No unused tables found.'] = 'لم يُعثر على جداول غير مستعملة.';
+$a->strings['These tables are not used for friendica and will be deleted when you execute "dbstructure drop -e":'] = 'فرنديكا لا تستخدم هذه الجداول يمكنك حذفها بتنفيذ "dbstructure drop -e":';
+$a->strings['There are no tables on MyISAM or InnoDB with the Antelope file format.'] = 'لا توجد جداول MyISAM أو InnoDB بتنسيق ملف Antelope.';
+$a->strings['
+Error %d occurred during database update:
+%s
+'] = '
+حدث خطأ %d أثناء تحديث قاعدة البيانات:
+%s
+';
+$a->strings['Errors encountered performing database changes: '] = 'حدثت أخطاء أثناء تحديث قاعدة البيانات: ';
+$a->strings['Another database update is currently running.'] = 'تحديث آخر لقاعدة البيانات قيد التشغيل.';
 $a->strings['%s: Database update'] = '%s: تحديث قاعدة البيانات';
 $a->strings['%s: updating %s table.'] = '%s يحدث %s جدول.';
+$a->strings['Record not found'] = 'لم يُعثر على التسجيل';
+$a->strings['Unprocessable Entity'] = 'كيان غير قابل للمعالجة';
 $a->strings['Unauthorized'] = 'لم يخوّل';
 $a->strings['Internal Server Error'] = 'خطأ داخلي في الخادم';
+$a->strings['Legacy module file not found: %s'] = 'لم يُعثر على ملف الوحدة القديم: %s';
 $a->strings['UnFollow'] = 'ألغِ المتابعة';
-$a->strings['Approve'] = 'إقرار';
+$a->strings['Approve'] = 'موافق';
 $a->strings['Organisation'] = 'المنظّمة';
 $a->strings['Forum'] = 'المنتدى';
 $a->strings['Disallowed profile URL.'] = 'رابط الملف الشخصي غير مسموح.';
 $a->strings['Blocked domain'] = 'نطاق المحجوب';
 $a->strings['Connect URL missing.'] = 'رابط الاتصال مفقود.';
+$a->strings['The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page.'] = 'تعذر إضافة المتراسل. تحقق من بيانات اعتماد الشبكة المستهدفة في الإعدادات -> صفحة الشبكات الاجتماعية.';
+$a->strings['The profile address specified does not provide adequate information.'] = 'عنوان الملف الشخصي لا يوفر معلومات كافية.';
+$a->strings['No compatible communication protocols or feeds were discovered.'] = 'لم تكتشف أي موافيق اتصال أو تغذيات متوافقة.';
+$a->strings['No browser URL could be matched to this address.'] = 'لا يوجد رابط تصفح يطابق هذا العنوان.';
+$a->strings['Unable to match @-style Identity Address with a known protocol or email contact.'] = 'غير قادر على مطابقة عنوان المعرف "@" بميفاق معروف أو متراسل بريد إلكتروني.';
+$a->strings['Use mailto: in front of address to force email check.'] = 'استخدم mailto: أمام العنوان للتعرّف عليه كبريد إلكتروني.';
+$a->strings['The profile address specified belongs to a network which has been disabled on this site.'] = 'عنوان الملف الشخصي تابع لشبكة محجوبة في هذا الموقع.';
 $a->strings['Unable to retrieve contact information.'] = 'تعذر جلب معلومات المتراسل.';
 $a->strings['l F d, Y \@ g:i A'] = 'l F d, Y \@ g:i A';
 $a->strings['Starts:'] = 'يبدأ:';
+$a->strings['Finishes:'] = 'ينتهي:';
+$a->strings['all-day'] = 'كل اليوم';
+$a->strings['Sept'] = 'سبتمبر';
+$a->strings['No events to display'] = 'لا توجد أحداث لعرضها';
 $a->strings['Edit event'] = 'حرّر الحدث';
+$a->strings['Duplicate event'] = 'ضاعف الحدث';
 $a->strings['Delete event'] = 'احذف الحدث';
 $a->strings['Show map'] = 'أظهر الخريطة';
-$a->strings['Hide map'] = 'إخف الخريطة';
+$a->strings['Hide map'] = 'اخف الخريطة';
 $a->strings['%s\'s birthday'] = 'عيد ميلاد %s';
 $a->strings['Happy Birthday %s'] = '%s عيد ميلاد سعيد';
+$a->strings['A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name.'] = 'تم إحياء مجموعة محذوفة بهذا الاسم. أذونات العنصر الموجودة سبقًا <strong>قد</strong> تنطبق على هذه المجموعة وأي أعضاء في المستقبل. إذا حصل هذا، يرجى إنشاء مجموعة أخرى باسم مختلف.';
+$a->strings['Default privacy group for new contacts'] = 'المجموعة الافتراضية للمتراسلين الجدد';
 $a->strings['Everybody'] = 'الجميع';
 $a->strings['edit'] = 'حرّر';
 $a->strings['add'] = 'أضف';
 $a->strings['Edit group'] = 'حرّر المجموعة';
-$a->strings['Contacts not in any group'] = 'المتراسل لا ينتمي لأي مجموعة';
+$a->strings['Contacts not in any group'] = 'متراسلون لا ينتمون لأي مجموعة';
 $a->strings['Create a new group'] = 'أنشئ مجموعة جديدة';
 $a->strings['Group Name: '] = 'اسم المجموعة: ';
 $a->strings['Edit groups'] = 'حرّر المجموعات';
-$a->strings['Detected languages in this post:\n%s'] = 'اللغات المكتشفي في هذه المشاركة:\n%s';
+$a->strings['Detected languages in this post:\n%s'] = 'اللغات المكتشفة في هذه المشاركة:\n%s';
 $a->strings['activity'] = 'النشاط';
+$a->strings['comment'] = 'تعليق';
 $a->strings['post'] = 'مشاركة';
 $a->strings['Content warning: %s'] = 'تحذير من المحتوى: %s';
 $a->strings['bytes'] = 'بايت';
@@ -1017,15 +1015,17 @@ $a->strings['Atom feed'] = 'تغذية Atom';
 $a->strings['g A l F d'] = 'g A l F d';
 $a->strings['F d'] = 'F d';
 $a->strings['[today]'] = '[today]';
-$a->strings['Birthday Reminders'] = 'تذكيرات أعياد الميلاد';
+$a->strings['Birthday Reminders'] = 'التذكير أبعياد الميلاد';
 $a->strings['Birthdays this week:'] = 'أعياد ميلاد لهذا الأسبوع:';
 $a->strings['[No description]'] = '[No description]';
 $a->strings['Event Reminders'] = 'تذكيرات الأحداث';
 $a->strings['Upcoming events the next 7 days:'] = 'أحداث لهذا الأسبوع:';
+$a->strings['OpenWebAuth: %1$s welcomes %2$s'] = 'OpenWebAuth: %1$s يرحب بـ %2$s';
 $a->strings['Hometown:'] = 'المدينة:';
 $a->strings['Marital Status:'] = 'الحالة الاجتماعية:';
 $a->strings['With:'] = 'مع:';
 $a->strings['Since:'] = 'منذ:';
+$a->strings['Sexual Preference:'] = 'التفضيل الجنسي:';
 $a->strings['Political Views:'] = 'الآراء السياسية:';
 $a->strings['Religious Views:'] = 'الآراء الدينية:';
 $a->strings['Likes:'] = 'تحب:';
@@ -1041,15 +1041,187 @@ $a->strings['Love/romance'] = 'الحب/الرومانسية';
 $a->strings['Work/employment'] = 'العمل/التوظيف';
 $a->strings['School/education'] = 'المدرسة/التعليم';
 $a->strings['Contact information and Social Networks'] = 'معلومات الاتصال وحسابات الشبكات الاجتماعية';
+$a->strings['Storage base path'] = 'المسار الأساسي للتخزين';
+$a->strings['Folder where 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['SERIOUS ERROR: Generation of security keys failed.'] = 'خطأ فاضح: فشل توليد مفاتيح الأمان.';
+$a->strings['Login failed'] = 'فشل الولوج';
+$a->strings['Not enough information to authenticate'] = 'لا توجد معلومات كافية للمصادقة';
+$a->strings['Password can\'t be empty'] = 'لا يمكن أن تكون كلمة المرور فارغة';
+$a->strings['Empty passwords are not allowed.'] = 'لا يسمح بكلمات مرور فارغة.';
+$a->strings['The new password has been exposed in a public data dump, please choose another.'] = 'كلمة المرور الجديدة جزء من تسريب كلمات مرور عام ، يرجى اختيار كلمة مرور مختلفة.';
+$a->strings['The password can\'t contain accentuated letters, white spaces or colons (:)'] = 'لا يمكن أن تحتوي كلمة المرور على أحرف منبورة أو مسافات أو نقطتي تفسير (:)';
+$a->strings['Passwords do not match. Password unchanged.'] = 'كلمتا المرور غير متطابقتين. ولم تغير كلمة المرور.';
+$a->strings['An invitation is required.'] = 'الدعوة اجبارية.';
+$a->strings['Invitation could not be verified.'] = 'تعذر التحقق من الدعوة.';
+$a->strings['Invalid OpenID url'] = 'رابط OpenID عير صالح';
+$a->strings['We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.'] = 'واجهنا مشكلة أثناء الولوج باستخدام OpenID. يرجى التحقق من صحة المعرف.';
 $a->strings['The error message was:'] = 'رسالة الخطأ:';
+$a->strings['Please enter the required information.'] = 'يرجى إدخال المعلومات المطلوبة.';
+$a->strings['Username should be at least %s character.'] = [
+	0 => 'يجب أن لا يقل اسم المستخدم عن %s محرف.',
+	1 => 'يجب أن لا يقل اسم المستخدم عن محرف %s.',
+	2 => 'يجب أن لا يقل اسم المستخدم عن محرفين %s.',
+	3 => 'يجب أن لا يقل اسم المستخدم عن %s محارف.',
+	4 => 'يجب أن لا يقل اسم المستخدم عن %s محرف.',
+	5 => 'يجب أن لا يقل اسم المستخدم عن %s محرف.',
+];
+$a->strings['Username should be at most %s character.'] = [
+	0 => 'يجب أن لا يزيد اسم المستخدم عن %s محرف.',
+	1 => 'يجب أن لا يزيد اسم المستخدم عن محرف %s.',
+	2 => 'يجب أن لا يزيد اسم المستخدم عن محرفين %s.',
+	3 => 'يجب أن لا يزيد اسم المستخدم عن %s محارف.',
+	4 => 'يجب أن لا يزيد اسم المستخدم عن %s محرف.',
+	5 => 'يجب أن لا يزيد اسم المستخدم عن %s محرف.',
+];
 $a->strings['That doesn\'t appear to be your full (First Last) name.'] = 'لا يبدو أن هذا اسمك الكامل.';
-$a->strings['Your email domain is not among those allowed on this site.'] = 'مجال بريدك الألكتروني غير مسموح به على هذا الموقع.';
-$a->strings['Not a valid email address.'] = 'عناوين بريد الكتروني غير صالحة.';
+$a->strings['Your email domain is not among those allowed on this site.'] = 'مجال بريدك الإلكتروني غير مسموح به على هذا الموقع.';
+$a->strings['Not a valid email address.'] = 'عناوين بريد الإكتروني غير صالحة.';
 $a->strings['The nickname was blocked from registration by the nodes admin.'] = 'هذا اللقب محظور من قبل مدير العقدة.';
+$a->strings['Cannot use that email.'] = 'لا يمكن استخدام هذا البريد الإلكتروني.';
+$a->strings['Your nickname can only contain a-z, 0-9 and _.'] = 'يجب أن يتكون اللقب من المحارف a-z، 0-9، _.';
 $a->strings['Nickname is already registered. Please choose another.'] = 'هذا اللقب محجوز. اختر لقبًا آخر.';
 $a->strings['An error occurred during registration. Please try again.'] = 'حدث خطأ أثناء التسجيل، رجاء حاول مرة أخرى.';
+$a->strings['An error occurred creating your default profile. Please try again.'] = 'حدث خطأ أثناء إنشاء الملف الشخصي الافتراضي، رجاء حاول مرة أخرى.';
 $a->strings['Friends'] = 'الأصدقاء';
+$a->strings['An error occurred creating your default contact group. Please try again.'] = 'حدث خطأ أثناء إنشاء مجموعة المتراسلين الافتراضية، رجاء حاول مرة أخرى.';
 $a->strings['Profile Photos'] = 'صور الملف الشخصي';
+$a->strings['
+		Dear %1$s,
+			the administrator of %2$s has set up an account for you.'] = '
+		عزيزي %1$s،
+			أنشأ مدير %2$s حساب لك.';
+$a->strings['
+		The login details are as follows:
+
+		Site Location:	%1$s
+		Login Name:		%2$s
+		Password:		%3$s
+
+		You may change your password from your account "Settings" page after logging
+		in.
+
+		Please take a few moments to review the other account settings on that page.
+
+		You may also wish to add some basic information to your default profile
+		(on the "Profiles" page) so that other people can easily find you.
+
+		We recommend setting your full name, adding a profile photo,
+		adding some profile "keywords" (very useful in making new friends) - and
+		perhaps what country you live in; if you do not wish to be more specific
+		than that.
+
+		We fully respect your right to privacy, and none of these items are necessary.
+		If you are new and do not know anybody here, they may help
+		you to make some new and interesting friends.
+
+		If you ever want to delete your account, you can do so at %1$s/removeme
+
+		Thank you and welcome to %4$s.'] = '
+		تفاصيل تسجيل الولوج هي كالتالي:
+
+		الموقع:	%1$s
+		اسم المستخدم:		%2$s
+		كلمة المرور:	%3$s
+
+		يمكنك تغيير كلمة المرور من صفحة إعدادات الحساب.
+
+		يرجى أخذ بضع لحظات لمراجعة الإعدادات الأخرى في تلك الصفحة.
+
+		قد ترغب أيضًا في إضافة بعض المعلومات الأساسية إلى صفحة ملفك الشخصية الافتراضي
+		(من صفحة "الملفات الشخصية") حتى يتمكن الآخرون من العثور عليك بسهولة.
+
+		نحن نوصي بوضع اسمك الكامل، إضافة لصورة،
+		وإضافة بعض الكلمات المفتاحية (مفيدة جدا في تكوين صداقات) - و
+		ربما البلد الذي تعيش فيه.
+
+		نحن نحترم حقك في الخصوصية احتراما كاملا، ولا ضرورة لأي مما سبق.
+		إذا كنت جديداً ولا تعرف أي شخص هنا، فقد تساعدك هذه المعلومات على تكوين صداقات مثيرة للاهتمام.
+
+		إذا كنت ترغب في حذف حسابك، يمكنك فعل ذلك في %1$s/removeme
+
+		شكرا لك ومرحبًا بك في %4$s.';
+$a->strings['Registration details for %s'] = 'تفاصيل التسجيل لـ %s';
+$a->strings['
+			Dear %1$s,
+				Thank you for registering at %2$s. Your account is pending for approval by the administrator.
+
+			Your login details are as follows:
+
+			Site Location:	%3$s
+			Login Name:		%4$s
+			Password:		%5$s
+		'] = '
+			عزيزي %1$s،
+				شكرا لك على التسجيل في %2$s. حسابك معلق حتى يوافق عليه المدير.
+
+			تفاصيل الولوج هي كالتالي:
+
+			الموقع:	%3$s
+			اسم المستخدم:		%4$s
+			كلمة المرور:		%5$s
+				';
+$a->strings['Registration at %s'] = 'التسجيل في %s';
+$a->strings['
+				Dear %1$s,
+				Thank you for registering at %2$s. Your account has been created.
+			'] = '
+				 عزيزي %1$s،
+				شكرا لك على التسجيل في %2$s. نجح إنشاء حسابك.
+				';
+$a->strings['
+			The login details are as follows:
+
+			Site Location:	%3$s
+			Login Name:		%1$s
+			Password:		%5$s
+
+			You may change your password from your account "Settings" page after logging
+			in.
+
+			Please take a few moments to review the other account settings on that page.
+
+			You may also wish to add some basic information to your default profile
+			(on the "Profiles" page) so that other people can easily find you.
+
+			We recommend setting your full name, adding a profile photo,
+			adding some profile "keywords" (very useful in making new friends) - and
+			perhaps what country you live in; if you do not wish to be more specific
+			than that.
+
+			We fully respect your right to privacy, and none of these items are necessary.
+			If you are new and do not know anybody here, they may help
+			you to make some new and interesting friends.
+
+			If you ever want to delete your account, you can do so at %3$s/removeme
+
+			Thank you and welcome to %2$s.'] = '
+		تفاصيل تسجيل الولوج هي كالتالي:
+
+		الموقع:	%3$s
+		اسم المستخدم:		%1$s
+		كلمة المرور:	%5$s
+
+		يمكنك تغيير كلمة المرور من صفحة إعدادات الحساب.
+
+		يرجى أخذ بضع لحظات لمراجعة الإعدادات الأخرى في تلك الصفحة.
+
+		قد ترغب أيضًا في إضافة بعض المعلومات الأساسية إلى صفحة ملفك الشخصية الافتراضي
+		(من صفحة "الملفات الشخصية") حتى يتمكن الآخرون من العثور عليك بسهولة.
+
+		نحن نوصي بوضع اسمك الكامل، إضافة لصورة،
+		وإضافة بعض الكلمات المفتاحية (مفيدة جدا في تكوين صداقات) - و
+		ربما البلد الذي تعيش فيه.
+
+		نحن نحترم حقك في الخصوصية احتراما كاملا، ولا ضرورة لأي مما سبق.
+		إذا كنت جديداً ولا تعرف أي شخص هنا، فقد تساعدك هذه المعلومات على تكوين صداقات مثيرة للاهتمام.
+
+		إذا كنت ترغب في حذف حسابك، يمكنك فعل ذلك في %3$s/removeme
+
+		شكرا لك ومرحبًا بك في %2$s.';
+$a->strings['Addon not found.'] = 'لم يُعثر على الإضافة.';
+$a->strings['Addon %s disabled.'] = 'الإضافة %s معطلة.';
+$a->strings['Addon %s enabled.'] = 'الإضافة %s مفعلة.';
 $a->strings['Disable'] = 'عطّل';
 $a->strings['Enable'] = 'فعّل';
 $a->strings['Administration'] = 'إدارة';
@@ -1057,6 +1229,12 @@ $a->strings['Addons'] = 'الإضافات';
 $a->strings['Toggle'] = 'بدّل';
 $a->strings['Author: '] = 'المؤلف: ';
 $a->strings['Maintainer: '] = 'المصين: ';
+$a->strings['Addons reloaded'] = 'أُعيد تحميل الإضافة';
+$a->strings['Addon %s failed to install.'] = 'فشل تثبيت إضافة %s.';
+$a->strings['Reload active addons'] = 'أعد تحميل الإضافات النشطة';
+$a->strings['There are currently no addons available on your node. You can find the official addon repository at %1$s and might find other interesting addons in the open addon registry at %2$s'] = 'لا توجد حاليا أي إضافات متاحة في عقدتك. يمكنك العثور على مستودع الإضافات الرسمي في %1$s وقد تجد إضافات أخرى مثيرة للاهتمام في سجل الإضافات المفتوحة في %2$s';
+$a->strings['List of all users'] = 'قائمة المستخدمين';
+$a->strings['Active'] = 'نشط';
 $a->strings['List of active accounts'] = 'قائمة الحسابات النشطة';
 $a->strings['Pending'] = 'معلق';
 $a->strings['List of pending registrations'] = 'قائمة التسجيلات المعلقة';
@@ -1065,6 +1243,7 @@ $a->strings['List of blocked users'] = 'قائمة المستخدمين المح
 $a->strings['Deleted'] = 'حُذف';
 $a->strings['List of pending user deletions'] = 'قائمة الحذف المعلق للمستخدمين';
 $a->strings['Private Forum'] = 'منتدى خاص';
+$a->strings['Relay'] = 'مُرحِل';
 $a->strings['%s contact unblocked'] = [
 	0 => 'لم يُفك حجب مستخدم %s',
 	1 => 'فُك حجب مستخدم %s',
@@ -1084,7 +1263,17 @@ $a->strings['Blocked Remote Contacts'] = 'المستخدمون البعداء ا
 $a->strings['Block New Remote Contact'] = 'احجب مستخدمًا بعيدًا';
 $a->strings['Photo'] = 'صورة';
 $a->strings['Reason'] = 'السبب';
+$a->strings['%s total blocked contact'] = [
+	0 => 'لم يحجب أي متراسل %s',
+	1 => 'متراسل%s محجوب',
+	2 => 'متراسلان %s محجوبان',
+	3 => '%s متراسلين محجوبين',
+	4 => '%s متراسلًا محجوبًا',
+	5 => '%s متراسل محجوب',
+];
 $a->strings['URL of the remote contact to block.'] = 'رابط المتراسل البعيد المراد حجبه.';
+$a->strings['Also purge contact'] = 'امسح المتراسل أيضًا';
+$a->strings['Removes all content related to this contact from the node. Keeps the contact record. This action canoot be undone.'] = 'يزيل جميع المحتويات المتعلقة بهذا المتراسل من العقدة. ويحتفظ بسجل للمتراسل. لا يمكن التراجع عن هذا الإجراء.';
 $a->strings['Block Reason'] = 'سبب الحجب';
 $a->strings['Server domain pattern added to blocklist.'] = 'أُضيف مرشح النطاق لقائمة الحجب.';
 $a->strings['Blocked server domain pattern'] = 'مرشح النطاق المحجوب';
@@ -1144,15 +1333,24 @@ $a->strings['Data'] = 'البيانات';
 $a->strings['File'] = 'الملف';
 $a->strings['Line'] = 'السطر';
 $a->strings['Function'] = 'الدالة';
+$a->strings['Process ID'] = 'مُعرّف العملية';
 $a->strings['Close'] = 'أغلق';
+$a->strings['Inspect Deferred Worker Queue'] = 'فحص طابور المهام المؤجلة';
+$a->strings['This page lists the deferred worker jobs. This are jobs that couldn\'t be executed at the first time.'] = 'تسرد هذه الصفحة العمليات المؤجلة. هذه العمليات لا يمكن تنفيذها لأول مرة.';
+$a->strings['Inspect Worker Queue'] = 'فحص طابور المهام';
+$a->strings['This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you\'ve set up during install.'] = 'تسرد هذه الصفحة العمليات المتواجدة في الطابور حاليا. هذه العمليات تديرها المهام التي أعددتها أثناء التثبيت.';
 $a->strings['ID'] = 'المعرف';
+$a->strings['Command'] = 'أمر';
 $a->strings['Priority'] = 'الأولوية';
 $a->strings['Relocation started. Could take a while to complete.'] = 'بدأ النقل. قد يستغرق بعض الوقت.';
+$a->strings['No special theme for mobile devices'] = 'لا توجد سمة مخصصة للهتف';
+$a->strings['%s - (Experimental)'] = '%s - (اختباري)';
 $a->strings['No community page for local users'] = 'لا توجد صفحة مجتمع للمستخدمين المحليين';
 $a->strings['No community page'] = 'لا توجد صفحة مجتمع';
-$a->strings['Public postings from users of this site'] = 'المشركات العامومية لمستخدمي هذا الموقع';
-$a->strings['Public postings from the federated network'] = 'المشركات العمومية من الشبكة الموحدة';
-$a->strings['Public postings from local users and the federated network'] = 'المشركات العامومية من الشبكة الموحدة والشبكة المحلية';
+$a->strings['Public postings from users of this site'] = 'المشاركات العلنية لمستخدمي هذا الموقع';
+$a->strings['Public postings from the federated network'] = 'المشاركات العلنية من الشبكة الموحدة';
+$a->strings['Public postings from local users and the federated network'] = 'المشركات العلنية من الشبكة الموحدة والشبكة المحلية';
+$a->strings['Multi user instance'] = 'مثيل متعدد المستخدمين';
 $a->strings['Closed'] = 'مغلق';
 $a->strings['Requires approval'] = 'تتطلب الحصول على موافقة';
 $a->strings['Open'] = 'افتح';
@@ -1162,11 +1360,18 @@ $a->strings['check the stable version'] = 'تحقق من الاصدار المس
 $a->strings['check the development version'] = 'تحقق من الاصدار التطويري';
 $a->strings['none'] = 'لا شيﺀ';
 $a->strings['Local contacts'] = 'المُتراسِلون المحليون';
+$a->strings['Interactors'] = 'المتفاعلون';
 $a->strings['Site'] = 'موقع';
+$a->strings['General Information'] = 'معلومات عامة';
+$a->strings['Republish users to directory'] = 'أعد نشر المستخدمين في الدليل';
 $a->strings['Registration'] = 'التسجيل';
 $a->strings['File upload'] = 'رفع الملف';
 $a->strings['Policies'] = 'السياسات';
 $a->strings['Performance'] = 'الأداء';
+$a->strings['Worker'] = 'مهمة';
+$a->strings['Message Relay'] = 'ترحيل الرسالة';
+$a->strings['The system is not subscribed to any relays at the moment.'] = 'هذا الخادم ليس مشترك في أي مرحلات حاليًا.';
+$a->strings['The system is currently subscribed to the following relays:'] = 'هذا الخادم مشترك حاليًا في المرحلات التالية:';
 $a->strings['Relocate Instance'] = 'انقل المثيل';
 $a->strings['<strong>Warning!</strong> Advanced function. Could make this server unreachable.'] = '<strong>تحذير!</strong> وظيفة متقدمة. يمكن أن تجعل هذا الخادم غير قابل للوصول.';
 $a->strings['Site name'] = 'اسم الموقع';
@@ -1177,9 +1382,11 @@ $a->strings['Name of the internal system account that is used to perform Activit
 $a->strings['Banner/Logo'] = 'اللافتة/الشعار';
 $a->strings['Email Banner/Logo'] = 'شعار\لافتة البريد الإلكتروني';
 $a->strings['Shortcut icon'] = 'أيقونة الاختصار';
+$a->strings['Link to an icon that will be used for browsers.'] = 'رابط إلى أيقونة سيتم استخدامها للمتصفحات.';
 $a->strings['Touch icon'] = 'أيقونة الأجهزة اللمسية';
 $a->strings['Link to an icon that will be used for tablets and mobiles.'] = 'رابط إلى أيقونة سيتم استخدامها للأجهزة اللوحية والهواتف.';
 $a->strings['Additional Info'] = 'معلومات إضافية';
+$a->strings['For public servers: you can add additional information here that will be listed at %s/servers.'] = 'للخوادم العامة: يمكنك إضافة معلومات إضافية لتدرج في %s/servers.';
 $a->strings['System language'] = 'لغة النظام';
 $a->strings['System theme'] = 'سمة النظام';
 $a->strings['Mobile system theme'] = 'سمة الهاتف';
@@ -1193,16 +1400,54 @@ $a->strings['Maximum image size'] = 'الحجم الأقصى للصورة';
 $a->strings['Maximum size in bytes of uploaded images. Default is 0, which means no limits.'] = 'حد حجم الصورة المرفوعة بالبايت. الافتراضي هو 0 والذي يعني حجمًا غير محدود.';
 $a->strings['Maximum image length'] = 'الطول الأقصى للصورة';
 $a->strings['Allowed email domains'] = 'نطاقات البريد الإلكتروني المسموحة';
+$a->strings['Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page.'] = 'عيّن هذا الخيار للإعلان عن أن عقدتك تحتوي محتوى حساس قد لا يكون مناسباً للقصر. وسوف تنشر هذه المعلومات في معلومات العقدة وصفحة التسجيل، ويستخدم هذا الخيار في الدليل العالمي، فأثناء استعراض هذه العقدة في الدليل ستظهر لهم هذه المعلومة.';
+$a->strings['Proxify external content'] = 'توجيه المحتوى الخارجي عبر الوكيل';
+$a->strings['Route external content via the proxy functionality. This is used for example for some OEmbed accesses and in some other rare cases.'] = 'توجيه المحتوى الخارجي عن طريق وميل. يستخدم هذا على سبيل المثال وصول OEmbed وفي بعض الحالات النادرة الأخرى.';
+$a->strings['Allow Users to set remote_self'] = 'اسمح للمستخدمين بتعيين remote_self';
+$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.'] = 'يتيح تأشير هذا المربع للميتخدمين تعريف مل المتراسلين علئ أنهم remote_self في مربع حوار اصلاح المتراسلين. سيؤدي تنشيط هذه الميزة على متراسل إلى نسخ جميع منشوراته في دفق المستخدم.';
+$a->strings['Enable multiple registrations'] = 'فعّل تعدد التسجيل';
+$a->strings['Enable users to register additional accounts for use as pages.'] = 'يمكن المستخدمين من تسجيل حسابات إضافية لتستخدم كصفحات.';
+$a->strings['Enable OpenID'] = 'فعّل OpenID';
+$a->strings['Enable OpenID support for registration and logins.'] = 'فعّل دعم OpenID للتسجيل والولوج.';
+$a->strings['Enable Fullname check'] = 'افرض استخدام الأسماء الكاملة';
+$a->strings['Enable check to only allow users to register with a space between the first name and the last name in their full name.'] = 'يفرض على المستخدمين تضمين مسافة واحدة في اسم المستخدم الخاص بهم بين الاسم الأول والاسم الأخير.';
+$a->strings['Community pages for visitors'] = 'عرض صفحة المجتمع للزوار';
+$a->strings['Which community pages should be available for visitors. Local users always see both pages.'] = 'صفحات المجتمع المتاحة للزوار. المستخدمون المحليون يمكنهم مشاهدة كلا النوعين.';
+$a->strings['Posts per user on community page'] = 'حد المشاركات لكل مستخدم في صفحة المجتمع';
+$a->strings['Proxy user'] = 'مستخدم الوكيل';
+$a->strings['Proxy URL'] = 'رابط الوكيل';
 $a->strings['Network timeout'] = 'انتهت مهلة الاتصال بالشبكة';
 $a->strings['Value is in seconds. Set to 0 for unlimited (not recommended).'] = 'القيمة بالثواني. تعيينها لـ 0 يعني مهلة غير محدودة (غير مستحسن).';
+$a->strings['Minimal Memory'] = 'الحد الأدنى للذاكرة';
+$a->strings['Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 (deactivated).'] = 'الحد الأدنى لذاكرة الحرة للمهمة بالميغابايت. تحتاج إذن الوصول إلى /proc/meminfo - الافتراضي 0 (معطل).';
+$a->strings['Periodically optimize tables'] = 'تحسين الجداول بصفة دورية';
+$a->strings['Periodically optimize tables like the cache and the workerqueue'] = 'حسن بانتظام بعض جداول قاعدة البيانات المستخدمة على نطاق واسع مثل ذاكرة التخزين المؤقت أو الأقفال أو الجلسة أو طابور المهام';
+$a->strings['Discover followers/followings from contacts'] = 'اكتشف قائمة متابِعي/متابَعي متراسليك';
+$a->strings['If enabled, contacts are checked for their followers and following contacts.'] = 'اذا فُعل سيقوم هذا الخادم بتجميع قائمة متابِعي ومتابَعي متراسليك.';
+$a->strings['None - deactivated'] = 'لا شيء - معطل';
+$a->strings['Synchronize the contacts with the directory server'] = 'زامن المتراسلين مع خادم الدليل';
+$a->strings['if enabled, the system will check periodically for new contacts on the defined directory server.'] = 'إذا فُعل سيقوم النظام بالتحقق دوريا للبحث عن متراسلين جدد على خادم الدليل المحدد.';
+$a->strings['Discover contacts from other servers'] = 'اكتشف متراسلين من خوادم أخرى';
+$a->strings['Periodically query other servers for contacts. The system queries Friendica, Mastodon and Hubzilla servers.'] = 'يجلب دوريا متراسلين من خوادم أخرى. يطبق على خوادم فرنديكا وماستدون وهوبزيلا.';
+$a->strings['Search the local directory'] = 'ابحث في الدليل المحلي';
+$a->strings['Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated.'] = 'يبحث في الدليل المحلي بدلاً من الدليل العالمي. عند إجراء بحث محلي ، يجرى نفس البحث في الدليل العالمي في الخلفية. هذا يحسن نتائج البحث إذا تكررت.';
+$a->strings['Publish server information'] = 'انشر معلومات الخادم';
+$a->strings['If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href="http://the-federation.info/">the-federation.info</a> for details.'] = 'إذا فعل ستنشر البيانات العامة للخادم وبيانات استخدامه. تحتوي هذه البيانات على اسم وإصدار الخادم ، وعدد المستخدمين الذين لهم ملف شخصي علني، وعدد المنشورات وقائمة الموصّلات والموافيق النشطة. راجع <a href="http://the-federation.info/">federation.info</a> للحصول على التفاصيل.';
+$a->strings['Check upstream version'] = 'تحقق من الاصدار المنبعي';
+$a->strings['Suppress Tags'] = 'اخف الوسوم';
+$a->strings['Suppress showing a list of hashtags at the end of the posting.'] = 'اخف قائمة الوسوم من أسفل المشاركة.';
+$a->strings['Clean database'] = 'امسح قاعدة البيانات';
 $a->strings['Temp path'] = 'مسار التخزين المؤقت';
 $a->strings['Only search in tags'] = 'ابحث في الوسوم فقط';
 $a->strings['On large systems the text search can slow down the system extremely.'] = 'في النظم الكبيرة، يمكن أن يؤدي البحث عن النصوص إلى إبطاء النظام.';
+$a->strings['New base url'] = 'رابط أساسي جديد';
+$a->strings['Maximum number of parallel workers'] = 'الحد الأقصى لعدد المهام';
 $a->strings['Disabled'] = 'معطل';
 $a->strings['all'] = 'الكل';
 $a->strings['tags'] = 'الوسوم';
 $a->strings['Server tags'] = 'وسوم الخادم';
 $a->strings['Start Relocation'] = 'ابدأ النقل';
+$a->strings['The worker was never executed. Please check your database structure!'] = 'لم يتم تنفيذ المهمة أبداً. يرجى التحقق من بنية قاعدة البيانات!';
 $a->strings['Normal Account'] = 'حساب عادي';
 $a->strings['Public Forum Account'] = 'حساب منتدى عمومي';
 $a->strings['Blog Account'] = 'حساب مدونة';
@@ -1276,31 +1521,45 @@ $a->strings['Users awaiting permanent deletion'] = 'مستخدمون في انت
 $a->strings['Permanent deletion'] = 'حذف نهائي';
 $a->strings['Users'] = 'المستخدمون';
 $a->strings['User waiting for permanent deletion'] = 'مستخدم ينتظر الحذف الكلي لحسابه';
+$a->strings['Account approved.'] = 'قُبل الحساب.';
+$a->strings['User registrations awaiting review'] = 'تسجيلات تنتظر المعاينة';
 $a->strings['Request date'] = 'تاريخ الطلب';
+$a->strings['No registrations.'] = 'لا توجد تسجيلات.';
 $a->strings['Note from the user'] = 'ملاحظة من المستخدم';
 $a->strings['Deny'] = 'رفض';
+$a->strings['Posts from %s can\'t be shared'] = 'لا تمكن مشاركة مشاركات %s';
+$a->strings['Posts from %s can\'t be unshared'] = 'لا يمكن إلغاء مشاركة مشاركات %s';
 $a->strings['Contact not found'] = 'لم يُعثر على المتراسل';
 $a->strings['Profile not found'] = 'لم يُعثر على الملف الشخصي';
 $a->strings['No installed applications.'] = 'تطبيقات غير مثبتة.';
 $a->strings['Applications'] = 'التطبيقات';
+$a->strings['Item was not found.'] = 'لم يُعثر على العنصر.';
 $a->strings['Please login to continue.'] = 'يرجى الولوج للمتابعة.';
 $a->strings['You don\'t have access to administration pages.'] = 'ليس لديك حق النفاذ لصفحات الإدارة.';
 $a->strings['Overview'] = 'نظرة عامّة';
-$a->strings['Configuration'] = 'تضبيط';
+$a->strings['Configuration'] = 'الضبط';
 $a->strings['Additional features'] = 'ميزات إضافية';
 $a->strings['Database'] = 'قاعدة بيانات';
 $a->strings['DB updates'] = 'تحديثات قاعدة البيانات';
+$a->strings['Inspect Deferred Workers'] = 'فحص المهام المؤجلة';
+$a->strings['Inspect worker Queue'] = 'فحص طابور المهام';
 $a->strings['Tools'] = 'أدوات';
 $a->strings['Contact Blocklist'] = 'قائمة المتراسلين المحظورين';
 $a->strings['Server Blocklist'] = 'قائمة الخوادم المحظورة';
 $a->strings['Diagnostics'] = 'التشخيصات';
 $a->strings['PHP Info'] = 'معلومات الـPHP';
 $a->strings['check webfinger'] = 'تحقق من بصمة الويب';
+$a->strings['ActivityPub Conversion'] = 'محادثة عبر ActivityPub';
 $a->strings['Addon Features'] = 'ميزات الإضافة';
 $a->strings['User registrations waiting for confirmation'] = 'مستخدم ينتظر الموافقة على طلب تسجيله';
+$a->strings['Too Many Requests'] = 'طلبات كثيرة';
 $a->strings['Profile Details'] = 'تفاصيل الملف الشخصي';
 $a->strings['Only You Can See This'] = 'فقط أنت من يمكنه رؤية هذا';
+$a->strings['Scheduled Posts'] = 'المشاركات المبرمجة';
+$a->strings['Posts that are scheduled for publishing'] = 'المشاركات المقرر نشرها';
 $a->strings['Tips for New Members'] = 'تلميحات للأعضاء الجدد';
+$a->strings['People Search - %s'] = 'البحث عن أشخاص - %s';
+$a->strings['Forum Search - %s'] = 'البحث عن منتديات - %s';
 $a->strings['Account'] = 'الحساب';
 $a->strings['Two-factor authentication'] = 'الاستيثاق بعاملَيْن';
 $a->strings['Display'] = 'العرض';
@@ -1319,14 +1578,17 @@ $a->strings['%d contact edited.'] = [
 ];
 $a->strings['Could not access contact record.'] = 'يتعذر الوصل الى سجل التراسل.';
 $a->strings['Failed to update contact record.'] = 'فشل تحديث سجل التراسل.';
+$a->strings['You can\'t block yourself'] = 'لا يمكنك حجب نفسك';
 $a->strings['Contact has been blocked'] = 'حُجب المتراسل';
 $a->strings['Contact has been unblocked'] = 'أُلغي حجب المتراسل';
+$a->strings['You can\'t ignore yourself'] = 'لا يمكنك تجاهل نفسك';
 $a->strings['Contact has been ignored'] = 'تُجوهل المتراسل';
 $a->strings['Contact has been unignored'] = 'ألغي تجاهل المتراسل';
 $a->strings['You are mutual friends with %s'] = 'أنتما صديقان مشتركان لـ %s';
 $a->strings['You are sharing with %s'] = 'أنت تشارك مع %s';
 $a->strings['%s is sharing with you'] = '%s يشارك معك';
-$a->strings['Never'] = 'ابدا';
+$a->strings['Private communications are not available for this contact.'] = 'المراسلات الخاصة غير متوفرة لهذا المتراسل.';
+$a->strings['Never'] = 'أبدا';
 $a->strings['(Update was not successful)'] = '(لم ينجح التحديث)';
 $a->strings['(Update was successful)'] = '(حُدث بنجاح)';
 $a->strings['Suggest friends'] = 'اقترح أصدقاء';
@@ -1350,45 +1612,57 @@ $a->strings['Update now'] = 'حدّث الآن';
 $a->strings['Unignore'] = 'ألغي التجاهل';
 $a->strings['Currently blocked'] = 'محجوب حاليا';
 $a->strings['Currently ignored'] = 'متجاهَل حاليا';
-$a->strings['Currently archived'] = 'مُأرشف حاليا';
+$a->strings['Currently archived'] = 'مُؤرشف حاليا';
+$a->strings['Awaiting connection acknowledge'] = 'ينتظر قبول الاتصال';
 $a->strings['Hide this contact from others'] = 'اخف هذا المتراسل عن الآخرين';
 $a->strings['Replies/likes to your public posts <strong>may</strong> still be visible'] = '<strong>قد</strong> تبقى الإعجابات/الردود على مشاركاتك مرئية';
-$a->strings['Notification for new posts'] = 'تنبيهات على المشاركات الجديدة';
-$a->strings['Send a notification of every new post of this contact'] = 'أرسل تنبيها لكل مشاركات الجديدة هذا المتراسل';
+$a->strings['Notification for new posts'] = 'تنبيه للمشاركات الجديدة';
+$a->strings['Send a notification of every new post of this contact'] = 'أرسل تنبيها عند نشر هذا المتراسل لمشاركات الجديدة';
+$a->strings['Keyword Deny List'] = 'قائمة الكلمات المفتاحية المرفوضة';
+$a->strings['Comma separated list of keywords that should not be converted to hashtags, when "Fetch information and keywords" is selected'] = 'قائمة بالكلمات المفتاحية مفصولة بفواصل والتي لا تخول الى وسوم عند اختيار "اجلب المعلومات والكلمات المفتاحية"';
 $a->strings['Actions'] = 'الإجراءات';
+$a->strings['Mark this contact as remote_self, this will cause friendica to repost new entries from this contact.'] = 'علّم هذا المتراسل على أنه remote_self ، سيقوم فرنديكا بإعادة نشر المدخلات الجديدة لهذا المتراسل.';
 $a->strings['Show all contacts'] = 'أظهِر كل المتراسلين';
 $a->strings['Only show pending contacts'] = 'أظهِر المتراسلين المعلقين';
 $a->strings['Only show blocked contacts'] = 'أظهِر المتراسلين المحجوبين فقط';
 $a->strings['Ignored'] = 'مُتجاهَل';
 $a->strings['Only show ignored contacts'] = 'أظهِر المتراسلين المتجاهلين فقط';
 $a->strings['Archived'] = 'مؤرشف';
-$a->strings['Only show archived contacts'] = 'أظهِر المتراسلين المأرشفين فقط';
+$a->strings['Only show archived contacts'] = 'أظهِر المتراسلين المؤرشفين فقط';
 $a->strings['Hidden'] = '‮مخفي';
 $a->strings['Only show hidden contacts'] = 'أظهِر المتراسلين المخفيين فقط';
 $a->strings['Organize your contact groups'] = 'نظّم مجموعات متراسليك';
 $a->strings['Search your contacts'] = 'ابحث في متراسليك';
 $a->strings['Results for: %s'] = 'نتائج: %s';
 $a->strings['Update'] = 'حدّث';
+$a->strings['Batch Actions'] = 'إجراءات متعددة';
 $a->strings['Conversations started by this contact'] = 'بدأ هذا المتراسل للمحادثة';
 $a->strings['Posts and Comments'] = 'التعليقات والمشاركات';
+$a->strings['Posts containing media objects'] = 'مشاركات تحوي وسائط';
 $a->strings['View all known contacts'] = 'أظهِر كل المتراسلين المعروفين';
 $a->strings['Advanced Contact Settings'] = 'إعدادات المتراسلين المُتقدّمة';
-$a->strings['Mutual Friendship'] = 'الصداقة المشتركة';
+$a->strings['Mutual Friendship'] = 'صداقة متبادلة';
 $a->strings['is a fan of yours'] = 'أحد معجبيك';
-$a->strings['you are a fan of'] = 'أنت أحد معجبي';
-$a->strings['Pending outgoing contact request'] = 'الطلبات الصادرة و المعلقة للتراسل';
-$a->strings['Pending incoming contact request'] = 'الطلبات الواردة و المعلقة للتراسل';
+$a->strings['you are a fan of'] = 'أنت معجب';
+$a->strings['Pending outgoing contact request'] = 'طلب تراسل صادر معلق';
+$a->strings['Pending incoming contact request'] = 'طلب تراسل وارد معلق';
 $a->strings['Refetch contact data'] = 'أعد جلب بيانات المتراسل';
+$a->strings['Toggle Blocked status'] = 'بدّل حالة الحجب';
+$a->strings['Toggle Ignored status'] = 'بدّل حالة التجاهل';
+$a->strings['Revoke Follow'] = 'أبطل المتابعة';
+$a->strings['Revoke the follow from this contact'] = 'أبطل المتابعة من هذا المتراسل';
 $a->strings['Contact update failed.'] = 'فشل تحديث المتراسل.';
 $a->strings['<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.'] = '<strong>تحذير: هذا الخيار متقدم</strong> وإن أخطأت إدخال المعلومات لن تتمكن من التواصل مع هذا المتراسل.';
 $a->strings['Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.'] = 'رجاء استخدم زر \'رجوع\' من المتصفح <strong>الآن</strong> إذا كنت لا تعلم مهية الصفحة.';
 $a->strings['Account Nickname'] = 'لقب الحساب';
 $a->strings['Account URL'] = 'رابط الحساب';
+$a->strings['Account URL Alias'] = 'الرابط البديل للحساب';
 $a->strings['Friend Request URL'] = 'رابط دعوة صديق';
 $a->strings['Friend Confirm URL'] = 'رابط تأكيد صديق';
 $a->strings['Poll/Feed URL'] = 'رابط استطلاع/تغذية';
 $a->strings['New photo from this URL'] = 'صورة من هذا الرابط';
 $a->strings['Invalid contact.'] = 'متراسل غير صالح.';
+$a->strings['No known contacts.'] = 'لا يوجد متراسل معروف.';
 $a->strings['No common contacts.'] = 'لا متراسلين مشترَكين.';
 $a->strings['Follower (%s)'] = [
 	0 => 'لا متابِعين (%s)',
@@ -1414,6 +1688,7 @@ $a->strings['Mutual friend (%s)'] = [
 	4 => '%s صديقا مشتركا',
 	5 => '%s صديق مشترك',
 ];
+$a->strings['These contacts both follow and are followed by <strong>%s</strong>.'] = 'هؤلاء المتراسلون يتابعون <strong>%s</strong> وهو يتابعهم.';
 $a->strings['Common contact (%s)'] = [
 	0 => 'لا متراسلين مشتركين (%s)',
 	1 => 'متراسل مشترك واحد (%s)',
@@ -1422,6 +1697,7 @@ $a->strings['Common contact (%s)'] = [
 	4 => '%s متراسلا مشتركا',
 	5 => '%s متراسل مشترك',
 ];
+$a->strings['Both <strong>%s</strong> and yourself have publicly interacted with these contacts (follow, comment or likes on public posts).'] = 'أنت و <strong>%s</strong> تفاعلتم مع نفس المتراسلين (متابعة، تعليق، إعجاب بمشاركة).';
 $a->strings['Contact (%s)'] = [
 	0 => 'لا متراسلين (%s)',
 	1 => 'متراسل واحد (%s)',
@@ -1430,12 +1706,21 @@ $a->strings['Contact (%s)'] = [
 	4 => '%s متراسلا',
 	5 => '%s متراسل',
 ];
+$a->strings['You must be logged in to use this module.'] = 'يجب عليك الولوج لاستخدام هذه الوحدة.';
+$a->strings['Choose what you wish to do to recipient'] = 'اختر ما تريد فعله للمتلقي';
+$a->strings['Make this post private'] = 'اجعل هذه المشاركة خاصة';
+$a->strings['Unknown contact.'] = 'متراسل مجهول.';
 $a->strings['Contact is deleted.'] = 'حُذف المتراسل.';
+$a->strings['Contact is being deleted.'] = 'المتراسل يحذف.';
+$a->strings['Follow was successfully revoked.'] = 'نجح إبطال المتابعة.';
+$a->strings['Follow was successfully revoked, however the remote contact won\'t be aware of this revokation.'] = 'نجح إبطال المتابعة ولن يعلم بها المتراسل البعيد.';
+$a->strings['Unable to revoke follow, please try again later or contact the administrator.'] = 'يتعذر إبطال متابعة هذا المتراسل، يرجى إعادة المحاولة بعد بضع دقائق أو الاتصال بمدير الموقع.';
 $a->strings['Yes'] = 'نعم';
 $a->strings['Local Community'] = 'مجتمع محلي';
 $a->strings['Posts from local users on this server'] = 'مشاركات مستخدمي هذا الخادم';
 $a->strings['Global Community'] = 'مجتمع عالمي';
-$a->strings['Posts from users of the whole federated network'] = 'المشركات العامومية من الشبكة الموحدة';
+$a->strings['Posts from users of the whole federated network'] = 'مشركات من الشبكة الموحدة';
+$a->strings['Own Contacts'] = 'مشاركات متراسليك';
 $a->strings['Include'] = 'تضمين';
 $a->strings['Hide'] = 'اخف';
 $a->strings['No results.'] = 'لا نتائج.';
@@ -1447,6 +1732,7 @@ $a->strings['Sort by latest activity'] = 'رتب حسب آخر نشاط';
 $a->strings['Latest Posts'] = 'آخر المشاركات';
 $a->strings['Sort by post received date'] = 'رتب حسب تاريخ استلام المشاركة';
 $a->strings['Personal'] = 'شخصي';
+$a->strings['Posts that mention or involve you'] = 'المشاركات التي تذكرك أو تتعلق بك';
 $a->strings['Starred'] = 'المفضلة';
 $a->strings['Favourite Posts'] = 'المشاركات المفضلة';
 $a->strings['Credits'] = 'إشادات';
@@ -1454,6 +1740,8 @@ $a->strings['Friendica is a community project, that would not be possible withou
 $a->strings['Formatted'] = 'مهيأ';
 $a->strings['Activity'] = 'النشاط';
 $a->strings['Object data'] = 'بيانات الكائن';
+$a->strings['Result Item'] = 'النتيجة';
+$a->strings['Source activity'] = 'نشاط المصدر';
 $a->strings['Source input'] = 'الدخل المصدري';
 $a->strings['BBCode::toPlaintext'] = 'BBCode::toPlaintext';
 $a->strings['BBCode::convert (raw HTML)'] = 'BBCode::convert (raw HTML)';
@@ -1497,17 +1785,24 @@ $a->strings['Current timezone: %s'] = 'المنطقة الزمنية الحال
 $a->strings['Converted localtime: %s'] = 'الوقت المحلي المحوّل: %s';
 $a->strings['Please select your timezone:'] = 'رجاء اختر منطقتك الزمنية:';
 $a->strings['No entries (some entries may be hidden).'] = 'لا توجد مدخلات (قد تكون بعض المدخلات مخفية).';
-$a->strings['Find on this site'] = 'تجد في هذا الموقع';
-$a->strings['Results for:'] = 'النتائج عن:';
+$a->strings['Find on this site'] = 'ابحث في هذا الموقع';
+$a->strings['Results for:'] = 'نتائج:';
+$a->strings['Site Directory'] = 'دليل الموقع';
 $a->strings['Item was not removed'] = 'لم يُزل العنصر';
 $a->strings['Item was not deleted'] = 'لم يُحذف العنصر';
 $a->strings['- select -'] = '- اختر -';
 $a->strings['Suggested contact not found.'] = 'المتراسل المقترح غير موجود.';
-$a->strings['Friend suggestion sent.'] = 'أُرسل إقتراح لصديق.';
+$a->strings['Friend suggestion sent.'] = 'أُرسل إقتراح الصداقة.';
 $a->strings['Suggest Friends'] = 'اقترح أصدقاء';
 $a->strings['Suggest a friend for %s'] = 'أقترح أصدقاء لـ %s';
+$a->strings['Installed addons/apps:'] = 'التطبيقات/الإضافات المثبتة:';
+$a->strings['No installed addons/apps'] = 'لم تُثبت أي تطبيقات/إضافات';
+$a->strings['Read about the <a href="%1$s/tos">Terms of Service</a> of this node.'] = 'اقرأ عن <a href="%1$s/tos">شروط الخدمة</a> لهذه العقدة.';
+$a->strings['On this server the following remote servers are blocked.'] = 'الخوادم البعيدة المحجوبة عن هذا الموقع.';
 $a->strings['This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s.'] = 'هذا فرانديكا اصدار %s يعمل على موقع %s. اصدار قاعدة البيانات هو %s، واصدار تحديث المشاركة هو %s.';
 $a->strings['Please visit <a href="https://friendi.ca">Friendi.ca</a> to learn more about the Friendica project.'] = 'رجاء زر <a href="https://friendi.ca">Friendi.ca</a> لمعرفة المزيد عن مشروع فرَندِكا.';
+$a->strings['Bug reports and issues: please visit'] = 'لبلاغات العلل والمشاكل: زر';
+$a->strings['the bugtracker at github'] = 'متعقب العلل على غيت-هب';
 $a->strings['Could not create group.'] = 'تعذّر إنشاء المجموعة.';
 $a->strings['Group not found.'] = 'لم يُعثر على المجموعة.';
 $a->strings['Group name was not changed.'] = 'لم يُغير اسم المجموعة.';
@@ -1528,18 +1823,24 @@ $a->strings['Group is empty'] = 'المجموعة فارغة';
 $a->strings['Remove contact from group'] = 'احذف المتراسل من المجموعة';
 $a->strings['Click on a contact to add or remove.'] = 'أنقر على المتراسل لإضافته أو حذفه.';
 $a->strings['Add contact to group'] = 'أضف المتراسل لمجموعة';
+$a->strings['No profile'] = 'لا ملفًا شخصيًا';
 $a->strings['Method Not Allowed.'] = 'الطريقة غير مسموح بها.';
 $a->strings['Help:'] = 'مساعدة:';
 $a->strings['Welcome to %s'] = 'مرحبًا بك في %s';
+$a->strings['Friendica Communications Server - Setup'] = 'خادم شبكة فرنديكا - تثبيت';
 $a->strings['System check'] = 'التحقق من النظام';
-$a->strings['OK'] = 'OK
-موافقة';
+$a->strings['Requirement not satisfied'] = 'لم يستوف المتطلبات';
+$a->strings['Optional requirement not satisfied'] = 'لم يستوف المتطلبات الاختيارية';
+$a->strings['OK'] = 'موافق';
 $a->strings['Check again'] = 'تحقق مجددا';
 $a->strings['Base settings'] = 'الإعدادات الأساسية';
 $a->strings['Host name'] = 'أسم المضيف';
 $a->strings['Overwrite this field in case the determinated hostname isn\'t right, otherweise leave it as is.'] = 'استبدل هذا الحقل في حالة عدم صحة اسم المضيف المحدد، وإلا تركه كما هو.';
 $a->strings['Base path to installation'] = 'المسار الأساسي للتثبيت';
+$a->strings['Sub path of the URL'] = 'المسار الفرعي للرابط';
 $a->strings['Database connection'] = 'اتصال قاعدة البيانات';
+$a->strings['Please contact your hosting provider or site administrator if you have questions about these settings.'] = 'يرجى الاتصال بموفر الاستضافة أو مدير الموقع إذا كان لديك أسئلة حول هذه الإعدادات.';
+$a->strings['The database you specify below should already exist. If it does not, please create it before continuing.'] = 'قاعدة البيانات التي ستحددها أدناه يجب أن تكون موجودة سلفًا. إذا لم تكن موجودة، أنشئها قبل المتابعة.';
 $a->strings['Database Server Name'] = 'اسم خادم قاعدة البيانات';
 $a->strings['Database Login Name'] = 'اسم الولوج لقاعد البيانات';
 $a->strings['Database Login Password'] = 'كلمة سرّ قاعدة البيانات';
@@ -1548,10 +1849,13 @@ $a->strings['Database Name'] = 'اسم قاعدة البيانات';
 $a->strings['Please select a default timezone for your website'] = 'رجاء حدد اللغة الافتراضية لموقعك';
 $a->strings['Site settings'] = 'إعدادت الموقع';
 $a->strings['Site administrator email address'] = 'البريد الالكتروني للمدير الموقع';
+$a->strings['Your account email address must match this in order to use the web admin panel.'] = 'يجب أن يتطابق عنوان بريدك الإلكتروني مع هذا من أجل استخدام لوحة الإدارة.';
 $a->strings['System Language:'] = 'لغة النظام:';
 $a->strings['Set the default language for your Friendica installation interface and to send emails.'] = 'عيّن اللغة الافتراضية لواجهة تثبيت فرَندِكا ورسائل البريد الإلكتروني.';
 $a->strings['Your Friendica site database has been installed.'] = 'ثُبتت قاعدة بيانات فرنديكا.';
+$a->strings['Installation finished'] = 'انتهى التثبيت';
 $a->strings['<h1>What next</h1>'] = '<h1>ما التالي</h1>';
+$a->strings['Go to your new Friendica node <a href="%s/register">registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.'] = 'انتقل إلى <a href="%s/register">صفحة التسجيل</a> وسجل كمستخدم جديد. تذكر أن تستخدم نفس البريد الإلكتروني الذي أدخلته للمدير. هذا سيسمح لك بالدخول إلى لوحة الإدارة.';
 $a->strings['Total invitation limit exceeded.'] = 'تجاوزت حد عدد الدعوات.';
 $a->strings['%s : Not a valid email address.'] = '%s : عناوين بريد الكتروني غير صالحة.';
 $a->strings['Please join us on Friendica'] = 'انضم إلينا في فرَندِكا';
@@ -1573,7 +1877,12 @@ $a->strings['To accept this invitation, please visit and register at %s.'] = 'ل
 $a->strings['Send invitations'] = 'أرسل دعوات';
 $a->strings['Enter email addresses, one per line:'] = 'أدخل عناوين البريد الإلكتروني ،واحد في كل سطر:';
 $a->strings['For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca'] = 'للحصول على مزيد من المعلومات عن مشروع فرَندِكا ولماذا نرى أنه مهم، من فضلك زر http://friendi.ca';
+$a->strings['Compose new personal note'] = 'أكتب ملاحظة شخصية جديدة';
 $a->strings['Compose new post'] = 'أكتب مشاركة جديدة';
+$a->strings['Visibility'] = 'الظّهور';
+$a->strings['Clear the location'] = 'امسح الموقع الجغرافي';
+$a->strings['Location services are unavailable on your device'] = 'خدمات الموقع الجغرافي غير متاحة على جهازك';
+$a->strings['Unable to follow this item.'] = 'تتعذر متابعة هذا العنصر.';
 $a->strings['System down for maintenance'] = 'النظام مغلق للصيانة';
 $a->strings['A Decentralized Social Network'] = 'شبكة اجتماعية لامركزية';
 $a->strings['Show Ignored Requests'] = 'اظهر الطلبات المتجاهلة';
@@ -1649,6 +1958,10 @@ $a->strings['Profile unavailable.'] = 'الملف الشخصي غير متوفر
 $a->strings['The provided profile link doesn\'t seem to be valid'] = 'يبدو أنّ رابط الملف الشخصي غير صالح';
 $a->strings['Friend/Connection Request'] = 'طلب صداقة/اقتران';
 $a->strings['If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica node and join us today</a>.'] = 'إن لم تكن عضواً في شبكة اجتماعية حرة، <a href="%s">اتبع هذا الرابط للعثور على عقدة عمومية لفرَندِكا وانضم إلينا اليوم</a>.';
+$a->strings['Items tagged with: %s'] = 'عناصر موسمة بـ: %s';
+$a->strings['Search term was not saved.'] = 'لم يُحفظ مصطلح البحث.';
+$a->strings['Search term already saved.'] = 'حُفظ مصطلح البحث سلفًا.';
+$a->strings['Search term was not removed.'] = 'لم يُزل مصطلح البحث.';
 $a->strings['Create a New Account'] = 'أنشئ حسابًا جديدًا';
 $a->strings['Your OpenID: '] = 'معرف OpenID: ';
 $a->strings['Please enter your username and password to add the OpenID to your existing account.'] = 'رجاء أدخل كلمة المرور واسم المستخدم لإضافة معرف OpenID لحسابك.';
@@ -1672,7 +1985,15 @@ $a->strings['Please enter a recovery code'] = 'رجاء أدخل رمز الاس
 $a->strings['Submit recovery code and complete login'] = 'أرسل رمز الاستعادة لتكمل الولوج';
 $a->strings['<p>Open the two-factor authentication app on your device to get an authentication code and verify your identity.</p>'] = '<p>افتح تطبيق الاستيثاق بعاملين على جهازك للحصول على رمز الاستيثاق والتحقق من هويتك.</p>';
 $a->strings['Please enter a code from your authentication app'] = 'يرجى إدخال رمز من تطبيق الاستيثاق';
+$a->strings['This is my two-factor authenticator app device'] = 'هذا هو جهاز الذي استخدمه للاستيثاق بعاملين';
 $a->strings['Verify code and complete login'] = 'تحقق من الرمز وأكمل الولوج';
+$a->strings['Delegation successfully granted.'] = 'منح التفويض بنجاح.';
+$a->strings['Delegation successfully revoked.'] = 'نجح إبطال التفويض.';
+$a->strings['Delegate user not found.'] = 'لم يُعثر على المندوب.';
+$a->strings['No parent user'] = 'لا يوجد وليٌ';
+$a->strings['Parent User'] = 'وليٌ';
+$a->strings['Additional Accounts'] = 'الحسابات الإضافية';
+$a->strings['Register additional accounts that are automatically connected to your existing account so you can manage them from this account.'] = 'سجل حسابات إضافية مرتبطة تلقائيا بحسابك الحالي ويمكنك إدارتها عبر هذا الحساب.';
 $a->strings['Register an additional account'] = 'سجل حساب إضافي';
 $a->strings['Parent users have total control about this account, including the account settings. Please double check whom you give this access.'] = 'المستخدمون الأولياء لديهم سيطرة كاملة على هذا الحساب، بما في ذلك إعدادات الحساب. الرجاء الحذر عند إعطاء صلاحية الوصول إليه.';
 $a->strings['Delegates'] = 'المندوبون';
@@ -1701,6 +2022,8 @@ $a->strings['Infinite scroll'] = 'التمرير اللانهائي';
 $a->strings['Automatic fetch new items when reaching the page end.'] = 'يجلب عناصر جديدة تلقائياً عند الوصول إلى نهاية الصفحة.';
 $a->strings['Display the Dislike feature'] = 'اعرض ميزة "لم يعجبني"';
 $a->strings['Display the Dislike button and dislike reactions on posts and comments.'] = 'يعرض زر لم يعجبني والتفاعلات السلبية في المشاركات والتعليقات.';
+$a->strings['Display the resharer'] = 'اعرض صاحب إعادة النشر';
+$a->strings['Display the first resharer as icon and text on a reshared item.'] = 'اعرض صورة صاحب المشاركة الأصلية كأيقونة بالإضافة إلى نص على المشاركة.';
 $a->strings['Stay local'] = 'ابقى في الخادم المحلي';
 $a->strings['Don\'t go to a remote system when following a contact link.'] = 'لا يذهب إلى نظام بعيد عند اتباع رابط متراسل.';
 $a->strings['Beginning of week:'] = 'بداية الأسبوع:';
@@ -1708,7 +2031,7 @@ $a->strings['Profile Name is required.'] = 'اسم الملف الشخصي مط
 $a->strings['Profile couldn\'t be updated.'] = 'تعذر تحديث الملف الشخصي.';
 $a->strings['Label:'] = 'التسمية:';
 $a->strings['Value:'] = 'القيمة:';
-$a->strings['Field Permissions'] = 'صلاحيات الحقل';
+$a->strings['Field Permissions'] = 'أذونات الحقل';
 $a->strings['(click to open/close)'] = '(أنقر للفتح/للإغلاق)';
 $a->strings['Add a new profile field'] = 'أضف حقلًا جديدًا للملف الشخصي';
 $a->strings['Profile Actions'] = 'إجراءات الملف الشخصي';
@@ -1730,7 +2053,7 @@ $a->strings['The XMPP address will be published so that people can follow you th
 $a->strings['Matrix (Element) address:'] = 'عنوان مايتركس:';
 $a->strings['The Matrix address will be published so that people can follow you there.'] = 'سيتم نشر عنوان مايتركس حتى يتمكن الناس من متابعتك هناك.';
 $a->strings['Homepage URL:'] = 'رابط الصفحة الرئيسية:';
-$a->strings['Public Keywords:'] = 'الكلمات المفتاحية العمومية:';
+$a->strings['Public Keywords:'] = 'الكلمات المفتاحية العلنية:';
 $a->strings['(Used for suggesting potential friends, can be seen by others)'] = '(يستخدم لاقتراح أصدقاء، يمكن للآخرين رؤيتهم)';
 $a->strings['Private Keywords:'] = 'الكلمات المفتاحية الخاصة:';
 $a->strings['(Used for searching profiles, never shown to others)'] = '(يستخدم للبحث عن ملفات الشخصية، لا يظهر للآخرين)';
@@ -1742,7 +2065,7 @@ $a->strings['<p>Custom fields appear on <a href="%s">your profile page</a>.</p>
 				<p>يمكنك استخدام رموز BBCCode في حقول القيم.</p>
 				<p>أعد الترتيب بسحب عنوان الحقل.</p>
 				<p>أفرغ حقل التسمية لإزالة الحقل مخصص.</p>
-				<p>لن يتمكن إلاّ المتراسلين المختارين والمجموعات المختارة من رؤية الحقول غير العامة.</p>';
+				<p>لن يتمكن إلاّ المتراسلين المختارين والمجموعات المختارة من رؤية الحقول غير العلنية.</p>';
 $a->strings['Image size reduction [%s] failed.'] = 'فشل تقليص حجم الصورة [%s].';
 $a->strings['Unable to process image'] = 'تعذرت معالجة الصورة';
 $a->strings['Photo not found.'] = 'لم يُعثر على الصورة.';
@@ -1850,11 +2173,65 @@ $a->strings['%1$s commented in your thread %2$s'] = 'علق %1$s على نقاش
 $a->strings['%1$s commented on your comment %2$s'] = 'علق %1$s على تعليقك %2$s';
 $a->strings['%1$s commented in their thread %2$s'] = 'علق %1$s على نقاشهم %2$s';
 $a->strings['%1$s commented in their thread'] = 'علق %1$s على نقاشهم';
+$a->strings['%1$s commented in the thread %2$s from %3$s'] = 'علق %1$s على المحدثة %2$s من %3$s';
 $a->strings['%1$s commented in the thread from %3$s'] = 'علق %1$s على نقاش %3$s';
 $a->strings['%1$s commented on your thread %2$s'] = 'علق %1$s على نقاشك %2$s';
+$a->strings['%1$s shared the post %2$s from %3$s'] = 'شارك %1$s المشاركة %2$s من %3$s';
 $a->strings['%1$s shared a post from %3$s'] = 'شارك %1$s مشاركة %3$s';
 $a->strings['%1$s shared the post %2$s'] = 'شارك %1$s المشاركة %2$s';
 $a->strings['%1$s shared a post'] = 'شارك %1$s مشاركة';
+$a->strings['[Friendica:Notify]'] = '[Friendica:Notify]';
+$a->strings['%s New mail received at %s'] = 'أُستلم %s بريد جديد على %s';
+$a->strings['%1$s sent you a new private message at %2$s.'] = 'أرسل %1$s لك رسالة خاصة على %2$s.';
+$a->strings['a private message'] = 'رسالة خاصة';
+$a->strings['%1$s sent you %2$s.'] = 'أرسل %1$s لك %2$s.';
+$a->strings['Please visit %s to view and/or reply to your private messages.'] = 'من فضلك زر %s لعرض و/أو الرد على الرسائل الخاصة.';
+$a->strings['%1$s commented on %2$s\'s %3$s %4$s'] = 'علق %1$s على %3$s %2$s %4$s';
+$a->strings['%1$s commented on your %2$s %3$s'] = 'علق %1$s على %2$s تخصك %3$s';
+$a->strings['%1$s commented on their %2$s %3$s'] = 'علق %1$s على %2$s له %3$s';
+$a->strings['%1$s Comment to conversation #%2$d by %3$s'] = 'علق %1$s على محادثة %3$s #%2$d';
+$a->strings['%s commented on an item/conversation you have been following.'] = 'علق %s على محادثة/عنصر تتابعه.';
+$a->strings['Please visit %s to view and/or reply to the conversation.'] = 'من فضلك زر %s لعرض و/أو الرد على المحادثة.';
+$a->strings['%s %s posted to your profile wall'] = 'نشر %s%s على حائط ملفك الشخصي';
+$a->strings['%1$s posted to your profile wall at %2$s'] = 'نشر %1$s على حائط ملفك الشخصي على %2$s';
+$a->strings['%1$s posted to [url=%2$s]your wall[/url]'] = 'نشر %1$s على [url=%2$s]حائطك[/url]';
+$a->strings['%1$s %2$s poked you'] = 'لكزك %1$s %2$s';
+$a->strings['%1$s poked you at %2$s'] = 'لكزك %1$s على %2$s';
+$a->strings['%1$s [url=%2$s]poked you[/url].'] = '[url=%2$s]لكزك[/url] %1$s.';
+$a->strings['%s Introduction received'] = 'تلقيت تقديما من %s';
+$a->strings['You\'ve received an introduction from \'%1$s\' at %2$s'] = 'تلقيت تقديما من \'%1$s\' على %2$s';
+$a->strings['You\'ve received [url=%1$s]an introduction[/url] from %2$s.'] = 'تلقيت [url=%1$s]تقديما[/url] من %2$s.';
+$a->strings['You may visit their profile at %s'] = 'يمكنك زيارة ملفهم الشخصي على %s';
+$a->strings['Please visit %s to approve or reject the introduction.'] = 'من فضلك زر %s لقبول أو رفض التقديم.';
+$a->strings['%s A new person is sharing with you'] = '%s شخص جديد يشارك معك';
+$a->strings['%1$s is sharing with you at %2$s'] = 'يشارك %1$s معك على %2$s';
+$a->strings['%s You have a new follower'] = 'لديك متابِع جديد %s';
+$a->strings['You have a new follower at %2$s : %1$s'] = 'لديك متابِع جديد على %2$s : %1$s';
+$a->strings['%s Friend suggestion received'] = 'تلقيت إقتراح صديق %s';
+$a->strings['You\'ve received a friend suggestion from \'%1$s\' at %2$s'] = 'تلقيت اقتراح صديق من \'%1$s\' على %2$s';
+$a->strings['You\'ve received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s.'] = ' تلقيت [url=%1$s]اقتراح %2$s كصديق[/url] من %3$s.';
+$a->strings['Name:'] = 'الاسم:';
+$a->strings['Photo:'] = 'الصورة:';
+$a->strings['Please visit %s to approve or reject the suggestion.'] = 'من فضلك زر %s لقبول  أو رفض الاقتراح.';
+$a->strings['%s Connection accepted'] = 'قُبِل الاقتران %s';
+$a->strings['\'%1$s\' has accepted your connection request at %2$s'] = 'قبِل \'%1$s\' طلب الاقتران على %2$s';
+$a->strings['%2$s has accepted your [url=%1$s]connection request[/url].'] = 'قبِل %2$s [url=%1$s]طلب الاقتران[/url]';
+$a->strings['You are now mutual friends and may exchange status updates, photos, and email without restriction.'] = 'أصبحتما صديقين من كلا الطرفين ويمكنكما تبادل تحديثات الحالة، والصور، والبريد دون قيود.';
+$a->strings['Please visit %s if you wish to make any changes to this relationship.'] = 'من فضلك زر %s إن أردت تغيير هذه العلاقة.';
+$a->strings['\'%1$s\' has chosen to accept you a fan, which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically.'] = 'قبِلك \'%1$s\' كمعجب، هذا يحدُّ من أشكال التواصل بينكما مثل الرسائل الخاصة وبعض التفاعلات. يتم هذا تلقائيا اذا كانت صفحة مشهور أو مجتمع.';
+$a->strings['\'%1$s\' may choose to extend this into a two-way or more permissive relationship in the future.'] = 'قد يختار \'%1$s\' توسيعها إلى علاقة ذات اتجاهين أو أكثر في المستقبل.';
+$a->strings['Please visit %s  if you wish to make any changes to this relationship.'] = 'من فضلك زر %s إن أردت تغيير هذه العلاقة.';
+$a->strings['registration request'] = 'طلب تسجيل';
+$a->strings['You\'ve received a registration request from \'%1$s\' at %2$s'] = 'تلقيت طلب تسجيل من \'%1$s\' على %2$s';
+$a->strings['You\'ve received a [url=%1$s]registration request[/url] from %2$s.'] = 'تلقيت [url=%1$s]طلب تسجيل[/url] من %2$s.';
+$a->strings['Full Name:	%s
+Site Location:	%s
+Login Name:	%s (%s)'] = 'الاسم الكامل:	%s
+الموقع:	%s
+اسم الولوج:	%s (%s)';
+$a->strings['Please visit %s to approve or reject the request.'] = 'من فضلك زر %s لقبول أو رفض الطلب.';
+$a->strings['%s %s tagged you'] = 'ذكرك %s%s';
+$a->strings['%s %s shared a new post'] = 'شارك %s%s مشاركة جديدة';
 $a->strings['This message was sent to you by %s, a member of the Friendica social network.'] = 'أرسل %s لك هذه الرسالة، وهو عضو في شبكة فرنديكا.';
 $a->strings['You may visit them online at %s'] = 'يمكنك زيارتهم عبر %s';
 $a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'رجاء اتصل بالمرسل بالرد على هذا المشاركة إذا كنت لا ترغب في تلقي هذه الرسائل.';
@@ -1881,8 +2258,9 @@ $a->strings['Unpin'] = 'ألغ التثبيت';
 $a->strings['Toggle pin status'] = 'بدِّل حالة التثبيت';
 $a->strings['Pinned'] = 'مُثَبَت';
 $a->strings['Add tag'] = 'أضف وسما';
-$a->strings['Quote Share'] = 'مشاركة الاقتباس';
-$a->strings['Reshare this'] = 'شارك هذا';
+$a->strings['Quote share this'] = 'اقتبس وشارك';
+$a->strings['Quote Share'] = 'اقتبس وشارك';
+$a->strings['Reshare this'] = 'أعاد نشر هذا';
 $a->strings['Reshare'] = 'أُعد نشره';
 $a->strings['Cancel your Reshare'] = 'ألغ إعادة النشر';
 $a->strings['Unshare'] = 'ألغ النشر';
@@ -1897,6 +2275,7 @@ $a->strings['Wall-to-Wall'] = 'حائط لحائط';
 $a->strings['via Wall-To-Wall:'] = 'عير حائط لحائط';
 $a->strings['Reply to %s'] = 'رد على %s';
 $a->strings['More'] = 'المزيد';
+$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'] = 'التسليم إلى الخوادم البعيدة يكاد يكتمل';
@@ -1957,7 +2336,7 @@ $a->strings['Light (Accented)'] = 'فاتح (ذو طابع لوني)';
 $a->strings['Dark (Accented)'] = 'داكن (ذو طابع لوني)';
 $a->strings['Black (Accented)'] = 'أسود (ذو طابع لوني)';
 $a->strings['Note'] = 'ملاحظة';
-$a->strings['Check image permissions if all users are allowed to see the image'] = 'تحقق من أذون الصورة إذا كان مسموح للجميع مشاهدتها';
+$a->strings['Check image permissions if all users are allowed to see the image'] = 'تحقق من أذونات الصورة إذا كان مسموح للجميع مشاهدتها';
 $a->strings['Custom'] = 'مخصص';
 $a->strings['Legacy'] = 'أثري';
 $a->strings['Accented'] = 'ذو طابع لوني';
diff --git a/view/lang/de/messages.po b/view/lang/de/messages.po
index 94d71c8e4..8ad5bb751 100644
--- a/view/lang/de/messages.po
+++ b/view/lang/de/messages.po
@@ -49,8 +49,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-20 15:10+0200\n"
-"PO-Revision-Date: 2021-10-21 05:35+0000\n"
+"POT-Creation-Date: 2021-10-23 21:51-0400\n"
+"PO-Revision-Date: 2021-10-24 13:04+0000\n"
 "Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
 "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -93,10 +93,10 @@ msgstr "Das monatliche Limit von %d Beiträgen wurde erreicht. Der Beitrag wurde
 #: src/Module/BaseApi.php:97 src/Module/BaseApi.php:106
 #: src/Module/BaseNotifications.php:88 src/Module/Contact.php:328
 #: src/Module/Contact/Advanced.php:44 src/Module/Delegation.php:118
-#: src/Module/FollowConfirm.php:16 src/Module/FriendSuggest.php:44
+#: src/Module/FollowConfirm.php:17 src/Module/FriendSuggest.php:44
 #: src/Module/Group.php:45 src/Module/Group.php:90 src/Module/Invite.php:41
-#: src/Module/Invite.php:130 src/Module/Notifications/Notification.php:47
-#: src/Module/Notifications/Notification.php:76
+#: src/Module/Invite.php:130 src/Module/Notifications/Notification.php:48
+#: src/Module/Notifications/Notification.php:79
 #: src/Module/Profile/Common.php:56 src/Module/Profile/Contacts.php:56
 #: src/Module/Profile/Schedule.php:39 src/Module/Profile/Schedule.php:56
 #: src/Module/Register.php:64 src/Module/Register.php:77
@@ -104,7 +104,7 @@ msgstr "Das monatliche Limit von %d Beiträgen wurde erreicht. Der Beitrag wurde
 #: src/Module/Search/Directory.php:38 src/Module/Settings/Delegation.php:42
 #: src/Module/Settings/Delegation.php:70 src/Module/Settings/Display.php:43
 #: src/Module/Settings/Display.php:121
-#: src/Module/Settings/Profile/Photo/Crop.php:164
+#: src/Module/Settings/Profile/Photo/Crop.php:166
 #: src/Module/Settings/Profile/Photo/Index.php:112
 #: src/Module/Settings/UserExport.php:58 src/Module/Settings/UserExport.php:93
 #: src/Module/Settings/UserExport.php:198
@@ -407,7 +407,7 @@ msgid "Event Finishes:"
 msgstr "Veranstaltungsende:"
 
 #: mod/events.php:506 src/Module/Profile/Profile.php:172
-#: src/Module/Settings/Profile/Index.php:237
+#: src/Module/Settings/Profile/Index.php:239
 msgid "Description:"
 msgstr "Beschreibung"
 
@@ -435,11 +435,11 @@ msgstr "Veranstaltung teilen"
 #: src/Module/Debug/ActivityPubConversion.php:141
 #: src/Module/Debug/Babel.php:313 src/Module/Debug/Localtime.php:64
 #: src/Module/Debug/Probe.php:56 src/Module/Debug/WebFinger.php:53
-#: src/Module/Delegation.php:147 src/Module/FriendSuggest.php:129
+#: src/Module/Delegation.php:147 src/Module/FriendSuggest.php:128
 #: src/Module/Install.php:245 src/Module/Install.php:287
 #: src/Module/Install.php:324 src/Module/Invite.php:177
 #: src/Module/Item/Compose.php:150 src/Module/Profile/Profile.php:247
-#: src/Module/Settings/Profile/Index.php:221 src/Object/Post.php:963
+#: src/Module/Settings/Profile/Index.php:223 src/Object/Post.php:963
 #: view/theme/duepuntozero/config.php:69 view/theme/frio/config.php:160
 #: view/theme/quattro/config.php:71 view/theme/vier/config.php:119
 msgid "Submit"
@@ -449,7 +449,7 @@ msgstr "Senden"
 msgid "Basic"
 msgstr "Allgemein"
 
-#: mod/events.php:521 src/Module/Admin/Site.php:505 src/Module/Contact.php:863
+#: mod/events.php:521 src/Module/Admin/Site.php:507 src/Module/Contact.php:863
 #: src/Module/Profile/Profile.php:249
 msgid "Advanced"
 msgstr "Erweitert"
@@ -493,7 +493,7 @@ msgid "OStatus support is disabled. Contact can't be added."
 msgstr "OStatus-Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."
 
 #: mod/follow.php:138 src/Content/Item.php:463 src/Content/Widget.php:76
-#: src/Model/Contact.php:1071 src/Model/Contact.php:1083
+#: src/Model/Contact.php:1072 src/Model/Contact.php:1084
 #: view/theme/vier/theme.php:172
 msgid "Connect/Follow"
 msgstr "Verbinden/Folgen"
@@ -731,7 +731,7 @@ msgstr "Konnte Nachrichten nicht abrufen."
 
 #: mod/message.php:120 src/Module/Notifications/Introductions.php:113
 #: src/Module/Notifications/Introductions.php:148
-#: src/Module/Notifications/Notification.php:56
+#: src/Module/Notifications/Notification.php:57
 msgid "Discard"
 msgstr "Verwerfen"
 
@@ -1154,11 +1154,11 @@ msgstr "Ungültige Anfrage."
 #: mod/redir.php:55 mod/redir.php:129 src/Module/Contact/Advanced.php:54
 #: src/Module/Contact/Advanced.php:105 src/Module/Contact/Contacts.php:36
 #: src/Module/Contact/Media.php:43 src/Module/FriendSuggest.php:54
-#: src/Module/FriendSuggest.php:93 src/Module/Group.php:105
+#: src/Module/FriendSuggest.php:92 src/Module/Group.php:105
 msgid "Contact not found."
 msgstr "Kontakt nicht gefunden."
 
-#: mod/removeme.php:63 src/Navigation/Notifications/Depository/Notify.php:454
+#: mod/removeme.php:63 src/Navigation/Notifications/Repository/Notify.php:454
 msgid "[Friendica System Notify]"
 msgstr "[Friendica-Systembenachrichtigung]"
 
@@ -1305,7 +1305,7 @@ msgstr "Zusätzliche Features"
 
 #: mod/settings.php:474 mod/settings.php:565 mod/settings.php:702
 #: src/Module/Admin/Addons/Index.php:69 src/Module/Admin/Features.php:87
-#: src/Module/Admin/Logs/Settings.php:82 src/Module/Admin/Site.php:500
+#: src/Module/Admin/Logs/Settings.php:82 src/Module/Admin/Site.php:502
 #: src/Module/Admin/Themes/Index.php:113 src/Module/Admin/Tos.php:66
 #: src/Module/Settings/Delegation.php:170 src/Module/Settings/Display.php:194
 msgid "Save Settings"
@@ -2171,8 +2171,8 @@ msgid "All contacts"
 msgstr "Alle Kontakte"
 
 #: src/BaseModule.php:212 src/Content/Widget.php:231 src/Core/ACL.php:193
-#: src/Module/Contact.php:756 src/Module/PermissionTooltip.php:75
-#: src/Module/PermissionTooltip.php:97
+#: src/Module/Contact.php:756 src/Module/PermissionTooltip.php:79
+#: src/Module/PermissionTooltip.php:101
 msgid "Followers"
 msgstr "Folgende"
 
@@ -2780,32 +2780,32 @@ msgstr "Veranstaltung"
 msgid "Follow Thread"
 msgstr "Folge der Unterhaltung"
 
-#: src/Content/Item.php:443 src/Model/Contact.php:1076
+#: src/Content/Item.php:443 src/Model/Contact.php:1077
 msgid "View Status"
 msgstr "Status anschauen"
 
 #: src/Content/Item.php:444 src/Content/Item.php:466
-#: src/Model/Contact.php:1010 src/Model/Contact.php:1068
-#: src/Model/Contact.php:1077 src/Module/Directory.php:160
-#: src/Module/Settings/Profile/Index.php:224
+#: src/Model/Contact.php:1011 src/Model/Contact.php:1069
+#: src/Model/Contact.php:1078 src/Module/Directory.php:160
+#: src/Module/Settings/Profile/Index.php:226
 msgid "View Profile"
 msgstr "Profil anschauen"
 
-#: src/Content/Item.php:445 src/Model/Contact.php:1078
+#: src/Content/Item.php:445 src/Model/Contact.php:1079
 msgid "View Photos"
 msgstr "Bilder anschauen"
 
-#: src/Content/Item.php:446 src/Model/Contact.php:1069
-#: src/Model/Contact.php:1079
+#: src/Content/Item.php:446 src/Model/Contact.php:1070
+#: src/Model/Contact.php:1080
 msgid "Network Posts"
 msgstr "Netzwerkbeiträge"
 
-#: src/Content/Item.php:447 src/Model/Contact.php:1070
-#: src/Model/Contact.php:1080
+#: src/Content/Item.php:447 src/Model/Contact.php:1071
+#: src/Model/Contact.php:1081
 msgid "View Contact"
 msgstr "Kontakt anzeigen"
 
-#: src/Content/Item.php:448 src/Model/Contact.php:1081
+#: src/Content/Item.php:448 src/Model/Contact.php:1082
 msgid "Send PM"
 msgstr "Private Nachricht senden"
 
@@ -2820,7 +2820,7 @@ msgstr "Sperren"
 #: src/Module/Contact.php:788 src/Module/Contact.php:1072
 #: src/Module/Notifications/Introductions.php:112
 #: src/Module/Notifications/Introductions.php:184
-#: src/Module/Notifications/Notification.php:59
+#: src/Module/Notifications/Notification.php:61
 msgid "Ignore"
 msgstr "Ignorieren"
 
@@ -2828,7 +2828,7 @@ msgstr "Ignorieren"
 msgid "Languages"
 msgstr "Sprachen"
 
-#: src/Content/Item.php:458 src/Model/Contact.php:1082
+#: src/Content/Item.php:458 src/Model/Contact.php:1083
 msgid "Poke"
 msgstr "Anstupsen"
 
@@ -3279,7 +3279,7 @@ msgstr "Personen"
 msgid "Organisations"
 msgstr "Organisationen"
 
-#: src/Content/Widget.php:522 src/Model/Contact.php:1503
+#: src/Content/Widget.php:522 src/Model/Contact.php:1506
 msgid "News"
 msgstr "Nachrichten"
 
@@ -3356,8 +3356,8 @@ msgstr "Entfolgen"
 msgid "Yourself"
 msgstr "Du selbst"
 
-#: src/Core/ACL.php:200 src/Module/PermissionTooltip.php:81
-#: src/Module/PermissionTooltip.php:103
+#: src/Core/ACL.php:200 src/Module/PermissionTooltip.php:85
+#: src/Module/PermissionTooltip.php:107
 msgid "Mutuals"
 msgstr "Beidseitige Freundschaft"
 
@@ -4090,81 +4090,81 @@ msgstr "Interner Serverfehler"
 msgid "Legacy module file not found: %s"
 msgstr "Legacy-Moduldatei nicht gefunden: %s"
 
-#: src/Model/Contact.php:1072 src/Model/Contact.php:1084
+#: src/Model/Contact.php:1073 src/Model/Contact.php:1085
 msgid "UnFollow"
 msgstr "Entfolgen"
 
-#: src/Model/Contact.php:1090 src/Module/Admin/Users/Pending.php:107
+#: src/Model/Contact.php:1091 src/Module/Admin/Users/Pending.php:107
 #: src/Module/Notifications/Introductions.php:110
 #: src/Module/Notifications/Introductions.php:182
 msgid "Approve"
 msgstr "Genehmigen"
 
-#: src/Model/Contact.php:1499
+#: src/Model/Contact.php:1502
 msgid "Organisation"
 msgstr "Organisation"
 
-#: src/Model/Contact.php:1507
+#: src/Model/Contact.php:1510
 msgid "Forum"
 msgstr "Forum"
 
-#: src/Model/Contact.php:2366
+#: src/Model/Contact.php:2380
 msgid "Disallowed profile URL."
 msgstr "Nicht erlaubte Profil-URL."
 
-#: src/Model/Contact.php:2371 src/Module/Friendica.php:81
+#: src/Model/Contact.php:2385 src/Module/Friendica.php:81
 msgid "Blocked domain"
 msgstr "Blockierte Domain"
 
-#: src/Model/Contact.php:2376
+#: src/Model/Contact.php:2390
 msgid "Connect URL missing."
 msgstr "Connect-URL fehlt"
 
-#: src/Model/Contact.php:2385
+#: src/Model/Contact.php:2399
 msgid ""
 "The contact could not be added. Please check the relevant network "
 "credentials in your Settings -> Social Networks page."
 msgstr "Der Kontakt konnte nicht hinzugefügt werden. Bitte überprüfe die Einstellungen unter Einstellungen -> Soziale Netzwerke"
 
-#: src/Model/Contact.php:2422
+#: src/Model/Contact.php:2436
 msgid "The profile address specified does not provide adequate information."
 msgstr "Die angegebene Profiladresse liefert unzureichende Informationen."
 
-#: src/Model/Contact.php:2424
+#: src/Model/Contact.php:2438
 msgid "No compatible communication protocols or feeds were discovered."
 msgstr "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden."
 
-#: src/Model/Contact.php:2427
+#: src/Model/Contact.php:2441
 msgid "An author or name was not found."
 msgstr "Es wurde kein Autor oder Name gefunden."
 
-#: src/Model/Contact.php:2430
+#: src/Model/Contact.php:2444
 msgid "No browser URL could be matched to this address."
 msgstr "Zu dieser Adresse konnte keine passende Browser-URL gefunden werden."
 
-#: src/Model/Contact.php:2433
+#: src/Model/Contact.php:2447
 msgid ""
 "Unable to match @-style Identity Address with a known protocol or email "
 "contact."
 msgstr "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen."
 
-#: src/Model/Contact.php:2434
+#: src/Model/Contact.php:2448
 msgid "Use mailto: in front of address to force email check."
 msgstr "Verwende mailto: vor der E-Mail-Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen."
 
-#: src/Model/Contact.php:2440
+#: src/Model/Contact.php:2454
 msgid ""
 "The profile address specified belongs to a network which has been disabled "
 "on this site."
 msgstr "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde."
 
-#: src/Model/Contact.php:2445
+#: src/Model/Contact.php:2459
 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
 msgstr "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von dir erhalten können."
 
-#: src/Model/Contact.php:2504
+#: src/Model/Contact.php:2518
 msgid "Unable to retrieve contact information."
 msgstr "Konnte die Kontaktinformationen nicht empfangen."
 
@@ -4740,7 +4740,7 @@ msgstr "Einschalten"
 #: src/Module/Admin/Blocklist/Server.php:88
 #: src/Module/Admin/Federation.php:159 src/Module/Admin/Item/Delete.php:65
 #: src/Module/Admin/Logs/Settings.php:80 src/Module/Admin/Logs/View.php:83
-#: src/Module/Admin/Queue.php:72 src/Module/Admin/Site.php:497
+#: src/Module/Admin/Queue.php:72 src/Module/Admin/Site.php:499
 #: src/Module/Admin/Storage.php:139 src/Module/Admin/Summary.php:233
 #: src/Module/Admin/Themes/Details.php:90
 #: src/Module/Admin/Themes/Index.php:111 src/Module/Admin/Tos.php:58
@@ -5372,453 +5372,453 @@ msgstr "Die Basis-URL konnte nicht analysiert werden. Sie muss mindestens aus <p
 msgid "Relocation started. Could take a while to complete."
 msgstr "Verschieben der Daten gestartet. Das kann eine Weile dauern."
 
-#: src/Module/Admin/Site.php:402 src/Module/Settings/Display.php:139
+#: src/Module/Admin/Site.php:404 src/Module/Settings/Display.php:139
 msgid "No special theme for mobile devices"
 msgstr "Kein spezielles Theme für mobile Geräte verwenden."
 
-#: src/Module/Admin/Site.php:419 src/Module/Settings/Display.php:149
+#: src/Module/Admin/Site.php:421 src/Module/Settings/Display.php:149
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (Experimentell)"
 
-#: src/Module/Admin/Site.php:431
+#: src/Module/Admin/Site.php:433
 msgid "No community page for local users"
 msgstr "Keine Gemeinschaftsseite für lokale Nutzer"
 
-#: src/Module/Admin/Site.php:432
+#: src/Module/Admin/Site.php:434
 msgid "No community page"
 msgstr "Keine Gemeinschaftsseite"
 
-#: src/Module/Admin/Site.php:433
+#: src/Module/Admin/Site.php:435
 msgid "Public postings from users of this site"
 msgstr "Öffentliche Beiträge von NutzerInnen dieser Seite"
 
-#: src/Module/Admin/Site.php:434
+#: src/Module/Admin/Site.php:436
 msgid "Public postings from the federated network"
 msgstr "Öffentliche Beiträge aus dem föderalen Netzwerk"
 
-#: src/Module/Admin/Site.php:435
+#: src/Module/Admin/Site.php:437
 msgid "Public postings from local users and the federated network"
 msgstr "Öffentliche Beiträge von lokalen Nutzern und aus dem föderalen Netzwerk"
 
-#: src/Module/Admin/Site.php:441
+#: src/Module/Admin/Site.php:443
 msgid "Multi user instance"
 msgstr "Mehrbenutzer-Instanz"
 
-#: src/Module/Admin/Site.php:468
+#: src/Module/Admin/Site.php:470
 msgid "Closed"
 msgstr "Geschlossen"
 
-#: src/Module/Admin/Site.php:469
+#: src/Module/Admin/Site.php:471
 msgid "Requires approval"
 msgstr "Bedarf der Zustimmung"
 
-#: src/Module/Admin/Site.php:470
+#: src/Module/Admin/Site.php:472
 msgid "Open"
 msgstr "Offen"
 
-#: src/Module/Admin/Site.php:474 src/Module/Install.php:215
+#: src/Module/Admin/Site.php:476 src/Module/Install.php:215
 msgid "No SSL policy, links will track page SSL state"
 msgstr "Keine SSL-Richtlinie, Links werden das verwendete Protokoll beibehalten"
 
-#: src/Module/Admin/Site.php:475 src/Module/Install.php:216
+#: src/Module/Admin/Site.php:477 src/Module/Install.php:216
 msgid "Force all links to use SSL"
 msgstr "SSL für alle Links erzwingen"
 
-#: src/Module/Admin/Site.php:476 src/Module/Install.php:217
+#: src/Module/Admin/Site.php:478 src/Module/Install.php:217
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)"
 
-#: src/Module/Admin/Site.php:480
+#: src/Module/Admin/Site.php:482
 msgid "Don't check"
 msgstr "Nicht überprüfen"
 
-#: src/Module/Admin/Site.php:481
+#: src/Module/Admin/Site.php:483
 msgid "check the stable version"
 msgstr "überprüfe die stabile Version"
 
-#: src/Module/Admin/Site.php:482
+#: src/Module/Admin/Site.php:484
 msgid "check the development version"
 msgstr "überprüfe die Entwicklungsversion"
 
-#: src/Module/Admin/Site.php:486
+#: src/Module/Admin/Site.php:488
 msgid "none"
 msgstr "keine"
 
-#: src/Module/Admin/Site.php:487
+#: src/Module/Admin/Site.php:489
 msgid "Local contacts"
 msgstr "Lokale Kontakte"
 
-#: src/Module/Admin/Site.php:488
+#: src/Module/Admin/Site.php:490
 msgid "Interactors"
 msgstr "Interaktionen"
 
-#: src/Module/Admin/Site.php:498 src/Module/BaseAdmin.php:90
+#: src/Module/Admin/Site.php:500 src/Module/BaseAdmin.php:90
 msgid "Site"
 msgstr "Seite"
 
-#: src/Module/Admin/Site.php:499
+#: src/Module/Admin/Site.php:501
 msgid "General Information"
 msgstr "Allgemeine Informationen"
 
-#: src/Module/Admin/Site.php:501
+#: src/Module/Admin/Site.php:503
 msgid "Republish users to directory"
 msgstr "Nutzer erneut im globalen Verzeichnis veröffentlichen."
 
-#: src/Module/Admin/Site.php:502 src/Module/Register.php:141
+#: src/Module/Admin/Site.php:504 src/Module/Register.php:141
 msgid "Registration"
 msgstr "Registrierung"
 
-#: src/Module/Admin/Site.php:503
+#: src/Module/Admin/Site.php:505
 msgid "File upload"
 msgstr "Datei hochladen"
 
-#: src/Module/Admin/Site.php:504
+#: src/Module/Admin/Site.php:506
 msgid "Policies"
 msgstr "Regeln"
 
-#: src/Module/Admin/Site.php:506
+#: src/Module/Admin/Site.php:508
 msgid "Auto Discovered Contact Directory"
 msgstr "Automatisch ein Kontaktverzeichnis erstellen"
 
-#: src/Module/Admin/Site.php:507
+#: src/Module/Admin/Site.php:509
 msgid "Performance"
 msgstr "Performance"
 
-#: src/Module/Admin/Site.php:508
+#: src/Module/Admin/Site.php:510
 msgid "Worker"
 msgstr "Worker"
 
-#: src/Module/Admin/Site.php:509
+#: src/Module/Admin/Site.php:511
 msgid "Message Relay"
 msgstr "Nachrichten-Relais"
 
-#: src/Module/Admin/Site.php:510
+#: src/Module/Admin/Site.php:512
 msgid ""
 "Use the command \"console relay\" in the command line to add or remove "
 "relays."
 msgstr "Verwende den Befehl \"console relay\" auf der Kommandozeile um weitere Relays hinzu zu fügen oder zu entfernen."
 
-#: src/Module/Admin/Site.php:511
+#: src/Module/Admin/Site.php:513
 msgid "The system is not subscribed to any relays at the moment."
 msgstr "Das System hat derzeit keinerlei Relays abonniert."
 
-#: src/Module/Admin/Site.php:512
+#: src/Module/Admin/Site.php:514
 msgid "The system is currently subscribed to the following relays:"
 msgstr "Das System hat derzeit Abonnements bei folgenden Releays:"
 
-#: src/Module/Admin/Site.php:514
+#: src/Module/Admin/Site.php:516
 msgid "Relocate Instance"
 msgstr "Instanz Umziehen"
 
-#: src/Module/Admin/Site.php:515
+#: src/Module/Admin/Site.php:517
 msgid ""
 "<strong>Warning!</strong> Advanced function. Could make this server "
 "unreachable."
 msgstr "<strong>Achtung</strong> Funktionen für Fortgeschrittene. Könnte diesen Server unerreichbar machen."
 
-#: src/Module/Admin/Site.php:519
+#: src/Module/Admin/Site.php:521
 msgid "Site name"
 msgstr "Seitenname"
 
-#: src/Module/Admin/Site.php:520
+#: src/Module/Admin/Site.php:522
 msgid "Sender Email"
 msgstr "Absender für Emails"
 
-#: src/Module/Admin/Site.php:520
+#: src/Module/Admin/Site.php:522
 msgid ""
 "The email address your server shall use to send notification emails from."
 msgstr "Die E-Mail Adresse, die dein Server zum Versenden von Benachrichtigungen verwenden soll."
 
-#: src/Module/Admin/Site.php:521
+#: src/Module/Admin/Site.php:523
 msgid "Name of the system actor"
 msgstr "Name des System-Actors"
 
-#: src/Module/Admin/Site.php:521
+#: src/Module/Admin/Site.php:523
 msgid ""
 "Name of the internal system account that is used to perform ActivityPub "
 "requests. This must be an unused username. If set, this can't be changed "
 "again."
 msgstr "Name des internen System-Accounts der für ActivityPub Anfragen verwendet wird. Der Nutzername darf bisher nicht verwendet werden. Ist der Name einmal gesetzt kann er nicht mehr geändert werden."
 
-#: src/Module/Admin/Site.php:522
+#: src/Module/Admin/Site.php:524
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: src/Module/Admin/Site.php:523
+#: src/Module/Admin/Site.php:525
 msgid "Email Banner/Logo"
 msgstr "E-Mail Banner / Logo"
 
-#: src/Module/Admin/Site.php:524
+#: src/Module/Admin/Site.php:526
 msgid "Shortcut icon"
 msgstr "Shortcut Icon"
 
-#: src/Module/Admin/Site.php:524
+#: src/Module/Admin/Site.php:526
 msgid "Link to an icon that will be used for browsers."
 msgstr "Link zu einem Icon, das Browser verwenden werden."
 
-#: src/Module/Admin/Site.php:525
+#: src/Module/Admin/Site.php:527
 msgid "Touch icon"
 msgstr "Touch Icon"
 
-#: src/Module/Admin/Site.php:525
+#: src/Module/Admin/Site.php:527
 msgid "Link to an icon that will be used for tablets and mobiles."
 msgstr "Link zu einem Icon, das Tablets und Mobiltelefone verwenden sollen."
 
-#: src/Module/Admin/Site.php:526
+#: src/Module/Admin/Site.php:528
 msgid "Additional Info"
 msgstr "Zusätzliche Informationen"
 
-#: src/Module/Admin/Site.php:526
+#: src/Module/Admin/Site.php:528
 #, php-format
 msgid ""
 "For public servers: you can add additional information here that will be "
 "listed at %s/servers."
 msgstr "Für öffentliche Server kannst du hier zusätzliche Informationen angeben, die dann auf %s/servers angezeigt werden."
 
-#: src/Module/Admin/Site.php:527
+#: src/Module/Admin/Site.php:529
 msgid "System language"
 msgstr "Systemsprache"
 
-#: src/Module/Admin/Site.php:528
+#: src/Module/Admin/Site.php:530
 msgid "System theme"
 msgstr "Systemweites Theme"
 
-#: src/Module/Admin/Site.php:528
+#: src/Module/Admin/Site.php:530
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a "
 "href=\"/admin/themes\" id=\"cnftheme\">Change default theme settings</a>"
 msgstr "Standard-Theme des Systems - kann von Benutzerprofilen überschrieben werden - <a href=\"/admin/themes\" id=\"cnftheme\">Ändere Einstellung des Standard-Themes</a>"
 
-#: src/Module/Admin/Site.php:529
+#: src/Module/Admin/Site.php:531
 msgid "Mobile system theme"
 msgstr "Systemweites mobiles Theme"
 
-#: src/Module/Admin/Site.php:529
+#: src/Module/Admin/Site.php:531
 msgid "Theme for mobile devices"
 msgstr "Theme für mobile Geräte"
 
-#: src/Module/Admin/Site.php:530 src/Module/Install.php:225
+#: src/Module/Admin/Site.php:532 src/Module/Install.php:225
 msgid "SSL link policy"
 msgstr "Regeln für SSL Links"
 
-#: src/Module/Admin/Site.php:530 src/Module/Install.php:227
+#: src/Module/Admin/Site.php:532 src/Module/Install.php:227
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "Bestimmt, ob generierte Links SSL verwenden müssen"
 
-#: src/Module/Admin/Site.php:531
+#: src/Module/Admin/Site.php:533
 msgid "Force SSL"
 msgstr "Erzwinge SSL"
 
-#: src/Module/Admin/Site.php:531
+#: src/Module/Admin/Site.php:533
 msgid ""
 "Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
 " to endless loops."
 msgstr "Erzwinge SSL für alle Nicht-SSL-Anfragen - Achtung: auf manchen Systemen verursacht dies eine Endlosschleife."
 
-#: src/Module/Admin/Site.php:532
+#: src/Module/Admin/Site.php:534
 msgid "Show help entry from navigation menu"
 msgstr "Zeige den Hilfe-Eintrag im Navigationsmenü an"
 
-#: src/Module/Admin/Site.php:532
+#: src/Module/Admin/Site.php:534
 msgid ""
 "Displays the menu entry for the Help pages from the navigation menu. It is "
 "always accessible by calling /help directly."
 msgstr "Zeigt im Navigationsmenü den Eintrag für die Hilfe-Seiten an. Es ist immer möglich diese Seiten direkt über /help in der Adresseingabe des Browsers aufzurufen."
 
-#: src/Module/Admin/Site.php:533
+#: src/Module/Admin/Site.php:535
 msgid "Single user instance"
 msgstr "Ein-Nutzer Instanz"
 
-#: src/Module/Admin/Site.php:533
+#: src/Module/Admin/Site.php:535
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr "Bestimmt, ob es sich bei dieser Instanz um eine Installation mit nur einen Nutzer oder mit mehreren Nutzern handelt."
 
-#: src/Module/Admin/Site.php:535
+#: src/Module/Admin/Site.php:537
 msgid "Maximum image size"
 msgstr "Maximale Bildgröße"
 
-#: src/Module/Admin/Site.php:535
+#: src/Module/Admin/Site.php:537
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maximale Uploadgröße von Bildern in Bytes. Standard ist 0, d.h. ohne Limit."
 
-#: src/Module/Admin/Site.php:536
+#: src/Module/Admin/Site.php:538
 msgid "Maximum image length"
 msgstr "Maximale Bildlänge"
 
-#: src/Module/Admin/Site.php:536
+#: src/Module/Admin/Site.php:538
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr "Maximale Länge in Pixeln der längsten Seite eines hochgeladenen Bildes. Grundeinstellung ist -1, was keine Einschränkung bedeutet."
 
-#: src/Module/Admin/Site.php:537
+#: src/Module/Admin/Site.php:539
 msgid "JPEG image quality"
 msgstr "Qualität des JPEG Bildes"
 
-#: src/Module/Admin/Site.php:537
+#: src/Module/Admin/Site.php:539
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr "Hochgeladene JPEG-Bilder werden mit dieser Qualität [0-100] gespeichert. Grundeinstellung ist 100, kein Qualitätsverlust."
 
-#: src/Module/Admin/Site.php:539
+#: src/Module/Admin/Site.php:541
 msgid "Register policy"
 msgstr "Registrierungsmethode"
 
-#: src/Module/Admin/Site.php:540
+#: src/Module/Admin/Site.php:542
 msgid "Maximum Daily Registrations"
 msgstr "Maximum täglicher Registrierungen"
 
-#: src/Module/Admin/Site.php:540
+#: src/Module/Admin/Site.php:542
 msgid ""
 "If registration is permitted above, this sets the maximum number of new user"
 " registrations to accept per day.  If register is set to closed, this "
 "setting has no effect."
 msgstr "Wenn die Registrierung weiter oben erlaubt ist, regelt dies die maximale Anzahl von Neuanmeldungen pro Tag. Wenn die Registrierung geschlossen ist, hat diese Einstellung keinen Effekt."
 
-#: src/Module/Admin/Site.php:541
+#: src/Module/Admin/Site.php:543
 msgid "Register text"
 msgstr "Registrierungstext"
 
-#: src/Module/Admin/Site.php:541
+#: src/Module/Admin/Site.php:543
 msgid ""
 "Will be displayed prominently on the registration page. You can use BBCode "
 "here."
 msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt. BBCode kann verwendet werden."
 
-#: src/Module/Admin/Site.php:542
+#: src/Module/Admin/Site.php:544
 msgid "Forbidden Nicknames"
 msgstr "Verbotene Spitznamen"
 
-#: src/Module/Admin/Site.php:542
+#: src/Module/Admin/Site.php:544
 msgid ""
 "Comma separated list of nicknames that are forbidden from registration. "
 "Preset is a list of role names according RFC 2142."
 msgstr "Durch Kommas getrennte Liste von Spitznamen, die von der Registrierung ausgeschlossen sind. Die Vorgabe ist eine Liste von Rollennamen nach RFC 2142."
 
-#: src/Module/Admin/Site.php:543
+#: src/Module/Admin/Site.php:545
 msgid "Accounts abandoned after x days"
 msgstr "Nutzerkonten gelten nach x Tagen als unbenutzt"
 
-#: src/Module/Admin/Site.php:543
+#: src/Module/Admin/Site.php:545
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Konten nicht mehr benutzt werden. 0 eingeben für kein Limit."
 
-#: src/Module/Admin/Site.php:544
+#: src/Module/Admin/Site.php:546
 msgid "Allowed friend domains"
 msgstr "Erlaubte Domains für Kontakte"
 
-#: src/Module/Admin/Site.php:544
+#: src/Module/Admin/Site.php:546
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Liste der Domains, die für Kontakte erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: src/Module/Admin/Site.php:545
+#: src/Module/Admin/Site.php:547
 msgid "Allowed email domains"
 msgstr "Erlaubte Domains für E-Mails"
 
-#: src/Module/Admin/Site.php:545
+#: src/Module/Admin/Site.php:547
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
 
-#: src/Module/Admin/Site.php:546
+#: src/Module/Admin/Site.php:548
 msgid "No OEmbed rich content"
 msgstr "OEmbed nicht verwenden"
 
-#: src/Module/Admin/Site.php:546
+#: src/Module/Admin/Site.php:548
 msgid ""
 "Don't show the rich content (e.g. embedded PDF), except from the domains "
 "listed below."
 msgstr "Verhindert das Einbetten von reichhaltigen Inhalten (z.B. eingebettete PDF Dateien). Ausgenommen von dieser Regel werden Domänen, die unten aufgeführt werden."
 
-#: src/Module/Admin/Site.php:547
+#: src/Module/Admin/Site.php:549
 msgid "Trusted third-party domains"
 msgstr "Vertrauenswürdige Drittanbieter-Domains"
 
-#: src/Module/Admin/Site.php:547
+#: src/Module/Admin/Site.php:549
 msgid ""
 "Comma separated list of domains from which content is allowed to be embedded"
 " in posts like with OEmbed. All sub-domains of the listed domains are "
 "allowed as well."
 msgstr "Komma separierte Liste von Domains von denen Inhalte in Beiträgen eingebettet werden dürfen. Alle Subdomains werden ebenfalls akzeptiert."
 
-#: src/Module/Admin/Site.php:548
+#: src/Module/Admin/Site.php:550
 msgid "Block public"
 msgstr "Öffentlichen Zugriff blockieren"
 
-#: src/Module/Admin/Site.php:548
+#: src/Module/Admin/Site.php:550
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist."
 
-#: src/Module/Admin/Site.php:549
+#: src/Module/Admin/Site.php:551
 msgid "Force publish"
 msgstr "Erzwinge Veröffentlichung"
 
-#: src/Module/Admin/Site.php:549
+#: src/Module/Admin/Site.php:551
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen."
 
-#: src/Module/Admin/Site.php:549
+#: src/Module/Admin/Site.php:551
 msgid "Enabling this may violate privacy laws like the GDPR"
 msgstr "Wenn du diese Option aktivierst, verstößt das unter Umständen gegen Gesetze wie die EU-DSGVO."
 
-#: src/Module/Admin/Site.php:550
+#: src/Module/Admin/Site.php:552
 msgid "Global directory URL"
 msgstr "URL des weltweiten Verzeichnisses"
 
-#: src/Module/Admin/Site.php:550
+#: src/Module/Admin/Site.php:552
 msgid ""
 "URL to the global directory. If this is not set, the global directory is "
 "completely unavailable to the application."
 msgstr "URL des weltweiten Verzeichnisses. Wenn diese nicht gesetzt ist, ist das Verzeichnis für die Applikation nicht erreichbar."
 
-#: src/Module/Admin/Site.php:551
+#: src/Module/Admin/Site.php:553
 msgid "Private posts by default for new users"
 msgstr "Private Beiträge als Standard für neue Nutzer"
 
-#: src/Module/Admin/Site.php:551
+#: src/Module/Admin/Site.php:553
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr "Die Standard-Zugriffsrechte für neue Nutzer werden so gesetzt, dass als Voreinstellung in die private Gruppe gepostet wird anstelle von öffentlichen Beiträgen."
 
-#: src/Module/Admin/Site.php:552
+#: src/Module/Admin/Site.php:554
 msgid "Don't include post content in email notifications"
 msgstr "Inhalte von Beiträgen nicht in E-Mail-Benachrichtigungen versenden"
 
-#: src/Module/Admin/Site.php:552
+#: src/Module/Admin/Site.php:554
 msgid ""
 "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."
 msgstr "Inhalte von Beiträgen/Kommentaren/privaten Nachrichten/usw. zum Datenschutz nicht in E-Mail-Benachrichtigungen einbinden."
 
-#: src/Module/Admin/Site.php:553
+#: src/Module/Admin/Site.php:555
 msgid "Disallow public access to addons listed in the apps menu."
 msgstr "Öffentlichen Zugriff auf Addons im Apps Menü verbieten."
 
-#: src/Module/Admin/Site.php:553
+#: src/Module/Admin/Site.php:555
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
 msgstr "Wenn ausgewählt, werden die im Apps Menü aufgeführten Addons nur angemeldeten Nutzern der Seite zur Verfügung gestellt."
 
-#: src/Module/Admin/Site.php:554
+#: src/Module/Admin/Site.php:556
 msgid "Don't embed private images in posts"
 msgstr "Private Bilder nicht in Beiträgen einbetten."
 
-#: src/Module/Admin/Site.php:554
+#: src/Module/Admin/Site.php:556
 msgid ""
 "Don't replace locally-hosted private photos in posts with an embedded copy "
 "of the image. This means that contacts who receive posts containing private "
@@ -5826,11 +5826,11 @@ msgid ""
 "while."
 msgstr "Ersetze lokal gehostete, private Fotos in Beiträgen nicht mit einer eingebetteten Kopie des Bildes. Dies bedeutet, dass Kontakte, die Beiträge mit privaten Fotos erhalten, sich zunächst auf den jeweiligen Servern authentifizieren müssen, bevor die Bilder geladen und angezeigt werden, was eine gewisse Zeit dauert."
 
-#: src/Module/Admin/Site.php:555
+#: src/Module/Admin/Site.php:557
 msgid "Explicit Content"
 msgstr "Sensibler Inhalt"
 
-#: src/Module/Admin/Site.php:555
+#: src/Module/Admin/Site.php:557
 msgid ""
 "Set this to announce that your node is used mostly for explicit content that"
 " might not be suited for minors. This information will be published in the "
@@ -5839,245 +5839,255 @@ msgid ""
 "will be shown at the user registration page."
 msgstr "Wähle dies, um anzuzeigen, dass dein Knoten hauptsächlich für explizite Inhalte verwendet wird, die möglicherweise nicht für Minderjährige geeignet sind. Diese Info wird in der Knoteninformation veröffentlicht und kann durch das Globale Verzeichnis genutzt werden, um deinen Knoten von den Auflistungen auszuschließen. Zusätzlich wird auf der Registrierungsseite ein Hinweis darüber angezeigt."
 
-#: src/Module/Admin/Site.php:556
+#: src/Module/Admin/Site.php:558
 msgid "Proxify external content"
 msgstr "Proxy für externe Inhalte"
 
-#: src/Module/Admin/Site.php:556
+#: src/Module/Admin/Site.php:558
 msgid ""
 "Route external content via the proxy functionality. This is used for example"
 " for some OEmbed accesses and in some other rare cases."
 msgstr "Externe Inhalte werden durch einen Proxy geleitet. Die wird z.B. für das aufrufen von OEmbed Inhalten verwendet und einigen anderen seltenen Fällen."
 
-#: src/Module/Admin/Site.php:557
+#: src/Module/Admin/Site.php:559
+msgid "Cache contact avatars"
+msgstr "Kontaktprofilbilder zwischenspeichern"
+
+#: src/Module/Admin/Site.php:559
+msgid ""
+"Locally store the avatar pictures of the contacts. This uses a lot of "
+"storage space but it increases the performance."
+msgstr "Die Profilbilder der Kontakte zwischenspeichern. Der Zwischenspeicher verbraucht viel Platz im Speicherplatz, verbessert aber die Performance."
+
+#: src/Module/Admin/Site.php:560
 msgid "Allow Users to set remote_self"
 msgstr "Nutzern erlauben, das remote_self Flag zu setzen"
 
-#: src/Module/Admin/Site.php:557
+#: src/Module/Admin/Site.php:560
 msgid ""
 "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."
 msgstr "Ist dies ausgewählt, kann jeder Nutzer jeden seiner Kontakte als remote_self (entferntes Konto) im \"Erweitert\"-Reiter der Kontaktansicht markieren. Nach dem Setzen dieses Flags werden alle Top-Level-Beiträge dieser Kontakte automatisch in den Stream dieses Nutzers gepostet (gespiegelt)."
 
-#: src/Module/Admin/Site.php:558
+#: src/Module/Admin/Site.php:561
 msgid "Enable multiple registrations"
 msgstr "Erlaube Mehrfachregistrierung"
 
-#: src/Module/Admin/Site.php:558
+#: src/Module/Admin/Site.php:561
 msgid "Enable users to register additional accounts for use as pages."
 msgstr "Erlaube es Benutzern weitere Konten für Organisationen o.ä. mit der gleichen E-Mail Adresse anzulegen."
 
-#: src/Module/Admin/Site.php:559
+#: src/Module/Admin/Site.php:562
 msgid "Enable OpenID"
 msgstr "OpenID aktivieren"
 
-#: src/Module/Admin/Site.php:559
+#: src/Module/Admin/Site.php:562
 msgid "Enable OpenID support for registration and logins."
 msgstr "OpenID Unterstützung bei der Registrierung und dem Login aktivieren."
 
-#: src/Module/Admin/Site.php:560
+#: src/Module/Admin/Site.php:563
 msgid "Enable Fullname check"
 msgstr "Namen auf Vollständigkeit überprüfen"
 
-#: src/Module/Admin/Site.php:560
+#: src/Module/Admin/Site.php:563
 msgid ""
 "Enable check to only allow users to register with a space between the first "
 "name and the last name in their full name."
 msgstr "Erlaubt Nutzern Konten nur dann zu registrieren, bei denen im Namensfeld ein Leerzeichen zur Trennung von Vor- und Nachnamen verwendet wird."
 
-#: src/Module/Admin/Site.php:561
+#: src/Module/Admin/Site.php:564
 msgid "Community pages for visitors"
 msgstr "Für Besucher verfügbare Gemeinschaftsseite"
 
-#: src/Module/Admin/Site.php:561
+#: src/Module/Admin/Site.php:564
 msgid ""
 "Which community pages should be available for visitors. Local users always "
 "see both pages."
 msgstr "Welche Gemeinschaftsseiten sollen für Besucher dieses Knotens verfügbar sein? Lokale Nutzer können grundsätzlich beide Seiten verwenden."
 
-#: src/Module/Admin/Site.php:562
+#: src/Module/Admin/Site.php:565
 msgid "Posts per user on community page"
 msgstr "Anzahl der Beiträge pro Benutzer auf der Gemeinschaftsseite"
 
-#: src/Module/Admin/Site.php:562
+#: src/Module/Admin/Site.php:565
 msgid ""
 "The maximum number of posts per user on the community page. (Not valid for "
 "\"Global Community\")"
 msgstr "Maximale Anzahl der Beiträge, die von jedem Nutzer auf der Gemeinschaftsseite angezeigt werden. (Gilt nicht für die 'Globale Gemeinschaftsseite')"
 
-#: src/Module/Admin/Site.php:564
+#: src/Module/Admin/Site.php:567
 msgid "Enable Mail support"
 msgstr "E-Mail Unterstützung aktivieren"
 
-#: src/Module/Admin/Site.php:564
+#: src/Module/Admin/Site.php:567
 msgid ""
 "Enable built-in mail support to poll IMAP folders and to reply via mail."
 msgstr "Aktiviert die Unterstützung IMAP Ordner abzurufen und ermöglicht es auch auf E-Mails zu antworten."
 
-#: src/Module/Admin/Site.php:565
+#: src/Module/Admin/Site.php:568
 msgid ""
 "Mail support can't be enabled because the PHP IMAP module is not installed."
 msgstr "E-Mail Unterstützung kann nicht aktiviert werden, da das PHP IMAP Modul nicht installiert ist."
 
-#: src/Module/Admin/Site.php:566
+#: src/Module/Admin/Site.php:569
 msgid "Enable OStatus support"
 msgstr "OStatus Unterstützung aktivieren"
 
-#: src/Module/Admin/Site.php:566
+#: src/Module/Admin/Site.php:569
 msgid ""
 "Enable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
 "communications in OStatus are public."
 msgstr "Aktiviere die OStatus (StatusNet, GNU Social usw.) Unterstützung. Die Kommunikation über das OStatus Protokoll ist grundsätzlich öffentlich."
 
-#: src/Module/Admin/Site.php:568
+#: src/Module/Admin/Site.php:571
 msgid ""
 "Diaspora support can't be enabled because Friendica was installed into a sub"
 " directory."
 msgstr "Diaspora Unterstützung kann nicht aktiviert werden, da Friendica in ein Unterverzeichnis installiert ist."
 
-#: src/Module/Admin/Site.php:569
+#: src/Module/Admin/Site.php:572
 msgid "Enable Diaspora support"
 msgstr "Diaspora-Unterstützung aktivieren"
 
-#: src/Module/Admin/Site.php:569
+#: src/Module/Admin/Site.php:572
 msgid ""
 "Enable built-in Diaspora network compatibility for communicating with "
 "diaspora servers."
 msgstr "Aktiviere die Unterstützung des Diaspora Protokolls zur Kommunikation mit Diaspora Servern."
 
-#: src/Module/Admin/Site.php:570
+#: src/Module/Admin/Site.php:573
 msgid "Verify SSL"
 msgstr "SSL Überprüfen"
 
-#: src/Module/Admin/Site.php:570
+#: src/Module/Admin/Site.php:573
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you"
 " cannot connect (at all) to self-signed SSL sites."
 msgstr "Wenn gewollt, kann man hier eine strenge Zertifikatskontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL-Zertifikat eine Verbindung herstellen kann."
 
-#: src/Module/Admin/Site.php:571
+#: src/Module/Admin/Site.php:574
 msgid "Proxy user"
 msgstr "Proxy-Nutzer"
 
-#: src/Module/Admin/Site.php:572
+#: src/Module/Admin/Site.php:575
 msgid "Proxy URL"
 msgstr "Proxy-URL"
 
-#: src/Module/Admin/Site.php:573
+#: src/Module/Admin/Site.php:576
 msgid "Network timeout"
 msgstr "Netzwerk-Wartezeit"
 
-#: src/Module/Admin/Site.php:573
+#: src/Module/Admin/Site.php:576
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)."
 
-#: src/Module/Admin/Site.php:574
+#: src/Module/Admin/Site.php:577
 msgid "Maximum Load Average"
 msgstr "Maximum Load Average"
 
-#: src/Module/Admin/Site.php:574
+#: src/Module/Admin/Site.php:577
 #, php-format
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default %d."
 msgstr "Maximale System-LOAD bevor Verteil- und Empfangsprozesse verschoben werden - Standard %d"
 
-#: src/Module/Admin/Site.php:575
+#: src/Module/Admin/Site.php:578
 msgid "Maximum Load Average (Frontend)"
 msgstr "Maximum Load Average (Frontend)"
 
-#: src/Module/Admin/Site.php:575
+#: src/Module/Admin/Site.php:578
 msgid "Maximum system load before the frontend quits service - default 50."
 msgstr "Maximale Systemlast, bevor Vordergrundprozesse pausiert werden - Standard 50."
 
-#: src/Module/Admin/Site.php:576
+#: src/Module/Admin/Site.php:579
 msgid "Minimal Memory"
 msgstr "Minimaler Speicher"
 
-#: src/Module/Admin/Site.php:576
+#: src/Module/Admin/Site.php:579
 msgid ""
 "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
 "default 0 (deactivated)."
 msgstr "Minimal freier Speicher in MB für den Worker Prozess. Benötigt Zugriff auf /proc/meminfo - Standardwert ist 0 (deaktiviert)"
 
-#: src/Module/Admin/Site.php:577
+#: src/Module/Admin/Site.php:580
 msgid "Periodically optimize tables"
 msgstr "Optimiere die Tabellen regelmäßig"
 
-#: src/Module/Admin/Site.php:577
+#: src/Module/Admin/Site.php:580
 msgid "Periodically optimize tables like the cache and the workerqueue"
 msgstr "Optimiert Tabellen wie den Cache oder die Worker-Warteschlage regelmäßig."
 
-#: src/Module/Admin/Site.php:579
+#: src/Module/Admin/Site.php:582
 msgid "Discover followers/followings from contacts"
 msgstr "Endecke folgende und gefolgte Kontakte von Kontakten"
 
-#: src/Module/Admin/Site.php:579
+#: src/Module/Admin/Site.php:582
 msgid ""
 "If enabled, contacts are checked for their followers and following contacts."
 msgstr "Ist dies aktiv, werden die Kontakte auf deren folgenden und gefolgten Kontakte überprüft."
 
-#: src/Module/Admin/Site.php:580
+#: src/Module/Admin/Site.php:583
 msgid "None - deactivated"
 msgstr "Keine - deaktiviert"
 
-#: src/Module/Admin/Site.php:581
+#: src/Module/Admin/Site.php:584
 msgid ""
 "Local contacts - contacts of our local contacts are discovered for their "
 "followers/followings."
 msgstr "Lokale Kontakte - Die Beziehungen der lokalen Kontakte werden analysiert."
 
-#: src/Module/Admin/Site.php:582
+#: src/Module/Admin/Site.php:585
 msgid ""
 "Interactors - contacts of our local contacts and contacts who interacted on "
 "locally visible postings are discovered for their followers/followings."
 msgstr "Interaktionen - Kontakte der lokalen Kontakte sowie die Profile die mit öffentlichen lokalen Beiträgen interagiert haben, werden bzgl. ihrer Beziehungen analysiert."
 
-#: src/Module/Admin/Site.php:584
+#: src/Module/Admin/Site.php:587
 msgid "Synchronize the contacts with the directory server"
 msgstr "Gleiche die Kontakte mit dem Directory-Server ab"
 
-#: src/Module/Admin/Site.php:584
+#: src/Module/Admin/Site.php:587
 msgid ""
 "if enabled, the system will check periodically for new contacts on the "
 "defined directory server."
 msgstr "Ist dies aktiv, wird das System regelmäßig auf dem Verzeichnis-Server nach neuen potentiellen Kontakten nachsehen."
 
-#: src/Module/Admin/Site.php:586
+#: src/Module/Admin/Site.php:589
 msgid "Days between requery"
 msgstr "Tage zwischen erneuten Abfragen"
 
-#: src/Module/Admin/Site.php:586
+#: src/Module/Admin/Site.php:589
 msgid "Number of days after which a server is requeried for his contacts."
 msgstr "Legt das Abfrageintervall fest, nach dem ein Server erneut nach Kontakten abgefragt werden soll."
 
-#: src/Module/Admin/Site.php:587
+#: src/Module/Admin/Site.php:590
 msgid "Discover contacts from other servers"
 msgstr "Neue Kontakte auf anderen Servern entdecken"
 
-#: src/Module/Admin/Site.php:587
+#: src/Module/Admin/Site.php:590
 msgid ""
 "Periodically query other servers for contacts. The system queries Friendica,"
 " Mastodon and Hubzilla servers."
 msgstr "Frage regelmäßig bei anderen Servern nach neuen potentiellen Kontakten an. Diese Anfragen werden an Friendica, Mastodon und Hubzilla Server gesandt."
 
-#: src/Module/Admin/Site.php:588
+#: src/Module/Admin/Site.php:591
 msgid "Search the local directory"
 msgstr "Lokales Verzeichnis durchsuchen"
 
-#: src/Module/Admin/Site.php:588
+#: src/Module/Admin/Site.php:591
 msgid ""
 "Search the local directory instead of the global directory. When searching "
 "locally, every search will be executed on the global directory in the "
 "background. This improves the search results when the search is repeated."
 msgstr "Suche im lokalen Verzeichnis anstelle des globalen Verzeichnisses durchführen. Jede Suche wird im Hintergrund auch im globalen Verzeichnis durchgeführt, um die Suchresultate zu verbessern, wenn die Suche wiederholt wird."
 
-#: src/Module/Admin/Site.php:590
+#: src/Module/Admin/Site.php:593
 msgid "Publish server information"
 msgstr "Server-Informationen veröffentlichen"
 
-#: src/Module/Admin/Site.php:590
+#: src/Module/Admin/Site.php:593
 msgid ""
 "If enabled, general server and usage data will be published. The data "
 "contains the name and version of the server, number of users with public "
@@ -6085,50 +6095,50 @@ msgid ""
 " href=\"http://the-federation.info/\">the-federation.info</a> for details."
 msgstr "Wenn aktiviert, werden allgemeine Informationen über den Server und Nutzungsdaten veröffentlicht. Die Daten beinhalten den Namen sowie die Version des Servers, die Anzahl der Personen mit öffentlichen Profilen, die Anzahl der Beiträge sowie aktivierte Protokolle und Konnektoren. Für Details bitte <a href=\"http://the-federation.info/\">the-federation.info</a> aufrufen."
 
-#: src/Module/Admin/Site.php:592
+#: src/Module/Admin/Site.php:595
 msgid "Check upstream version"
 msgstr "Suche nach Updates"
 
-#: src/Module/Admin/Site.php:592
+#: src/Module/Admin/Site.php:595
 msgid ""
 "Enables checking for new Friendica versions at github. If there is a new "
 "version, you will be informed in the admin panel overview."
 msgstr "Wenn diese Option aktiviert ist, wird regelmäßig nach neuen Friendica-Versionen auf github gesucht. Wenn es eine neue Version gibt, wird dies auf der Übersichtsseite im Admin-Panel angezeigt."
 
-#: src/Module/Admin/Site.php:593
+#: src/Module/Admin/Site.php:596
 msgid "Suppress Tags"
 msgstr "Tags unterdrücken"
 
-#: src/Module/Admin/Site.php:593
+#: src/Module/Admin/Site.php:596
 msgid "Suppress showing a list of hashtags at the end of the posting."
 msgstr "Unterdrückt die Anzeige von Tags am Ende eines Beitrags."
 
-#: src/Module/Admin/Site.php:594
+#: src/Module/Admin/Site.php:597
 msgid "Clean database"
 msgstr "Datenbank aufräumen"
 
-#: src/Module/Admin/Site.php:594
+#: src/Module/Admin/Site.php:597
 msgid ""
 "Remove old remote items, orphaned database records and old content from some"
 " other helper tables."
 msgstr "Entferne alte Beiträge von anderen Knoten, verwaiste Einträge und alten Inhalt einiger Hilfstabellen."
 
-#: src/Module/Admin/Site.php:595
+#: src/Module/Admin/Site.php:598
 msgid "Lifespan of remote items"
 msgstr "Lebensdauer von Beiträgen anderer Knoten"
 
-#: src/Module/Admin/Site.php:595
+#: src/Module/Admin/Site.php:598
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "remote items will be deleted. Own items, and marked or filed items are "
 "always kept. 0 disables this behaviour."
 msgstr "Wenn das Aufräumen der Datenbank aktiviert ist, definiert dies die Anzahl in Tagen, nach der Beiträge, die auf anderen Knoten des Netzwerks verfasst wurden, gelöscht werden sollen. Eigene Beiträge sowie markierte oder abgespeicherte Beiträge werden nicht gelöscht. Ein Wert von 0 deaktiviert das automatische Löschen von Beiträgen."
 
-#: src/Module/Admin/Site.php:596
+#: src/Module/Admin/Site.php:599
 msgid "Lifespan of unclaimed items"
 msgstr "Lebensdauer nicht angeforderter Beiträge"
 
-#: src/Module/Admin/Site.php:596
+#: src/Module/Admin/Site.php:599
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "unclaimed remote items (mostly content from the relay) will be deleted. "
@@ -6136,144 +6146,144 @@ msgid ""
 "items if set to 0."
 msgstr "Wenn das Aufräumen der Datenbank aktiviert ist, definiert dies die Anzahl von Tagen, nach denen nicht angeforderte Beiträge (hauptsächlich solche, die über das Relais eintreffen) gelöscht werden. Der Standardwert beträgt 90 Tage. Wird dieser Wert auf 0 gesetzt, wird die Lebensdauer von Beiträgen anderer Knoten verwendet."
 
-#: src/Module/Admin/Site.php:597
+#: src/Module/Admin/Site.php:600
 msgid "Lifespan of raw conversation data"
 msgstr "Lebensdauer der Beiträge"
 
-#: src/Module/Admin/Site.php:597
+#: src/Module/Admin/Site.php:600
 msgid ""
 "The conversation data is used for ActivityPub and OStatus, as well as for "
 "debug purposes. It should be safe to remove it after 14 days, default is 90 "
 "days."
 msgstr "Die Konversationsdaten werden für ActivityPub und OStatus sowie für Debug-Zwecke verwendet. Sie sollten gefahrlos nach 14 Tagen entfernt werden können, der Standardwert beträgt 90 Tage."
 
-#: src/Module/Admin/Site.php:598
+#: src/Module/Admin/Site.php:601
 msgid "Maximum numbers of comments per post"
 msgstr "Maximale Anzahl von Kommentaren pro Beitrag"
 
-#: src/Module/Admin/Site.php:598
+#: src/Module/Admin/Site.php:601
 msgid "How much comments should be shown for each post? Default value is 100."
 msgstr "Wie viele Kommentare sollen pro Beitrag angezeigt werden? Standardwert sind 100."
 
-#: src/Module/Admin/Site.php:599
+#: src/Module/Admin/Site.php:602
 msgid "Maximum numbers of comments per post on the display page"
 msgstr "Maximale Anzahl von Kommentaren in der Einzelansicht"
 
-#: src/Module/Admin/Site.php:599
+#: src/Module/Admin/Site.php:602
 msgid ""
 "How many comments should be shown on the single view for each post? Default "
 "value is 1000."
 msgstr "Wie viele Kommentare sollen auf der Einzelansicht eines Beitrags angezeigt werden? Grundeinstellung sind 1000."
 
-#: src/Module/Admin/Site.php:600
+#: src/Module/Admin/Site.php:603
 msgid "Temp path"
 msgstr "Temp-Pfad"
 
-#: src/Module/Admin/Site.php:600
+#: src/Module/Admin/Site.php:603
 msgid ""
 "If you have a restricted system where the webserver can't access the system "
 "temp path, enter another path here."
 msgstr "Solltest du ein eingeschränktes System haben, auf dem der Webserver nicht auf das temp-Verzeichnis des Systems zugreifen kann, setze hier einen anderen Pfad."
 
-#: src/Module/Admin/Site.php:601
+#: src/Module/Admin/Site.php:604
 msgid "Only search in tags"
 msgstr "Nur in Tags suchen"
 
-#: src/Module/Admin/Site.php:601
+#: src/Module/Admin/Site.php:604
 msgid "On large systems the text search can slow down the system extremely."
 msgstr "Auf großen Knoten kann die Volltext-Suche das System ausbremsen."
 
-#: src/Module/Admin/Site.php:603
+#: src/Module/Admin/Site.php:606
 msgid "New base url"
 msgstr "Neue Basis-URL"
 
-#: src/Module/Admin/Site.php:603
+#: src/Module/Admin/Site.php:606
 msgid ""
 "Change base url for this server. Sends relocate message to all Friendica and"
 " Diaspora* contacts of all users."
 msgstr "Ändert die Basis-URL dieses Servers und sendet eine Umzugsmitteilung an alle Friendica- und Diaspora*-Kontakte deiner NutzerInnen."
 
-#: src/Module/Admin/Site.php:605
+#: src/Module/Admin/Site.php:608
 msgid "Maximum number of parallel workers"
 msgstr "Maximale Anzahl parallel laufender Worker"
 
-#: src/Module/Admin/Site.php:605
+#: src/Module/Admin/Site.php:608
 #, php-format
 msgid ""
 "On shared hosters set this to %d. On larger systems, values of %d are great."
 " Default value is %d."
 msgstr "Wenn dein Knoten bei einem Shared Hoster ist, setze diesen Wert auf %d. Auf größeren Systemen funktioniert ein Wert von %d recht gut. Standardeinstellung sind %d."
 
-#: src/Module/Admin/Site.php:606
+#: src/Module/Admin/Site.php:609
 msgid "Enable fastlane"
 msgstr "Aktiviere Fastlane"
 
-#: src/Module/Admin/Site.php:606
+#: src/Module/Admin/Site.php:609
 msgid ""
 "When enabed, the fastlane mechanism starts an additional worker if processes"
 " with higher priority are blocked by processes of lower priority."
 msgstr "Wenn aktiviert, wird der Fastlane-Mechanismus einen weiteren Worker-Prozeß starten, wenn Prozesse mit höherer Priorität von Prozessen mit niedrigerer Priorität blockiert werden."
 
-#: src/Module/Admin/Site.php:608
+#: src/Module/Admin/Site.php:611
 msgid "Direct relay transfer"
 msgstr "Direkte Relais-Übertragung"
 
-#: src/Module/Admin/Site.php:608
+#: src/Module/Admin/Site.php:611
 msgid ""
 "Enables the direct transfer to other servers without using the relay servers"
 msgstr "Aktiviert das direkte Verteilen an andere Server, ohne dass ein Relais-Server verwendet wird."
 
-#: src/Module/Admin/Site.php:609
+#: src/Module/Admin/Site.php:612
 msgid "Relay scope"
 msgstr "Geltungsbereich des Relais"
 
-#: src/Module/Admin/Site.php:609
+#: src/Module/Admin/Site.php:612
 msgid ""
 "Can be \"all\" or \"tags\". \"all\" means that every public post should be "
 "received. \"tags\" means that only posts with selected tags should be "
 "received."
 msgstr "Der Wert kann entweder 'Alle' oder 'Schlagwörter' sein. 'Alle' bedeutet, dass alle öffentliche Beiträge empfangen werden sollen. 'Schlagwörter' schränkt dem Empfang auf Beiträge ein, die bestimmte Schlagwörter beinhalten."
 
-#: src/Module/Admin/Site.php:609 src/Module/Contact.php:473
+#: src/Module/Admin/Site.php:612 src/Module/Contact.php:473
 #: src/Module/Settings/TwoFactor/Index.php:118
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: src/Module/Admin/Site.php:609
+#: src/Module/Admin/Site.php:612
 msgid "all"
 msgstr "Alle"
 
-#: src/Module/Admin/Site.php:609
+#: src/Module/Admin/Site.php:612
 msgid "tags"
 msgstr "Schlagwörter"
 
-#: src/Module/Admin/Site.php:610
+#: src/Module/Admin/Site.php:613
 msgid "Server tags"
 msgstr "Server-Schlagworte"
 
-#: src/Module/Admin/Site.php:610
+#: src/Module/Admin/Site.php:613
 msgid "Comma separated list of tags for the \"tags\" subscription."
 msgstr "Liste von Schlagworten, die abonniert werden sollen, mit Komma getrennt."
 
-#: src/Module/Admin/Site.php:611
+#: src/Module/Admin/Site.php:614
 msgid "Deny Server tags"
 msgstr "Server Tags ablehnen"
 
-#: src/Module/Admin/Site.php:611
+#: src/Module/Admin/Site.php:614
 msgid "Comma separated list of tags that are rejected."
 msgstr "Durch Kommas getrennte Liste der Tags, die abgelehnt werden"
 
-#: src/Module/Admin/Site.php:612
+#: src/Module/Admin/Site.php:615
 msgid "Allow user tags"
 msgstr "Verwende Schlagworte der Nutzer"
 
-#: src/Module/Admin/Site.php:612
+#: src/Module/Admin/Site.php:615
 msgid ""
 "If enabled, the tags from the saved searches will used for the \"tags\" "
 "subscription in addition to the \"relay_server_tags\"."
 msgstr "Ist dies aktiviert, werden die Schlagwörter der gespeicherten Suchen zusätzlich zu den oben definierten Server-Schlagworten abonniert."
 
-#: src/Module/Admin/Site.php:615
+#: src/Module/Admin/Site.php:618
 msgid "Start Relocation"
 msgstr "Umsiedlung starten"
 
@@ -7599,7 +7609,7 @@ msgid "Sort by post received date"
 msgstr "Nach Empfangsdatum der Beiträge sortiert"
 
 #: src/Module/Conversation/Network.php:250
-#: src/Module/Settings/Profile/Index.php:226
+#: src/Module/Settings/Profile/Index.php:228
 msgid "Personal"
 msgstr "Persönlich"
 
@@ -7823,7 +7833,7 @@ msgid "Twitter Source / Tweet URL (requires API key)"
 msgstr "Twitter Quelle / Tweet URL (benötigt API Schlüssel)"
 
 #: src/Module/Debug/Feed.php:38 src/Module/Filer/SaveTag.php:40
-#: src/Module/Settings/Profile/Index.php:140
+#: src/Module/Settings/Profile/Index.php:142
 msgid "You must be logged in to use this module"
 msgstr "Du musst eingeloggt sein, um dieses Modul benutzen zu können."
 
@@ -7934,15 +7944,15 @@ msgstr "- auswählen -"
 msgid "Suggested contact not found."
 msgstr "Vorgeschlagener Kontakt wurde nicht gefunden."
 
-#: src/Module/FriendSuggest.php:84
+#: src/Module/FriendSuggest.php:83
 msgid "Friend suggestion sent."
 msgstr "Kontaktvorschlag gesendet."
 
-#: src/Module/FriendSuggest.php:121
+#: src/Module/FriendSuggest.php:120
 msgid "Suggest Friends"
 msgstr "Kontakte vorschlagen"
 
-#: src/Module/FriendSuggest.php:124
+#: src/Module/FriendSuggest.php:123
 #, php-format
 msgid "Suggest a friend for %s"
 msgstr "Schlage %s einen Kontakt vor"
@@ -8466,7 +8476,7 @@ msgstr "Keine Kontaktanfragen."
 msgid "No more %s notifications."
 msgstr "Keine weiteren %s-Benachrichtigungen"
 
-#: src/Module/Notifications/Notification.php:104
+#: src/Module/Notifications/Notification.php:107
 msgid "You must be logged in to show this page."
 msgstr "Du musst eingeloggt sein damit diese Seite angezeigt werden kann."
 
@@ -8524,15 +8534,15 @@ msgstr "Der Grant-Typ fehlt oder wird nicht unterstützt"
 msgid "Wrong type \"%s\", expected one of: %s"
 msgstr "Falscher Typ \"%s\", hatte einen der Folgenden erwartet: %s"
 
-#: src/Module/PermissionTooltip.php:38
+#: src/Module/PermissionTooltip.php:42
 msgid "Model not found"
 msgstr "Model nicht gefunden"
 
-#: src/Module/PermissionTooltip.php:60
+#: src/Module/PermissionTooltip.php:64
 msgid "Remote privacy information not available."
 msgstr "Entfernte Privatsphäreneinstellungen nicht verfügbar."
 
-#: src/Module/PermissionTooltip.php:69
+#: src/Module/PermissionTooltip.php:73
 msgid "Visible to:"
 msgstr "Sichtbar für:"
 
@@ -8587,12 +8597,12 @@ msgid "Birthday:"
 msgstr "Geburtstag:"
 
 #: src/Module/Profile/Profile.php:167
-#: src/Module/Settings/Profile/Index.php:244 src/Util/Temporal.php:165
+#: src/Module/Settings/Profile/Index.php:246 src/Util/Temporal.php:165
 msgid "Age: "
 msgstr "Alter: "
 
 #: src/Module/Profile/Profile.php:167
-#: src/Module/Settings/Profile/Index.php:244 src/Util/Temporal.php:165
+#: src/Module/Settings/Profile/Index.php:246 src/Util/Temporal.php:165
 #, php-format
 msgid "%d year old"
 msgid_plural "%d years old"
@@ -9175,126 +9185,126 @@ msgstr "Profilname ist erforderlich."
 msgid "Profile couldn't be updated."
 msgstr "Das Profil konnte nicht aktualisiert werden."
 
-#: src/Module/Settings/Profile/Index.php:171
-#: src/Module/Settings/Profile/Index.php:191
+#: src/Module/Settings/Profile/Index.php:173
+#: src/Module/Settings/Profile/Index.php:193
 msgid "Label:"
 msgstr "Bezeichnung:"
 
-#: src/Module/Settings/Profile/Index.php:172
-#: src/Module/Settings/Profile/Index.php:192
+#: src/Module/Settings/Profile/Index.php:174
+#: src/Module/Settings/Profile/Index.php:194
 msgid "Value:"
 msgstr "Wert:"
 
-#: src/Module/Settings/Profile/Index.php:182
-#: src/Module/Settings/Profile/Index.php:202
+#: src/Module/Settings/Profile/Index.php:184
+#: src/Module/Settings/Profile/Index.php:204
 msgid "Field Permissions"
 msgstr "Berechtigungen des Felds"
 
-#: src/Module/Settings/Profile/Index.php:183
-#: src/Module/Settings/Profile/Index.php:203
+#: src/Module/Settings/Profile/Index.php:185
+#: src/Module/Settings/Profile/Index.php:205
 msgid "(click to open/close)"
 msgstr "(klicke zum Öffnen/Schließen)"
 
-#: src/Module/Settings/Profile/Index.php:189
+#: src/Module/Settings/Profile/Index.php:191
 msgid "Add a new profile field"
 msgstr "Neues Profilfeld hinzufügen"
 
-#: src/Module/Settings/Profile/Index.php:219
+#: src/Module/Settings/Profile/Index.php:221
 msgid "Profile Actions"
 msgstr "Profilaktionen"
 
-#: src/Module/Settings/Profile/Index.php:220
+#: src/Module/Settings/Profile/Index.php:222
 msgid "Edit Profile Details"
 msgstr "Profil bearbeiten"
 
-#: src/Module/Settings/Profile/Index.php:222
+#: src/Module/Settings/Profile/Index.php:224
 msgid "Change Profile Photo"
 msgstr "Profilbild ändern"
 
-#: src/Module/Settings/Profile/Index.php:227
+#: src/Module/Settings/Profile/Index.php:229
 msgid "Profile picture"
 msgstr "Profilbild"
 
-#: src/Module/Settings/Profile/Index.php:228
+#: src/Module/Settings/Profile/Index.php:230
 msgid "Location"
 msgstr "Wohnort"
 
-#: src/Module/Settings/Profile/Index.php:229 src/Util/Temporal.php:93
+#: src/Module/Settings/Profile/Index.php:231 src/Util/Temporal.php:93
 #: src/Util/Temporal.php:95
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: src/Module/Settings/Profile/Index.php:230
+#: src/Module/Settings/Profile/Index.php:232
 msgid "Custom Profile Fields"
 msgstr "Benutzerdefinierte Profilfelder"
 
-#: src/Module/Settings/Profile/Index.php:232 src/Module/Welcome.php:58
+#: src/Module/Settings/Profile/Index.php:234 src/Module/Welcome.php:58
 msgid "Upload Profile Photo"
 msgstr "Profilbild hochladen"
 
-#: src/Module/Settings/Profile/Index.php:236
+#: src/Module/Settings/Profile/Index.php:238
 msgid "Display name:"
 msgstr "Anzeigename:"
 
-#: src/Module/Settings/Profile/Index.php:239
+#: src/Module/Settings/Profile/Index.php:241
 msgid "Street Address:"
 msgstr "Adresse:"
 
-#: src/Module/Settings/Profile/Index.php:240
+#: src/Module/Settings/Profile/Index.php:242
 msgid "Locality/City:"
 msgstr "Wohnort:"
 
-#: src/Module/Settings/Profile/Index.php:241
+#: src/Module/Settings/Profile/Index.php:243
 msgid "Region/State:"
 msgstr "Region/Bundesstaat:"
 
-#: src/Module/Settings/Profile/Index.php:242
+#: src/Module/Settings/Profile/Index.php:244
 msgid "Postal/Zip Code:"
 msgstr "Postleitzahl:"
 
-#: src/Module/Settings/Profile/Index.php:243
+#: src/Module/Settings/Profile/Index.php:245
 msgid "Country:"
 msgstr "Land:"
 
-#: src/Module/Settings/Profile/Index.php:245
+#: src/Module/Settings/Profile/Index.php:247
 msgid "XMPP (Jabber) address:"
 msgstr "XMPP (Jabber) Adresse"
 
-#: src/Module/Settings/Profile/Index.php:245
+#: src/Module/Settings/Profile/Index.php:247
 msgid ""
 "The XMPP address will be published so that people can follow you there."
 msgstr "Die XMPP Adresse wird veröffentlicht, damit man dort mit dir kommunizieren kann."
 
-#: src/Module/Settings/Profile/Index.php:246
+#: src/Module/Settings/Profile/Index.php:248
 msgid "Matrix (Element) address:"
 msgstr "Matrix (Element) Adresse:"
 
-#: src/Module/Settings/Profile/Index.php:246
+#: src/Module/Settings/Profile/Index.php:248
 msgid ""
 "The Matrix address will be published so that people can follow you there."
 msgstr "Die Matrix Adresse wird veröffentlicht, damit man dort mit dir kommunizieren kann."
 
-#: src/Module/Settings/Profile/Index.php:247
+#: src/Module/Settings/Profile/Index.php:249
 msgid "Homepage URL:"
 msgstr "Adresse der Homepage:"
 
-#: src/Module/Settings/Profile/Index.php:248
+#: src/Module/Settings/Profile/Index.php:250
 msgid "Public Keywords:"
 msgstr "Öffentliche Schlüsselwörter:"
 
-#: src/Module/Settings/Profile/Index.php:248
+#: src/Module/Settings/Profile/Index.php:250
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)"
 
-#: src/Module/Settings/Profile/Index.php:249
+#: src/Module/Settings/Profile/Index.php:251
 msgid "Private Keywords:"
 msgstr "Private Schlüsselwörter:"
 
-#: src/Module/Settings/Profile/Index.php:249
+#: src/Module/Settings/Profile/Index.php:251
 msgid "(Used for searching profiles, never shown to others)"
 msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"
 
-#: src/Module/Settings/Profile/Index.php:250
+#: src/Module/Settings/Profile/Index.php:252
 #, php-format
 msgid ""
 "<p>Custom fields appear on <a href=\"%s\">your profile page</a>.</p>\n"
@@ -9304,42 +9314,42 @@ msgid ""
 "\t\t\t\t<p>Non-public fields can only be seen by the selected Friendica contacts or the Friendica contacts in the selected groups.</p>"
 msgstr "<p>Die benutzerdefinierten Felder erscheinen auf <a href=\"%s\">deiner Profil-Seite</a></p>.\n\n<p>BBCode kann verwendet werden</p>\n<p>Die Reihenfolge der Felder kann durch Ziehen des Feld-Titels mit der Maus angepasst werden.</p>\n<p>Wird die Bezeichnung des Felds geleert, wird das Feld beim Speichern aus dem Profil entfernt.</p>\n<p>Nicht öffentliche Felder können nur von den ausgewählten Friendica Kontakte  gesehen werden.</p>"
 
-#: src/Module/Settings/Profile/Photo/Crop.php:106
-#: src/Module/Settings/Profile/Photo/Crop.php:124
-#: src/Module/Settings/Profile/Photo/Crop.php:142
+#: src/Module/Settings/Profile/Photo/Crop.php:108
+#: src/Module/Settings/Profile/Photo/Crop.php:126
+#: src/Module/Settings/Profile/Photo/Crop.php:144
 #: src/Module/Settings/Profile/Photo/Index.php:102
 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr "Verkleinern der Bildgröße von [%s] scheiterte."
 
-#: src/Module/Settings/Profile/Photo/Crop.php:149
+#: src/Module/Settings/Profile/Photo/Crop.php:151
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird."
 
-#: src/Module/Settings/Profile/Photo/Crop.php:154
+#: src/Module/Settings/Profile/Photo/Crop.php:156
 msgid "Unable to process image"
 msgstr "Bild konnte nicht verarbeitet werden"
 
-#: src/Module/Settings/Profile/Photo/Crop.php:173
+#: src/Module/Settings/Profile/Photo/Crop.php:175
 msgid "Photo not found."
 msgstr "Foto nicht gefunden"
 
-#: src/Module/Settings/Profile/Photo/Crop.php:195
+#: src/Module/Settings/Profile/Photo/Crop.php:197
 msgid "Profile picture successfully updated."
 msgstr "Profilbild erfolgreich aktualisiert."
 
-#: src/Module/Settings/Profile/Photo/Crop.php:221
-#: src/Module/Settings/Profile/Photo/Crop.php:225
+#: src/Module/Settings/Profile/Photo/Crop.php:223
+#: src/Module/Settings/Profile/Photo/Crop.php:227
 msgid "Crop Image"
 msgstr "Bild zurechtschneiden"
 
-#: src/Module/Settings/Profile/Photo/Crop.php:222
+#: src/Module/Settings/Profile/Photo/Crop.php:224
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann."
 
-#: src/Module/Settings/Profile/Photo/Crop.php:224
+#: src/Module/Settings/Profile/Photo/Crop.php:226
 msgid "Use Image As Is"
 msgstr "Bild wie es ist verwenden"
 
@@ -9956,263 +9966,6 @@ msgid ""
 " features and resources."
 msgstr "Unsere <strong>Hilfe</strong>-Seiten können herangezogen werden, um weitere Einzelheiten zu anderen Programm-Features zu erhalten."
 
-#: src/Navigation/Notifications/Depository/Notify.php:192
-#: src/Navigation/Notifications/Depository/Notify.php:675
-msgid "[Friendica:Notify]"
-msgstr "[Friendica Meldung]"
-
-#: src/Navigation/Notifications/Depository/Notify.php:256
-#, php-format
-msgid "%s New mail received at %s"
-msgstr "%sNeue Nachricht auf %s empfangen"
-
-#: src/Navigation/Notifications/Depository/Notify.php:258
-#, php-format
-msgid "%1$s sent you a new private message at %2$s."
-msgstr "%1$s hat dir eine neue, private Nachricht auf %2$s geschickt."
-
-#: src/Navigation/Notifications/Depository/Notify.php:259
-msgid "a private message"
-msgstr "eine private Nachricht"
-
-#: src/Navigation/Notifications/Depository/Notify.php:259
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s schickte dir %2$s."
-
-#: src/Navigation/Notifications/Depository/Notify.php:261
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "Bitte besuche %s, um Deine privaten Nachrichten anzusehen und/oder zu beantworten."
-
-#: src/Navigation/Notifications/Depository/Notify.php:292
-#, php-format
-msgid "%1$s commented on %2$s's %3$s %4$s"
-msgstr "%1$s kommentierte %2$s's %3$s%4$s"
-
-#: src/Navigation/Notifications/Depository/Notify.php:297
-#, php-format
-msgid "%1$s commented on your %2$s %3$s"
-msgstr "%1$s kommentierte auf  (%2$s) %3$s"
-
-#: src/Navigation/Notifications/Depository/Notify.php:301
-#, php-format
-msgid "%1$s commented on their %2$s %3$s"
-msgstr "%1$s hat den eigenen %2$s %3$s kommentiert"
-
-#: src/Navigation/Notifications/Depository/Notify.php:305
-#: src/Navigation/Notifications/Depository/Notify.php:710
-#, php-format
-msgid "%1$s Comment to conversation #%2$d by %3$s"
-msgstr "%1$sKommentar von %3$s auf Unterhaltung %2$d"
-
-#: src/Navigation/Notifications/Depository/Notify.php:307
-#, php-format
-msgid "%s commented on an item/conversation you have been following."
-msgstr "%s hat einen Beitrag kommentiert, dem du folgst."
-
-#: src/Navigation/Notifications/Depository/Notify.php:311
-#: src/Navigation/Notifications/Depository/Notify.php:326
-#: src/Navigation/Notifications/Depository/Notify.php:345
-#: src/Navigation/Notifications/Depository/Notify.php:725
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren."
-
-#: src/Navigation/Notifications/Depository/Notify.php:318
-#, php-format
-msgid "%s %s posted to your profile wall"
-msgstr "%s%s hat auf deine Pinnwand gepostet"
-
-#: src/Navigation/Notifications/Depository/Notify.php:320
-#, php-format
-msgid "%1$s posted to your profile wall at %2$s"
-msgstr "%1$s schrieb um %2$s auf Deine Pinnwand"
-
-#: src/Navigation/Notifications/Depository/Notify.php:321
-#, php-format
-msgid "%1$s posted to [url=%2$s]your wall[/url]"
-msgstr "%1$s hat etwas auf [url=%2$s]Deiner Pinnwand[/url] gepostet"
-
-#: src/Navigation/Notifications/Depository/Notify.php:333
-#, php-format
-msgid "%1$s %2$s poked you"
-msgstr "%1$s%2$shat dich angestubst"
-
-#: src/Navigation/Notifications/Depository/Notify.php:335
-#, php-format
-msgid "%1$s poked you at %2$s"
-msgstr "%1$s hat dich auf %2$s angestupst"
-
-#: src/Navigation/Notifications/Depository/Notify.php:336
-#, php-format
-msgid "%1$s [url=%2$s]poked you[/url]."
-msgstr "%1$s [url=%2$s]hat dich angestupst[/url]."
-
-#: src/Navigation/Notifications/Depository/Notify.php:353
-#, php-format
-msgid "%s Introduction received"
-msgstr "%sVorstellung erhalten"
-
-#: src/Navigation/Notifications/Depository/Notify.php:355
-#, php-format
-msgid "You've received an introduction from '%1$s' at %2$s"
-msgstr "Du hast eine Kontaktanfrage von '%1$s' auf %2$s erhalten"
-
-#: src/Navigation/Notifications/Depository/Notify.php:356
-#, php-format
-msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
-msgstr "Du hast eine [url=%1$s]Kontaktanfrage[/url] von %2$s erhalten."
-
-#: src/Navigation/Notifications/Depository/Notify.php:361
-#: src/Navigation/Notifications/Depository/Notify.php:407
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "Hier kannst du das Profil betrachten: %s"
-
-#: src/Navigation/Notifications/Depository/Notify.php:363
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
-msgstr "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen."
-
-#: src/Navigation/Notifications/Depository/Notify.php:370
-#, php-format
-msgid "%s A new person is sharing with you"
-msgstr "%sEine neue Person teilt nun mit dir"
-
-#: src/Navigation/Notifications/Depository/Notify.php:372
-#: src/Navigation/Notifications/Depository/Notify.php:373
-#, php-format
-msgid "%1$s is sharing with you at %2$s"
-msgstr "%1$s teilt mit dir auf %2$s"
-
-#: src/Navigation/Notifications/Depository/Notify.php:380
-#, php-format
-msgid "%s You have a new follower"
-msgstr "%sDu hast einen neuen Kontakt"
-
-#: src/Navigation/Notifications/Depository/Notify.php:382
-#: src/Navigation/Notifications/Depository/Notify.php:383
-#, php-format
-msgid "You have a new follower at %2$s : %1$s"
-msgstr "Du hast einen neuen Kontakt auf %2$s: %1$s"
-
-#: src/Navigation/Notifications/Depository/Notify.php:396
-#, php-format
-msgid "%s Friend suggestion received"
-msgstr "%sKontaktvorschlag erhalten"
-
-#: src/Navigation/Notifications/Depository/Notify.php:398
-#, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
-msgstr "Du hast einen Kontakt-Vorschlag von '%1$s' auf %2$s erhalten"
-
-#: src/Navigation/Notifications/Depository/Notify.php:399
-#, php-format
-msgid ""
-"You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
-msgstr "Du hast einen [url=%1$s]Kontakt-Vorschlag[/url] %2$s von %3$s erhalten."
-
-#: src/Navigation/Notifications/Depository/Notify.php:405
-msgid "Name:"
-msgstr "Name:"
-
-#: src/Navigation/Notifications/Depository/Notify.php:406
-msgid "Photo:"
-msgstr "Foto:"
-
-#: src/Navigation/Notifications/Depository/Notify.php:409
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen."
-
-#: src/Navigation/Notifications/Depository/Notify.php:417
-#: src/Navigation/Notifications/Depository/Notify.php:432
-#, php-format
-msgid "%s Connection accepted"
-msgstr "%sKontaktanfrage bestätigt"
-
-#: src/Navigation/Notifications/Depository/Notify.php:419
-#: src/Navigation/Notifications/Depository/Notify.php:434
-#, php-format
-msgid "'%1$s' has accepted your connection request at %2$s"
-msgstr "'%1$s' hat Deine Kontaktanfrage auf  %2$s bestätigt"
-
-#: src/Navigation/Notifications/Depository/Notify.php:420
-#: src/Navigation/Notifications/Depository/Notify.php:435
-#, php-format
-msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
-msgstr "%2$s hat Deine [url=%1$s]Kontaktanfrage[/url] akzeptiert."
-
-#: src/Navigation/Notifications/Depository/Notify.php:425
-msgid ""
-"You are now mutual friends and may exchange status updates, photos, and "
-"email without restriction."
-msgstr "Ihr seid nun beidseitige Kontakte und könnt Statusmitteilungen, Bilder und E-Mails ohne Einschränkungen austauschen."
-
-#: src/Navigation/Notifications/Depository/Notify.php:427
-#, php-format
-msgid "Please visit %s if you wish to make any changes to this relationship."
-msgstr "Bitte besuche %s, wenn du Änderungen an eurer Beziehung vornehmen willst."
-
-#: src/Navigation/Notifications/Depository/Notify.php:440
-#, php-format
-msgid ""
-"'%1$s' has chosen to accept you a fan, which restricts some forms of "
-"communication - such as private messaging and some profile interactions. If "
-"this is a celebrity or community page, these settings were applied "
-"automatically."
-msgstr "'%1$s' hat sich entschieden dich als Fan zu akzeptieren, dies schränkt einige Kommunikationswege - wie private Nachrichten und einige Interaktionsmöglichkeiten auf der Profilseite - ein. Wenn dies eine Berühmtheiten- oder Gemeinschaftsseite ist, werden diese Einstellungen automatisch vorgenommen."
-
-#: src/Navigation/Notifications/Depository/Notify.php:442
-#, php-format
-msgid ""
-"'%1$s' may choose to extend this into a two-way or more permissive "
-"relationship in the future."
-msgstr "'%1$s' kann den Kontaktstatus zu einem späteren Zeitpunkt erweitern und diese Einschränkungen aufheben. "
-
-#: src/Navigation/Notifications/Depository/Notify.php:444
-#, php-format
-msgid "Please visit %s  if you wish to make any changes to this relationship."
-msgstr "Bitte besuche %s, wenn du Änderungen an eurer Beziehung vornehmen willst."
-
-#: src/Navigation/Notifications/Depository/Notify.php:454
-msgid "registration request"
-msgstr "Registrierungsanfrage"
-
-#: src/Navigation/Notifications/Depository/Notify.php:456
-#, php-format
-msgid "You've received a registration request from '%1$s' at %2$s"
-msgstr "Du hast eine Registrierungsanfrage von %2$s auf '%1$s' erhalten"
-
-#: src/Navigation/Notifications/Depository/Notify.php:457
-#, php-format
-msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
-msgstr "Du hast eine [url=%1$s]Registrierungsanfrage[/url] von %2$s erhalten."
-
-#: src/Navigation/Notifications/Depository/Notify.php:462
-#, php-format
-msgid ""
-"Full Name:\t%s\n"
-"Site Location:\t%s\n"
-"Login Name:\t%s (%s)"
-msgstr "Kompletter Name: %s\nURL der Seite: %s\nLogin Name: %s(%s)"
-
-#: src/Navigation/Notifications/Depository/Notify.php:468
-#, php-format
-msgid "Please visit %s to approve or reject the request."
-msgstr "Bitte besuche %s, um die Anfrage zu bearbeiten."
-
-#: src/Navigation/Notifications/Depository/Notify.php:704
-#, php-format
-msgid "%s %s tagged you"
-msgstr "%s %s hat dich erwähnt"
-
-#: src/Navigation/Notifications/Depository/Notify.php:707
-#, php-format
-msgid "%s %s shared a new post"
-msgstr "%s%shat einen Beitrag geteilt"
-
 #: src/Navigation/Notifications/Factory/FormattedNotification.php:89
 #, php-format
 msgid "%s liked %s's post"
@@ -10371,6 +10124,263 @@ msgstr "%1$s hat den Beitrag %2$s geteilt"
 msgid "%1$s shared a post"
 msgstr "%1$s hat einen Beitrag geteilt"
 
+#: src/Navigation/Notifications/Repository/Notify.php:192
+#: src/Navigation/Notifications/Repository/Notify.php:675
+msgid "[Friendica:Notify]"
+msgstr "[Friendica Meldung]"
+
+#: src/Navigation/Notifications/Repository/Notify.php:256
+#, php-format
+msgid "%s New mail received at %s"
+msgstr "%sNeue Nachricht auf %s empfangen"
+
+#: src/Navigation/Notifications/Repository/Notify.php:258
+#, php-format
+msgid "%1$s sent you a new private message at %2$s."
+msgstr "%1$s hat dir eine neue, private Nachricht auf %2$s geschickt."
+
+#: src/Navigation/Notifications/Repository/Notify.php:259
+msgid "a private message"
+msgstr "eine private Nachricht"
+
+#: src/Navigation/Notifications/Repository/Notify.php:259
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s schickte dir %2$s."
+
+#: src/Navigation/Notifications/Repository/Notify.php:261
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Bitte besuche %s, um Deine privaten Nachrichten anzusehen und/oder zu beantworten."
+
+#: src/Navigation/Notifications/Repository/Notify.php:292
+#, php-format
+msgid "%1$s commented on %2$s's %3$s %4$s"
+msgstr "%1$s kommentierte %2$s's %3$s%4$s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:297
+#, php-format
+msgid "%1$s commented on your %2$s %3$s"
+msgstr "%1$s kommentierte auf  (%2$s) %3$s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:301
+#, php-format
+msgid "%1$s commented on their %2$s %3$s"
+msgstr "%1$s hat den eigenen %2$s %3$s kommentiert"
+
+#: src/Navigation/Notifications/Repository/Notify.php:305
+#: src/Navigation/Notifications/Repository/Notify.php:710
+#, php-format
+msgid "%1$s Comment to conversation #%2$d by %3$s"
+msgstr "%1$sKommentar von %3$s auf Unterhaltung %2$d"
+
+#: src/Navigation/Notifications/Repository/Notify.php:307
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
+msgstr "%s hat einen Beitrag kommentiert, dem du folgst."
+
+#: src/Navigation/Notifications/Repository/Notify.php:311
+#: src/Navigation/Notifications/Repository/Notify.php:326
+#: src/Navigation/Notifications/Repository/Notify.php:345
+#: src/Navigation/Notifications/Repository/Notify.php:725
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren."
+
+#: src/Navigation/Notifications/Repository/Notify.php:318
+#, php-format
+msgid "%s %s posted to your profile wall"
+msgstr "%s%s hat auf deine Pinnwand gepostet"
+
+#: src/Navigation/Notifications/Repository/Notify.php:320
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
+msgstr "%1$s schrieb um %2$s auf Deine Pinnwand"
+
+#: src/Navigation/Notifications/Repository/Notify.php:321
+#, php-format
+msgid "%1$s posted to [url=%2$s]your wall[/url]"
+msgstr "%1$s hat etwas auf [url=%2$s]Deiner Pinnwand[/url] gepostet"
+
+#: src/Navigation/Notifications/Repository/Notify.php:333
+#, php-format
+msgid "%1$s %2$s poked you"
+msgstr "%1$s%2$shat dich angestubst"
+
+#: src/Navigation/Notifications/Repository/Notify.php:335
+#, php-format
+msgid "%1$s poked you at %2$s"
+msgstr "%1$s hat dich auf %2$s angestupst"
+
+#: src/Navigation/Notifications/Repository/Notify.php:336
+#, php-format
+msgid "%1$s [url=%2$s]poked you[/url]."
+msgstr "%1$s [url=%2$s]hat dich angestupst[/url]."
+
+#: src/Navigation/Notifications/Repository/Notify.php:353
+#, php-format
+msgid "%s Introduction received"
+msgstr "%sVorstellung erhalten"
+
+#: src/Navigation/Notifications/Repository/Notify.php:355
+#, php-format
+msgid "You've received an introduction from '%1$s' at %2$s"
+msgstr "Du hast eine Kontaktanfrage von '%1$s' auf %2$s erhalten"
+
+#: src/Navigation/Notifications/Repository/Notify.php:356
+#, php-format
+msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+msgstr "Du hast eine [url=%1$s]Kontaktanfrage[/url] von %2$s erhalten."
+
+#: src/Navigation/Notifications/Repository/Notify.php:361
+#: src/Navigation/Notifications/Repository/Notify.php:407
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Hier kannst du das Profil betrachten: %s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:363
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen."
+
+#: src/Navigation/Notifications/Repository/Notify.php:370
+#, php-format
+msgid "%s A new person is sharing with you"
+msgstr "%sEine neue Person teilt nun mit dir"
+
+#: src/Navigation/Notifications/Repository/Notify.php:372
+#: src/Navigation/Notifications/Repository/Notify.php:373
+#, php-format
+msgid "%1$s is sharing with you at %2$s"
+msgstr "%1$s teilt mit dir auf %2$s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:380
+#, php-format
+msgid "%s You have a new follower"
+msgstr "%sDu hast einen neuen Kontakt"
+
+#: src/Navigation/Notifications/Repository/Notify.php:382
+#: src/Navigation/Notifications/Repository/Notify.php:383
+#, php-format
+msgid "You have a new follower at %2$s : %1$s"
+msgstr "Du hast einen neuen Kontakt auf %2$s: %1$s"
+
+#: src/Navigation/Notifications/Repository/Notify.php:396
+#, php-format
+msgid "%s Friend suggestion received"
+msgstr "%sKontaktvorschlag erhalten"
+
+#: src/Navigation/Notifications/Repository/Notify.php:398
+#, php-format
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
+msgstr "Du hast einen Kontakt-Vorschlag von '%1$s' auf %2$s erhalten"
+
+#: src/Navigation/Notifications/Repository/Notify.php:399
+#, php-format
+msgid ""
+"You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
+msgstr "Du hast einen [url=%1$s]Kontakt-Vorschlag[/url] %2$s von %3$s erhalten."
+
+#: src/Navigation/Notifications/Repository/Notify.php:405
+msgid "Name:"
+msgstr "Name:"
+
+#: src/Navigation/Notifications/Repository/Notify.php:406
+msgid "Photo:"
+msgstr "Foto:"
+
+#: src/Navigation/Notifications/Repository/Notify.php:409
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen."
+
+#: src/Navigation/Notifications/Repository/Notify.php:417
+#: src/Navigation/Notifications/Repository/Notify.php:432
+#, php-format
+msgid "%s Connection accepted"
+msgstr "%sKontaktanfrage bestätigt"
+
+#: src/Navigation/Notifications/Repository/Notify.php:419
+#: src/Navigation/Notifications/Repository/Notify.php:434
+#, php-format
+msgid "'%1$s' has accepted your connection request at %2$s"
+msgstr "'%1$s' hat Deine Kontaktanfrage auf  %2$s bestätigt"
+
+#: src/Navigation/Notifications/Repository/Notify.php:420
+#: src/Navigation/Notifications/Repository/Notify.php:435
+#, php-format
+msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
+msgstr "%2$s hat Deine [url=%1$s]Kontaktanfrage[/url] akzeptiert."
+
+#: src/Navigation/Notifications/Repository/Notify.php:425
+msgid ""
+"You are now mutual friends and may exchange status updates, photos, and "
+"email without restriction."
+msgstr "Ihr seid nun beidseitige Kontakte und könnt Statusmitteilungen, Bilder und E-Mails ohne Einschränkungen austauschen."
+
+#: src/Navigation/Notifications/Repository/Notify.php:427
+#, php-format
+msgid "Please visit %s if you wish to make any changes to this relationship."
+msgstr "Bitte besuche %s, wenn du Änderungen an eurer Beziehung vornehmen willst."
+
+#: src/Navigation/Notifications/Repository/Notify.php:440
+#, php-format
+msgid ""
+"'%1$s' has chosen to accept you a fan, which restricts some forms of "
+"communication - such as private messaging and some profile interactions. If "
+"this is a celebrity or community page, these settings were applied "
+"automatically."
+msgstr "'%1$s' hat sich entschieden dich als Fan zu akzeptieren, dies schränkt einige Kommunikationswege - wie private Nachrichten und einige Interaktionsmöglichkeiten auf der Profilseite - ein. Wenn dies eine Berühmtheiten- oder Gemeinschaftsseite ist, werden diese Einstellungen automatisch vorgenommen."
+
+#: src/Navigation/Notifications/Repository/Notify.php:442
+#, php-format
+msgid ""
+"'%1$s' may choose to extend this into a two-way or more permissive "
+"relationship in the future."
+msgstr "'%1$s' kann den Kontaktstatus zu einem späteren Zeitpunkt erweitern und diese Einschränkungen aufheben. "
+
+#: src/Navigation/Notifications/Repository/Notify.php:444
+#, php-format
+msgid "Please visit %s  if you wish to make any changes to this relationship."
+msgstr "Bitte besuche %s, wenn du Änderungen an eurer Beziehung vornehmen willst."
+
+#: src/Navigation/Notifications/Repository/Notify.php:454
+msgid "registration request"
+msgstr "Registrierungsanfrage"
+
+#: src/Navigation/Notifications/Repository/Notify.php:456
+#, php-format
+msgid "You've received a registration request from '%1$s' at %2$s"
+msgstr "Du hast eine Registrierungsanfrage von %2$s auf '%1$s' erhalten"
+
+#: src/Navigation/Notifications/Repository/Notify.php:457
+#, php-format
+msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
+msgstr "Du hast eine [url=%1$s]Registrierungsanfrage[/url] von %2$s erhalten."
+
+#: src/Navigation/Notifications/Repository/Notify.php:462
+#, php-format
+msgid ""
+"Full Name:\t%s\n"
+"Site Location:\t%s\n"
+"Login Name:\t%s (%s)"
+msgstr "Kompletter Name: %s\nURL der Seite: %s\nLogin Name: %s(%s)"
+
+#: src/Navigation/Notifications/Repository/Notify.php:468
+#, php-format
+msgid "Please visit %s to approve or reject the request."
+msgstr "Bitte besuche %s, um die Anfrage zu bearbeiten."
+
+#: src/Navigation/Notifications/Repository/Notify.php:704
+#, php-format
+msgid "%s %s tagged you"
+msgstr "%s %s hat dich erwähnt"
+
+#: src/Navigation/Notifications/Repository/Notify.php:707
+#, php-format
+msgid "%s %s shared a new post"
+msgstr "%s%shat einen Beitrag geteilt"
+
 #: src/Object/EMail/ItemCCEMail.php:42
 #, php-format
 msgid ""
@@ -10725,7 +10735,7 @@ msgstr "in %1$d %2$s"
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s her"
 
-#: src/Worker/Delivery.php:521
+#: src/Worker/Delivery.php:525
 msgid "(no subject)"
 msgstr "(kein Betreff)"
 
diff --git a/view/lang/de/strings.php b/view/lang/de/strings.php
index fc3bcf0c9..7b423fe6b 100644
--- a/view/lang/de/strings.php
+++ b/view/lang/de/strings.php
@@ -1491,6 +1491,8 @@ $a->strings['Explicit Content'] = 'Sensibler Inhalt';
 $a->strings['Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page.'] = 'Wähle dies, um anzuzeigen, dass dein Knoten hauptsächlich für explizite Inhalte verwendet wird, die möglicherweise nicht für Minderjährige geeignet sind. Diese Info wird in der Knoteninformation veröffentlicht und kann durch das Globale Verzeichnis genutzt werden, um deinen Knoten von den Auflistungen auszuschließen. Zusätzlich wird auf der Registrierungsseite ein Hinweis darüber angezeigt.';
 $a->strings['Proxify external content'] = 'Proxy für externe Inhalte';
 $a->strings['Route external content via the proxy functionality. This is used for example for some OEmbed accesses and in some other rare cases.'] = 'Externe Inhalte werden durch einen Proxy geleitet. Die wird z.B. für das aufrufen von OEmbed Inhalten verwendet und einigen anderen seltenen Fällen.';
+$a->strings['Cache contact avatars'] = 'Kontaktprofilbilder zwischenspeichern';
+$a->strings['Locally store the avatar pictures of the contacts. This uses a lot of storage space but it increases the performance.'] = 'Die Profilbilder der Kontakte zwischenspeichern. Der Zwischenspeicher verbraucht viel Platz im Speicherplatz, verbessert aber die Performance.';
 $a->strings['Allow Users to set remote_self'] = 'Nutzern erlauben, das remote_self Flag zu setzen';
 $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.'] = 'Ist dies ausgewählt, kann jeder Nutzer jeden seiner Kontakte als remote_self (entferntes Konto) im "Erweitert"-Reiter der Kontaktansicht markieren. Nach dem Setzen dieses Flags werden alle Top-Level-Beiträge dieser Kontakte automatisch in den Stream dieses Nutzers gepostet (gespiegelt).';
 $a->strings['Enable multiple registrations'] = 'Erlaube Mehrfachregistrierung';
@@ -2457,6 +2459,38 @@ $a->strings['Friendica respects your privacy. By default, your posts will only s
 $a->strings['Getting Help'] = 'Hilfe bekommen';
 $a->strings['Go to the Help Section'] = 'Zum Hilfe Abschnitt gehen';
 $a->strings['Our <strong>help</strong> pages may be consulted for detail on other program features and resources.'] = 'Unsere <strong>Hilfe</strong>-Seiten können herangezogen werden, um weitere Einzelheiten zu anderen Programm-Features zu erhalten.';
+$a->strings['%s liked %s\'s post'] = '%s mag %ss Beitrag';
+$a->strings['%s disliked %s\'s post'] = '%s mag %ss Beitrag nicht';
+$a->strings['%s is attending %s\'s event'] = '%s nimmt an %s\'s Event teil';
+$a->strings['%s is not attending %s\'s event'] = '%s nimmt nicht an %s\'s Event teil';
+$a->strings['%s may attending %s\'s event'] = '%s nimmt eventuell an %s\'s Veranstaltung teil';
+$a->strings['%s is now friends with %s'] = '%s ist jetzt mit %s befreundet';
+$a->strings['%s commented on %s\'s post'] = '%s hat %ss Beitrag kommentiert';
+$a->strings['%s created a new post'] = '%s hat einen neuen Beitrag erstellt';
+$a->strings['Friend Suggestion'] = 'Kontaktvorschlag';
+$a->strings['Friend/Connect Request'] = 'Kontakt-/Freundschaftsanfrage';
+$a->strings['New Follower'] = 'Neuer Bewunderer';
+$a->strings['%1$s wants to follow you'] = '%1$s möchte dir folgen';
+$a->strings['%1$s had started following you'] = '%1$s hat angefangen dir zu folgen';
+$a->strings['%1$s liked your comment %2$s'] = '%1$s mag deinen Kommentar %2$s';
+$a->strings['%1$s liked your post %2$s'] = '%1$s mag deinen Beitrag %2$s';
+$a->strings['%1$s disliked your comment %2$s'] = '%1$s mag deinen Kommentar %2$s nicht';
+$a->strings['%1$s disliked your post %2$s'] = '%1$s mag deinen Beitrag %2$s nicht';
+$a->strings['%1$s shared your comment %2$s'] = '%1$s hat deinen Kommentar %2$s geteilt';
+$a->strings['%1$s shared your post %2$s'] = '%1$s hat deinen Beitrag %2$s geteilt';
+$a->strings['%1$s tagged you on %2$s'] = '%1$s erwähnte dich auf %2$s';
+$a->strings['%1$s replied to you on %2$s'] = '%1$s hat dir auf %2$s geantwortet';
+$a->strings['%1$s commented in your thread %2$s'] = '%1$s hat deine Unterhaltung %2$s kommentiert';
+$a->strings['%1$s commented on your comment %2$s'] = '%1$s hat deinen Kommentar %2$s kommentiert';
+$a->strings['%1$s commented in their thread %2$s'] = '%1$s hat in der eigenen Unterhaltung %2$s kommentiert';
+$a->strings['%1$s commented in their thread'] = '%1$s kommentierte in der eigenen Unterhaltung';
+$a->strings['%1$s commented in the thread %2$s from %3$s'] = '%1$s hat in der Unterhaltung %2$s von %3$s kommentiert';
+$a->strings['%1$s commented in the thread from %3$s'] = '%1$s hat in der Unterhaltung von %3$s kommentiert';
+$a->strings['%1$s commented on your thread %2$s'] = '%1$s hat in deiner Unterhaltung %2$s kommentiert';
+$a->strings['%1$s shared the post %2$s from %3$s'] = '%1$s hat den Beitrag %2$s von %3$s geteilt';
+$a->strings['%1$s shared a post from %3$s'] = '%1$s hat einen Beitrag von %3$s geteilt';
+$a->strings['%1$s shared the post %2$s'] = '%1$s hat den Beitrag %2$s geteilt';
+$a->strings['%1$s shared a post'] = '%1$s hat einen Beitrag geteilt';
 $a->strings['[Friendica:Notify]'] = '[Friendica Meldung]';
 $a->strings['%s New mail received at %s'] = '%sNeue Nachricht auf %s empfangen';
 $a->strings['%1$s sent you a new private message at %2$s.'] = '%1$s hat dir eine neue, private Nachricht auf %2$s geschickt.';
@@ -2509,38 +2543,6 @@ Login Name: %s(%s)';
 $a->strings['Please visit %s to approve or reject the request.'] = 'Bitte besuche %s, um die Anfrage zu bearbeiten.';
 $a->strings['%s %s tagged you'] = '%s %s hat dich erwähnt';
 $a->strings['%s %s shared a new post'] = '%s%shat einen Beitrag geteilt';
-$a->strings['%s liked %s\'s post'] = '%s mag %ss Beitrag';
-$a->strings['%s disliked %s\'s post'] = '%s mag %ss Beitrag nicht';
-$a->strings['%s is attending %s\'s event'] = '%s nimmt an %s\'s Event teil';
-$a->strings['%s is not attending %s\'s event'] = '%s nimmt nicht an %s\'s Event teil';
-$a->strings['%s may attending %s\'s event'] = '%s nimmt eventuell an %s\'s Veranstaltung teil';
-$a->strings['%s is now friends with %s'] = '%s ist jetzt mit %s befreundet';
-$a->strings['%s commented on %s\'s post'] = '%s hat %ss Beitrag kommentiert';
-$a->strings['%s created a new post'] = '%s hat einen neuen Beitrag erstellt';
-$a->strings['Friend Suggestion'] = 'Kontaktvorschlag';
-$a->strings['Friend/Connect Request'] = 'Kontakt-/Freundschaftsanfrage';
-$a->strings['New Follower'] = 'Neuer Bewunderer';
-$a->strings['%1$s wants to follow you'] = '%1$s möchte dir folgen';
-$a->strings['%1$s had started following you'] = '%1$s hat angefangen dir zu folgen';
-$a->strings['%1$s liked your comment %2$s'] = '%1$s mag deinen Kommentar %2$s';
-$a->strings['%1$s liked your post %2$s'] = '%1$s mag deinen Beitrag %2$s';
-$a->strings['%1$s disliked your comment %2$s'] = '%1$s mag deinen Kommentar %2$s nicht';
-$a->strings['%1$s disliked your post %2$s'] = '%1$s mag deinen Beitrag %2$s nicht';
-$a->strings['%1$s shared your comment %2$s'] = '%1$s hat deinen Kommentar %2$s geteilt';
-$a->strings['%1$s shared your post %2$s'] = '%1$s hat deinen Beitrag %2$s geteilt';
-$a->strings['%1$s tagged you on %2$s'] = '%1$s erwähnte dich auf %2$s';
-$a->strings['%1$s replied to you on %2$s'] = '%1$s hat dir auf %2$s geantwortet';
-$a->strings['%1$s commented in your thread %2$s'] = '%1$s hat deine Unterhaltung %2$s kommentiert';
-$a->strings['%1$s commented on your comment %2$s'] = '%1$s hat deinen Kommentar %2$s kommentiert';
-$a->strings['%1$s commented in their thread %2$s'] = '%1$s hat in der eigenen Unterhaltung %2$s kommentiert';
-$a->strings['%1$s commented in their thread'] = '%1$s kommentierte in der eigenen Unterhaltung';
-$a->strings['%1$s commented in the thread %2$s from %3$s'] = '%1$s hat in der Unterhaltung %2$s von %3$s kommentiert';
-$a->strings['%1$s commented in the thread from %3$s'] = '%1$s hat in der Unterhaltung von %3$s kommentiert';
-$a->strings['%1$s commented on your thread %2$s'] = '%1$s hat in deiner Unterhaltung %2$s kommentiert';
-$a->strings['%1$s shared the post %2$s from %3$s'] = '%1$s hat den Beitrag %2$s von %3$s geteilt';
-$a->strings['%1$s shared a post from %3$s'] = '%1$s hat einen Beitrag von %3$s geteilt';
-$a->strings['%1$s shared the post %2$s'] = '%1$s hat den Beitrag %2$s geteilt';
-$a->strings['%1$s shared a post'] = '%1$s hat einen Beitrag geteilt';
 $a->strings['This message was sent to you by %s, a member of the Friendica social network.'] = 'Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica.';
 $a->strings['You may visit them online at %s'] = 'Du kannst sie online unter %s besuchen';
 $a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Falls du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem du auf diese Nachricht antwortest.';
diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index a1226bdf8..985fa0222 100644
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@@ -116,6 +116,7 @@
 		{{include file="field_input.tpl" field=$dbclean_unclaimed}}
 		{{include file="field_input.tpl" field=$dbclean_expire_conv}}
 		{{include file="field_checkbox.tpl" field=$optimize_tables}}
+		{{include file="field_checkbox.tpl" field=$cache_contact_avatar}}
 		<div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
 		<h2>{{$worker_title}}</h2>
diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl
index f9ba252f9..a6eb1d670 100644
--- a/view/theme/frio/templates/admin/site.tpl
+++ b/view/theme/frio/templates/admin/site.tpl
@@ -251,6 +251,7 @@
 						{{include file="field_input.tpl" field=$dbclean_unclaimed}}
 						{{include file="field_input.tpl" field=$dbclean_expire_conv}}
 						{{include file="field_checkbox.tpl" field=$optimize_tables}}
+						{{include file="field_checkbox.tpl" field=$cache_contact_avatar}}
 					</div>
 					<div class="panel-footer">
 						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>