From 00883c9dcbebe6eb6fe11c504f0699d41e062503 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Tue, 15 Nov 2022 22:26:52 +0100
Subject: [PATCH 01/45] Move mod/editpost.php to src\Module\Post\Edit

---
 doc/Addons.md            |   8 +-
 doc/de/Addons.md         |   8 +-
 mod/editpost.php         | 166 ----------------------------
 src/Module/Post/Edit.php | 228 +++++++++++++++++++++++++++++++++++++++
 src/Object/Post.php      |   2 +-
 static/routes.config.php |   1 +
 6 files changed, 238 insertions(+), 175 deletions(-)
 delete mode 100644 mod/editpost.php
 create mode 100644 src/Module/Post/Edit.php

diff --git a/doc/Addons.md b/doc/Addons.md
index b43a8a915d..171b5681a1 100644
--- a/doc/Addons.md
+++ b/doc/Addons.md
@@ -790,10 +790,6 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep-
     Hook::callAll('post_local', $datarray);
     Hook::callAll('post_local_end', $datarray);
 
-### mod/editpost.php
-
-    Hook::callAll('jot_tool', $jotplugins);
-
 ### src/Render/FriendicaSmartyEngine.php
 
     Hook::callAll("template_vars", $arr);
@@ -855,6 +851,10 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep-
 
     Hook::callAll('lockview_content', $item);
 
+### src/Module/Post/Edit.php
+
+    Hook::callAll('jot_tool', $jotplugins);
+
 ### src/Module/Settings/Delegation.php
 
     Hook::callAll('authenticate', $addon_auth);
diff --git a/doc/de/Addons.md b/doc/de/Addons.md
index 342dd1b815..143e309cbb 100644
--- a/doc/de/Addons.md
+++ b/doc/de/Addons.md
@@ -309,10 +309,6 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
     Hook::callAll('post_local', $datarray);
     Hook::callAll('post_local_end', $datarray);
 
-### mod/editpost.php
-
-    Hook::callAll('jot_tool', $jotplugins);
-
 ### src/Network/FKOAuth1.php
 
     Hook::callAll('logged_in', $a->user);
@@ -422,6 +418,10 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
 
     Hook::callAll('lockview_content', $item);
 
+### src/Module/Post/Edit.php
+
+    Hook::callAll('jot_tool', $jotplugins);
+
 ### src/Worker/Directory.php
 
     Hook::callAll('globaldir_update', $arr);
diff --git a/mod/editpost.php b/mod/editpost.php
deleted file mode 100644
index bec5d3449e..0000000000
--- a/mod/editpost.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2022, 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/>.
- *
- */
-
-use Friendica\App;
-use Friendica\Content\Feature;
-use Friendica\Core\Hook;
-use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Model\Contact;
-use Friendica\Model\Post;
-use Friendica\Model\User;
-use Friendica\Util\Crypto;
-
-function editpost_content(App $a)
-{
-	$o = '';
-
-	if (!DI::userSession()->getLocalUserId()) {
-		DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
-		return;
-	}
-
-	$post_id = ((DI::args()->getArgc() > 1) ? intval(DI::args()->getArgv()[1]) : 0);
-
-	if (!$post_id) {
-		DI::sysmsg()->addNotice(DI::l10n()->t('Item not found'));
-		return;
-	}
-
-	$fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
-		'body', 'title', 'uri-id', 'wall', 'post-type', 'guid'];
-
-	$item = Post::selectFirstForUser(DI::userSession()->getLocalUserId(), $fields, ['id' => $post_id, 'uid' => DI::userSession()->getLocalUserId()]);
-
-	if (!DBA::isResult($item)) {
-		DI::sysmsg()->addNotice(DI::l10n()->t('Item not found'));
-		return;
-	}
-
-	$user = User::getById(DI::userSession()->getLocalUserId());
-
-	$geotag = '';
-
-	$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate("section_title.tpl"), [
-		'$title' => DI::l10n()->t('Edit post')
-	]);
-
-	$tpl = Renderer::getMarkupTemplate('jot-header.tpl');
-	DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
-		'$ispublic' => '&nbsp;', // DI::l10n()->t('Visible to <strong>everybody</strong>'),
-		'$geotag' => $geotag,
-		'$nickname' => $a->getLoggedInUserNickname(),
-		'$is_mobile' => DI::mode()->isMobile(),
-	]);
-
-	if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
-		$lockstate = 'lock';
-	} else {
-		$lockstate = 'unlock';
-	}
-
-	$jotplugins = '';
-	$jotnets = '';
-
-	Hook::callAll('jot_tool', $jotplugins);
-
-	$tpl = Renderer::getMarkupTemplate('jot.tpl');
-	$o .= Renderer::replaceMacros($tpl, [
-		'$is_edit' => true,
-		'$return_path' => '/display/' . $item['guid'],
-		'$action' => 'item',
-		'$share' => DI::l10n()->t('Save'),
-		'$loading' => DI::l10n()->t('Loading...'),
-		'$upload' => DI::l10n()->t('Upload photo'),
-		'$shortupload' => DI::l10n()->t('upload photo'),
-		'$attach' => DI::l10n()->t('Attach file'),
-		'$shortattach' => DI::l10n()->t('attach file'),
-		'$weblink' => DI::l10n()->t('Insert web link'),
-		'$shortweblink' => DI::l10n()->t('web link'),
-		'$video' => DI::l10n()->t('Insert video link'),
-		'$shortvideo' => DI::l10n()->t('video link'),
-		'$audio' => DI::l10n()->t('Insert audio link'),
-		'$shortaudio' => DI::l10n()->t('audio link'),
-		'$setloc' => DI::l10n()->t('Set your location'),
-		'$shortsetloc' => DI::l10n()->t('set location'),
-		'$noloc' => DI::l10n()->t('Clear browser location'),
-		'$shortnoloc' => DI::l10n()->t('clear location'),
-		'$wait' => DI::l10n()->t('Please wait'),
-		'$permset' => DI::l10n()->t('Permission settings'),
-		'$wall' => $item['wall'],
-		'$posttype' => $item['post-type'],
-		'$content' => undo_post_tagging($item['body']),
-		'$post_id' => $post_id,
-		'$defloc' => $user['default-location'],
-		'$visitor' => 'none',
-		'$pvisit' => 'none',
-		'$emailcc' => DI::l10n()->t('CC: email addresses'),
-		'$public' => DI::l10n()->t('Public post'),
-		'$jotnets' => $jotnets,
-		'$title' => $item['title'],
-		'$placeholdertitle' => DI::l10n()->t('Set title'),
-		'$category' => Post\Category::getCSVByURIId($item['uri-id'], DI::userSession()->getLocalUserId(), Post\Category::CATEGORY),
-		'$placeholdercategory' => (Feature::isEnabled(DI::userSession()->getLocalUserId(),'categories') ? DI::l10n()->t("Categories \x28comma-separated list\x29") : ''),
-		'$emtitle' => DI::l10n()->t('Example: bob@example.com, mary@example.com'),
-		'$lockstate' => $lockstate,
-		'$acl' => '', // populate_acl((($group) ? $group_acl : $a->user)),
-		'$bang' => ($lockstate === 'lock' ? '!' : ''),
-		'$profile_uid' => $_SESSION['uid'],
-		'$preview' => DI::l10n()->t('Preview'),
-		'$jotplugins' => $jotplugins,
-		'$cancel' => DI::l10n()->t('Cancel'),
-		'$rand_num' => Crypto::randomDigits(12),
-
-		// Formatting button labels
-		'$edbold'   => DI::l10n()->t('Bold'),
-		'$editalic' => DI::l10n()->t('Italic'),
-		'$eduline'  => DI::l10n()->t('Underline'),
-		'$edquote'  => DI::l10n()->t('Quote'),
-		'$edcode'   => DI::l10n()->t('Code'),
-		'$edurl'    => DI::l10n()->t('Link'),
-		'$edattach' => DI::l10n()->t('Link or Media'),
-
-		//jot nav tab (used in some themes)
-		'$message' => DI::l10n()->t('Message'),
-		'$browser' => DI::l10n()->t('Browser'),
-		'$shortpermset' => DI::l10n()->t('Permissions'),
-
-		'$compose_link_title' => DI::l10n()->t('Open Compose page'),
-	]);
-
-	return $o;
-}
-
-function undo_post_tagging($s) {
-	$matches = null;
-	$cnt = preg_match_all('/([!#@])\[url=(.*?)\](.*?)\[\/url\]/ism', $s, $matches, PREG_SET_ORDER);
-	if ($cnt) {
-		foreach ($matches as $mtch) {
-			if (in_array($mtch[1], ['!', '@'])) {
-				$contact = Contact::getByURL($mtch[2], false, ['addr']);
-				$mtch[3] = empty($contact['addr']) ? $mtch[2] : $contact['addr'];
-			}
-			$s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s);
-		}
-	}
-	return $s;
-}
diff --git a/src/Module/Post/Edit.php b/src/Module/Post/Edit.php
new file mode 100644
index 0000000000..5531cb249e
--- /dev/null
+++ b/src/Module/Post/Edit.php
@@ -0,0 +1,228 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2022, 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\Module\Post;
+
+use Friendica\App;
+use Friendica\BaseModule;
+use Friendica\Content\Feature;
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Model\Contact;
+use Friendica\Model\Post;
+use Friendica\Model\User;
+use Friendica\Module\Response;
+use Friendica\Navigation\SystemMessages;
+use Friendica\Network\HTTPException;
+use Friendica\Util\Crypto;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Controller to edit a post
+ */
+class Edit extends BaseModule
+{
+	/** @var IHandleUserSessions */
+	protected $session;
+	/** @var SystemMessages */
+	protected $sysMessages;
+	/** @var App\Page */
+	protected $page;
+	/** @var App\Mode */
+	protected $mode;
+	/** @var App */
+	protected $app;
+	/** @var bool */
+	protected $isModal = false;
+
+	public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, SystemMessages $sysMessages, App\Page $page, App\Mode $mode, App $app, array $server, array $parameters = [])
+	{
+		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+		$this->session     = $session;
+		$this->sysMessages = $sysMessages;
+		$this->page        = $page;
+		$this->mode        = $mode;
+		$this->app         = $app;
+	}
+
+
+	protected function content(array $request = []): string
+	{
+		$this->isModal = $request['mode'] ?? '' === 'none';
+
+		if (!$this->session->getLocalUserId()) {
+			$this->errorExit($this->t('Permission denied.'), HTTPException\UnauthorizedException::class);
+		}
+
+		$postId = $this->parameters['post_id'];
+
+		if (empty($postId)) {
+			$this->errorExit($this->t('Post not found.'), HTTPException\BadRequestException::class);
+		}
+
+		$fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
+				   'body', 'title', 'uri-id', 'wall', 'post-type', 'guid'];
+
+		$item = Post::selectFirstForUser($this->session->getLocalUserId(), $fields, [
+			'id'  => $postId,
+			'uid' => $this->session->getLocalUserId(),
+		]);
+
+		if (empty($item)) {
+			$this->errorExit($this->t('Post not found.'), HTTPException\BadRequestException::class);
+		}
+
+		$user   = User::getById($this->session->getLocalUserId());
+		$geoTag = '';
+
+		$output = Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), [
+			'$title' => $this->t('Edit post'),
+		]);
+
+		$this->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('jot-header.tpl'), [
+			'$ispublic'  => '&nbsp;', // $this->t('Visible to <strong>everybody</strong>'),
+			'$geotag'    => $geoTag,
+			'$nickname'  => $this->app->getLoggedInUserNickname(),
+			'$is_mobile' => $this->mode->isMobile(),
+		]);
+
+		if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
+			$lockstate = 'lock';
+		} else {
+			$lockstate = 'unlock';
+		}
+
+		$jotplugins = '';
+		$jotnets    = '';
+
+		Hook::callAll('jot_tool', $jotplugins);
+
+		$output .= Renderer::replaceMacros(Renderer::getMarkupTemplate('jot.tpl'), [
+			'$is_edit'             => true,
+			'$return_path'         => '/display/' . $item['guid'],
+			'$action'              => 'item',
+			'$share'               => $this->t('Save'),
+			'$loading'             => $this->t('Loading...'),
+			'$upload'              => $this->t('Upload photo'),
+			'$shortupload'         => $this->t('upload photo'),
+			'$attach'              => $this->t('Attach file'),
+			'$shortattach'         => $this->t('attach file'),
+			'$weblink'             => $this->t('Insert web link'),
+			'$shortweblink'        => $this->t('web link'),
+			'$video'               => $this->t('Insert video link'),
+			'$shortvideo'          => $this->t('video link'),
+			'$audio'               => $this->t('Insert audio link'),
+			'$shortaudio'          => $this->t('audio link'),
+			'$setloc'              => $this->t('Set your location'),
+			'$shortsetloc'         => $this->t('set location'),
+			'$noloc'               => $this->t('Clear browser location'),
+			'$shortnoloc'          => $this->t('clear location'),
+			'$wait'                => $this->t('Please wait'),
+			'$permset'             => $this->t('Permission settings'),
+			'$wall'                => $item['wall'],
+			'$posttype'            => $item['post-type'],
+			'$content'             => $this->undoPostTagging($item['body']),
+			'$post_id'             => $postId,
+			'$defloc'              => $user['default-location'],
+			'$visitor'             => 'none',
+			'$pvisit'              => 'none',
+			'$emailcc'             => $this->t('CC: email addresses'),
+			'$public'              => $this->t('Public post'),
+			'$jotnets'             => $jotnets,
+			'$title'               => $item['title'],
+			'$placeholdertitle'    => $this->t('Set title'),
+			'$category'            => Post\Category::getCSVByURIId($item['uri-id'], $this->session->getLocalUserId(), Post\Category::CATEGORY),
+			'$placeholdercategory' => (Feature::isEnabled($this->session->getLocalUserId(), 'categories') ? $this->t("Categories \x28comma-separated list\x29") : ''),
+			'$emtitle'             => $this->t('Example: bob@example.com, mary@example.com'),
+			'$lockstate'           => $lockstate,
+			'$acl'                 => '', // populate_acl((($group) ? $group_acl : $a->user)),
+			'$bang'                => ($lockstate === 'lock' ? '!' : ''),
+			'$profile_uid'         => $_SESSION['uid'],
+			'$preview'             => $this->t('Preview'),
+			'$jotplugins'          => $jotplugins,
+			'$cancel'              => $this->t('Cancel'),
+			'$rand_num'            => Crypto::randomDigits(12),
+
+			// Formatting button labels
+			'$edbold'              => $this->t('Bold'),
+			'$editalic'            => $this->t('Italic'),
+			'$eduline'             => $this->t('Underline'),
+			'$edquote'             => $this->t('Quote'),
+			'$edcode'              => $this->t('Code'),
+			'$edurl'               => $this->t('Link'),
+			'$edattach'            => $this->t('Link or Media'),
+
+			//jot nav tab (used in some themes)
+			'$message'             => $this->t('Message'),
+			'$browser'             => $this->t('Browser'),
+			'$shortpermset'        => $this->t('Permissions'),
+
+			'$compose_link_title' => $this->t('Open Compose page'),
+		]);
+
+		return $output;
+	}
+
+	/**
+	 * Removes Tags from the item-body
+	 *
+	 * @param string $body The item body
+	 *
+	 * @return string the new item body without tagging
+	 */
+	protected function undoPostTagging(string $body)
+	{
+		$matches = null;
+		$content = preg_match_all('/([!#@])\[url=(.*?)\](.*?)\[\/url\]/ism', $body, $matches, PREG_SET_ORDER);
+		if ($content) {
+			foreach ($matches as $match) {
+				if (in_array($match[1], ['!', '@'])) {
+					$contact  = Contact::getByURL($match[2], false, ['addr']);
+					$match[3] = empty($contact['addr']) ? $match[2] : $contact['addr'];
+				}
+				$body = str_replace($match[0], $match[1] . $match[3], $body);
+			}
+		}
+		return $body;
+	}
+
+	/**
+	 * Exists the current Module because of an error
+	 *
+	 * @param string $message        The error message
+	 * @param string $exceptionClass In case it's a modal, throw an exception instead of an redirect
+	 *
+	 * @return void
+	 */
+	protected function errorExit(string $message, string $exceptionClass)
+	{
+		if ($this->isModal) {
+			throw new $exceptionClass($message);
+		} else {
+			$this->sysMessages->addNotice($message);
+			$this->baseUrl->redirect();
+		}
+	}
+}
diff --git a/src/Object/Post.php b/src/Object/Post.php
index 87951c19cc..8b8463f858 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -220,7 +220,7 @@ class Post
 				if ($item['event-id'] != 0) {
 					$edpost = ['calendar/event/edit/' . $item['event-id'], DI::l10n()->t('Edit')];
 				} else {
-					$edpost = ['editpost/' . $item['id'], DI::l10n()->t('Edit')];
+					$edpost = [sprintf('post/%s/edit', $item['id']), DI::l10n()->t('Edit')];
 				}
 			}
 			$dropping = in_array($item['uid'], [0, DI::userSession()->getLocalUserId()]);
diff --git a/static/routes.config.php b/static/routes.config.php
index 7a86d8d034..5f5c238e05 100644
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -552,6 +552,7 @@ return [
 	'/ping'              => [Module\Notifications\Ping::class, [R::GET]],
 
 	'/post' => [
+		'/{post_id}/edit'                                          => [Module\Post\Edit::class,       [R::GET         ]],
 		'/{post_id}/share'                                         => [Module\Post\Share::class,      [R::GET         ]],
 		'/{item_id}/tag/add'                                       => [Module\Post\Tag\Add::class,    [        R::POST]],
 		'/{item_id}/tag/remove[/{tag_name}]'                       => [Module\Post\Tag\Remove::class, [R::GET, R::POST]],

From 01c2a775e4515f0cd51f654369d15a7f7b17c2d4 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Tue, 15 Nov 2022 22:34:31 +0100
Subject: [PATCH 02/45] Update messages.po

---
 view/lang/C/messages.po | 467 ++++++++++++++++++++--------------------
 1 file changed, 236 insertions(+), 231 deletions(-)

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index 059e79bd89..261a3bd363 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2022.12-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-15 00:00+0000\n"
+"POT-Creation-Date: 2022-11-15 21:34+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,9 +18,36 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 
-#: mod/editpost.php:38 mod/item.php:181 mod/item.php:186 mod/item.php:870
-#: mod/message.php:69 mod/message.php:114 mod/notes.php:44 mod/photos.php:159
-#: mod/photos.php:886 src/Module/Attach.php:56 src/Module/BaseApi.php:94
+#: mod/fbrowser.php:61 src/Content/Nav.php:195 src/Module/BaseProfile.php:64
+#: view/theme/frio/theme.php:239
+msgid "Photos"
+msgstr ""
+
+#: mod/fbrowser.php:119 mod/fbrowser.php:146 mod/photos.php:999
+#: mod/photos.php:1100 src/Content/Conversation.php:389
+#: src/Module/Contact/Follow.php:171 src/Module/Contact/Revoke.php:109
+#: src/Module/Contact/Unfollow.php:126 src/Module/Post/Edit.php:165
+#: src/Module/Post/Tag/Remove.php:109 src/Module/Profile/RemoteFollow.php:134
+#: src/Module/Security/TwoFactor/SignOut.php:125
+msgid "Cancel"
+msgstr ""
+
+#: mod/fbrowser.php:121 mod/fbrowser.php:148
+#: src/Module/Settings/Profile/Photo/Index.php:128
+msgid "Upload"
+msgstr ""
+
+#: mod/fbrowser.php:143
+msgid "Files"
+msgstr ""
+
+#: mod/item.php:131 mod/item.php:135
+msgid "Unable to locate original post."
+msgstr ""
+
+#: mod/item.php:181 mod/item.php:186 mod/item.php:870 mod/message.php:69
+#: mod/message.php:114 mod/notes.php:44 mod/photos.php:159 mod/photos.php:886
+#: src/Module/Attach.php:56 src/Module/BaseApi.php:94
 #: src/Module/BaseNotifications.php:98 src/Module/BaseSettings.php:52
 #: src/Module/Calendar/Event/API.php:88 src/Module/Calendar/Event/Form.php:84
 #: src/Module/Calendar/Event/Show.php:54 src/Module/Calendar/Export.php:62
@@ -35,16 +62,17 @@ msgstr ""
 #: src/Module/Notifications/Notification.php:76
 #: src/Module/Notifications/Notification.php:107
 #: src/Module/OStatus/Repair.php:60 src/Module/OStatus/Subscribe.php:66
-#: src/Module/Profile/Attachment/Upload.php:97 src/Module/Profile/Common.php:55
-#: src/Module/Profile/Contacts.php:55 src/Module/Profile/Photos/Upload.php:108
-#: src/Module/Profile/Schedule.php:39 src/Module/Profile/Schedule.php:56
-#: src/Module/Profile/UnkMail.php:69 src/Module/Profile/UnkMail.php:121
-#: src/Module/Profile/UnkMail.php:132 src/Module/Register.php:77
-#: src/Module/Register.php:90 src/Module/Register.php:206
-#: src/Module/Register.php:245 src/Module/Search/Directory.php:37
-#: src/Module/Settings/Account.php:50 src/Module/Settings/Account.php:407
-#: src/Module/Settings/Delegation.php:41 src/Module/Settings/Delegation.php:69
-#: src/Module/Settings/Display.php:41 src/Module/Settings/Display.php:119
+#: src/Module/Post/Edit.php:76 src/Module/Profile/Attachment/Upload.php:97
+#: src/Module/Profile/Common.php:55 src/Module/Profile/Contacts.php:55
+#: src/Module/Profile/Photos/Upload.php:108 src/Module/Profile/Schedule.php:39
+#: src/Module/Profile/Schedule.php:56 src/Module/Profile/UnkMail.php:69
+#: src/Module/Profile/UnkMail.php:121 src/Module/Profile/UnkMail.php:132
+#: src/Module/Register.php:77 src/Module/Register.php:90
+#: src/Module/Register.php:206 src/Module/Register.php:245
+#: src/Module/Search/Directory.php:37 src/Module/Settings/Account.php:50
+#: src/Module/Settings/Account.php:407 src/Module/Settings/Delegation.php:41
+#: src/Module/Settings/Delegation.php:69 src/Module/Settings/Display.php:41
+#: src/Module/Settings/Display.php:119
 #: src/Module/Settings/Profile/Photo/Crop.php:165
 #: src/Module/Settings/Profile/Photo/Index.php:111
 #: src/Module/Settings/RemoveMe.php:117 src/Module/Settings/UserExport.php:80
@@ -56,206 +84,6 @@ msgstr ""
 msgid "Permission denied."
 msgstr ""
 
-#: mod/editpost.php:45 mod/editpost.php:55
-#: src/Module/Moderation/Item/Source.php:88
-msgid "Item not found"
-msgstr ""
-
-#: mod/editpost.php:64
-msgid "Edit post"
-msgstr ""
-
-#: mod/editpost.php:91 mod/notes.php:56 src/Content/Text/HTML.php:882
-#: src/Module/Admin/Storage.php:142 src/Module/Filer/SaveTag.php:74
-msgid "Save"
-msgstr ""
-
-#: mod/editpost.php:92 mod/photos.php:1335 src/Content/Conversation.php:341
-#: src/Object/Post.php:987
-msgid "Loading..."
-msgstr ""
-
-#: mod/editpost.php:93 mod/message.php:201 mod/message.php:357
-#: src/Content/Conversation.php:342
-msgid "Upload photo"
-msgstr ""
-
-#: mod/editpost.php:94 src/Content/Conversation.php:343
-msgid "upload photo"
-msgstr ""
-
-#: mod/editpost.php:95 src/Content/Conversation.php:344
-msgid "Attach file"
-msgstr ""
-
-#: mod/editpost.php:96 src/Content/Conversation.php:345
-msgid "attach file"
-msgstr ""
-
-#: mod/editpost.php:97 mod/message.php:202 mod/message.php:358
-#: src/Module/Profile/UnkMail.php:154
-msgid "Insert web link"
-msgstr ""
-
-#: mod/editpost.php:98
-msgid "web link"
-msgstr ""
-
-#: mod/editpost.php:99
-msgid "Insert video link"
-msgstr ""
-
-#: mod/editpost.php:100
-msgid "video link"
-msgstr ""
-
-#: mod/editpost.php:101
-msgid "Insert audio link"
-msgstr ""
-
-#: mod/editpost.php:102
-msgid "audio link"
-msgstr ""
-
-#: mod/editpost.php:103 src/Content/Conversation.php:355
-#: src/Module/Item/Compose.php:200
-msgid "Set your location"
-msgstr ""
-
-#: mod/editpost.php:104 src/Content/Conversation.php:356
-msgid "set location"
-msgstr ""
-
-#: mod/editpost.php:105 src/Content/Conversation.php:357
-msgid "Clear browser location"
-msgstr ""
-
-#: mod/editpost.php:106 src/Content/Conversation.php:358
-msgid "clear location"
-msgstr ""
-
-#: mod/editpost.php:107 mod/message.php:203 mod/message.php:360
-#: mod/photos.php:1486 src/Content/Conversation.php:371
-#: src/Content/Conversation.php:717 src/Module/Item/Compose.php:204
-#: src/Module/Profile/UnkMail.php:155 src/Object/Post.php:537
-msgid "Please wait"
-msgstr ""
-
-#: mod/editpost.php:108 src/Content/Conversation.php:372
-msgid "Permission settings"
-msgstr ""
-
-#: mod/editpost.php:116 src/Core/ACL.php:326
-msgid "CC: email addresses"
-msgstr ""
-
-#: mod/editpost.php:117 src/Content/Conversation.php:382
-msgid "Public post"
-msgstr ""
-
-#: mod/editpost.php:120 src/Content/Conversation.php:360
-#: src/Module/Item/Compose.php:205
-msgid "Set title"
-msgstr ""
-
-#: mod/editpost.php:122 src/Content/Conversation.php:362
-#: src/Module/Item/Compose.php:206
-msgid "Categories (comma-separated list)"
-msgstr ""
-
-#: mod/editpost.php:123 src/Core/ACL.php:327
-msgid "Example: bob@example.com, mary@example.com"
-msgstr ""
-
-#: mod/editpost.php:128 mod/photos.php:1334 mod/photos.php:1390
-#: mod/photos.php:1464 src/Content/Conversation.php:386
-#: src/Module/Calendar/Event/Form.php:248 src/Module/Item/Compose.php:199
-#: src/Object/Post.php:997
-msgid "Preview"
-msgstr ""
-
-#: mod/editpost.php:130 mod/fbrowser.php:119 mod/fbrowser.php:146
-#: mod/photos.php:999 mod/photos.php:1100 src/Content/Conversation.php:389
-#: src/Module/Contact/Follow.php:171 src/Module/Contact/Revoke.php:109
-#: src/Module/Contact/Unfollow.php:126 src/Module/Post/Tag/Remove.php:109
-#: src/Module/Profile/RemoteFollow.php:134
-#: src/Module/Security/TwoFactor/SignOut.php:125
-msgid "Cancel"
-msgstr ""
-
-#: mod/editpost.php:134 src/Content/Conversation.php:346
-#: src/Module/Item/Compose.php:190 src/Object/Post.php:988
-msgid "Bold"
-msgstr ""
-
-#: mod/editpost.php:135 src/Content/Conversation.php:347
-#: src/Module/Item/Compose.php:191 src/Object/Post.php:989
-msgid "Italic"
-msgstr ""
-
-#: mod/editpost.php:136 src/Content/Conversation.php:348
-#: src/Module/Item/Compose.php:192 src/Object/Post.php:990
-msgid "Underline"
-msgstr ""
-
-#: mod/editpost.php:137 src/Content/Conversation.php:349
-#: src/Module/Item/Compose.php:193 src/Object/Post.php:991
-msgid "Quote"
-msgstr ""
-
-#: mod/editpost.php:138 src/Content/Conversation.php:350
-#: src/Module/Item/Compose.php:194 src/Object/Post.php:992
-msgid "Code"
-msgstr ""
-
-#: mod/editpost.php:139 src/Content/Conversation.php:352
-#: src/Module/Item/Compose.php:196 src/Object/Post.php:994
-msgid "Link"
-msgstr ""
-
-#: mod/editpost.php:140 src/Content/Conversation.php:353
-#: src/Module/Item/Compose.php:197 src/Object/Post.php:995
-msgid "Link or Media"
-msgstr ""
-
-#: mod/editpost.php:143 src/Content/Conversation.php:396
-#: src/Content/Widget/VCard.php:113 src/Model/Profile.php:465
-#: src/Module/Admin/Logs/View.php:93
-msgid "Message"
-msgstr ""
-
-#: mod/editpost.php:144 src/Content/Conversation.php:397
-#: src/Module/Settings/TwoFactor/Trusted.php:139
-msgid "Browser"
-msgstr ""
-
-#: mod/editpost.php:145 mod/photos.php:934 mod/photos.php:1288
-#: src/Content/Conversation.php:373 src/Module/Calendar/Event/Form.php:253
-msgid "Permissions"
-msgstr ""
-
-#: mod/editpost.php:147 src/Content/Conversation.php:399
-msgid "Open Compose page"
-msgstr ""
-
-#: mod/fbrowser.php:61 src/Content/Nav.php:195 src/Module/BaseProfile.php:64
-#: view/theme/frio/theme.php:239
-msgid "Photos"
-msgstr ""
-
-#: mod/fbrowser.php:121 mod/fbrowser.php:148
-#: src/Module/Settings/Profile/Photo/Index.php:128
-msgid "Upload"
-msgstr ""
-
-#: mod/fbrowser.php:143
-msgid "Files"
-msgstr ""
-
-#: mod/item.php:131 mod/item.php:135
-msgid "Unable to locate original post."
-msgstr ""
-
 #: mod/item.php:337 mod/item.php:342
 msgid "Empty post discarded."
 msgstr ""
@@ -274,7 +102,7 @@ msgstr ""
 
 #: mod/item.php:846 src/Module/Admin/Themes/Details.php:39
 #: src/Module/Admin/Themes/Index.php:59 src/Module/Debug/ItemBody.php:42
-#: src/Module/Debug/ItemBody.php:57 src/Module/Item/Feed.php:81
+#: src/Module/Debug/ItemBody.php:57 src/Module/Item/Feed.php:80
 msgid "Item not found."
 msgstr ""
 
@@ -478,6 +306,23 @@ msgstr ""
 msgid "Your message:"
 msgstr ""
 
+#: mod/message.php:201 mod/message.php:357 src/Content/Conversation.php:342
+#: src/Module/Post/Edit.php:128
+msgid "Upload photo"
+msgstr ""
+
+#: mod/message.php:202 mod/message.php:358 src/Module/Post/Edit.php:132
+#: src/Module/Profile/UnkMail.php:154
+msgid "Insert web link"
+msgstr ""
+
+#: mod/message.php:203 mod/message.php:360 mod/photos.php:1486
+#: src/Content/Conversation.php:371 src/Content/Conversation.php:717
+#: src/Module/Item/Compose.php:204 src/Module/Post/Edit.php:142
+#: src/Module/Profile/UnkMail.php:155 src/Object/Post.php:537
+msgid "Please wait"
+msgstr ""
+
 #: mod/message.php:204 mod/message.php:359 mod/photos.php:916
 #: mod/photos.php:1020 mod/photos.php:1292 mod/photos.php:1333
 #: mod/photos.php:1389 mod/photos.php:1463
@@ -557,6 +402,12 @@ msgstr ""
 msgid "Personal notes are visible only by yourself."
 msgstr ""
 
+#: mod/notes.php:56 src/Content/Text/HTML.php:882
+#: src/Module/Admin/Storage.php:142 src/Module/Filer/SaveTag.php:74
+#: src/Module/Post/Edit.php:126
+msgid "Save"
+msgstr ""
+
 #: mod/photos.php:68 mod/photos.php:139 mod/photos.php:793
 #: src/Model/Event.php:514 src/Model/Profile.php:234
 #: src/Module/Calendar/Export.php:67 src/Module/Feed.php:72
@@ -679,6 +530,11 @@ msgstr ""
 msgid "Do not show a status post for this upload"
 msgstr ""
 
+#: mod/photos.php:934 mod/photos.php:1288 src/Content/Conversation.php:373
+#: src/Module/Calendar/Event/Form.php:253 src/Module/Post/Edit.php:180
+msgid "Permissions"
+msgstr ""
+
 #: mod/photos.php:997
 msgid "Do you really want to delete this photo album and all its photos?"
 msgstr ""
@@ -794,6 +650,18 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
+#: mod/photos.php:1334 mod/photos.php:1390 mod/photos.php:1464
+#: src/Content/Conversation.php:386 src/Module/Calendar/Event/Form.php:248
+#: src/Module/Item/Compose.php:199 src/Module/Post/Edit.php:163
+#: src/Object/Post.php:997
+msgid "Preview"
+msgstr ""
+
+#: mod/photos.php:1335 src/Content/Conversation.php:341
+#: src/Module/Post/Edit.php:127 src/Object/Post.php:987
+msgid "Loading..."
+msgstr ""
+
 #: mod/photos.php:1421 src/Content/Conversation.php:633 src/Object/Post.php:255
 msgid "Select"
 msgstr ""
@@ -1347,19 +1215,116 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
+#: src/Content/Conversation.php:343 src/Module/Post/Edit.php:129
+msgid "upload photo"
+msgstr ""
+
+#: src/Content/Conversation.php:344 src/Module/Post/Edit.php:130
+msgid "Attach file"
+msgstr ""
+
+#: src/Content/Conversation.php:345 src/Module/Post/Edit.php:131
+msgid "attach file"
+msgstr ""
+
+#: src/Content/Conversation.php:346 src/Module/Item/Compose.php:190
+#: src/Module/Post/Edit.php:169 src/Object/Post.php:988
+msgid "Bold"
+msgstr ""
+
+#: src/Content/Conversation.php:347 src/Module/Item/Compose.php:191
+#: src/Module/Post/Edit.php:170 src/Object/Post.php:989
+msgid "Italic"
+msgstr ""
+
+#: src/Content/Conversation.php:348 src/Module/Item/Compose.php:192
+#: src/Module/Post/Edit.php:171 src/Object/Post.php:990
+msgid "Underline"
+msgstr ""
+
+#: src/Content/Conversation.php:349 src/Module/Item/Compose.php:193
+#: src/Module/Post/Edit.php:172 src/Object/Post.php:991
+msgid "Quote"
+msgstr ""
+
+#: src/Content/Conversation.php:350 src/Module/Item/Compose.php:194
+#: src/Module/Post/Edit.php:173 src/Object/Post.php:992
+msgid "Code"
+msgstr ""
+
 #: src/Content/Conversation.php:351 src/Module/Item/Compose.php:195
 #: src/Object/Post.php:993
 msgid "Image"
 msgstr ""
 
+#: src/Content/Conversation.php:352 src/Module/Item/Compose.php:196
+#: src/Module/Post/Edit.php:174 src/Object/Post.php:994
+msgid "Link"
+msgstr ""
+
+#: src/Content/Conversation.php:353 src/Module/Item/Compose.php:197
+#: src/Module/Post/Edit.php:175 src/Object/Post.php:995
+msgid "Link or Media"
+msgstr ""
+
 #: src/Content/Conversation.php:354
 msgid "Video"
 msgstr ""
 
+#: src/Content/Conversation.php:355 src/Module/Item/Compose.php:200
+#: src/Module/Post/Edit.php:138
+msgid "Set your location"
+msgstr ""
+
+#: src/Content/Conversation.php:356 src/Module/Post/Edit.php:139
+msgid "set location"
+msgstr ""
+
+#: src/Content/Conversation.php:357 src/Module/Post/Edit.php:140
+msgid "Clear browser location"
+msgstr ""
+
+#: src/Content/Conversation.php:358 src/Module/Post/Edit.php:141
+msgid "clear location"
+msgstr ""
+
+#: src/Content/Conversation.php:360 src/Module/Item/Compose.php:205
+#: src/Module/Post/Edit.php:155
+msgid "Set title"
+msgstr ""
+
+#: src/Content/Conversation.php:362 src/Module/Item/Compose.php:206
+#: src/Module/Post/Edit.php:157
+msgid "Categories (comma-separated list)"
+msgstr ""
+
 #: src/Content/Conversation.php:367 src/Module/Item/Compose.php:222
 msgid "Scheduled at"
 msgstr ""
 
+#: src/Content/Conversation.php:372 src/Module/Post/Edit.php:143
+msgid "Permission settings"
+msgstr ""
+
+#: src/Content/Conversation.php:382 src/Module/Post/Edit.php:152
+msgid "Public post"
+msgstr ""
+
+#: src/Content/Conversation.php:396 src/Content/Widget/VCard.php:113
+#: src/Model/Profile.php:465 src/Module/Admin/Logs/View.php:93
+#: src/Module/Post/Edit.php:178
+msgid "Message"
+msgstr ""
+
+#: src/Content/Conversation.php:397 src/Module/Post/Edit.php:179
+#: src/Module/Settings/TwoFactor/Trusted.php:139
+msgid "Browser"
+msgstr ""
+
+#: src/Content/Conversation.php:399 src/Module/Post/Edit.php:182
+msgid "Open Compose page"
+msgstr ""
+
 #: src/Content/Conversation.php:661 src/Object/Post.php:243
 msgid "Pinned item"
 msgstr ""
@@ -1985,8 +1950,8 @@ msgid ""
 "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1245 src/Model/Item.php:3486
-#: src/Model/Item.php:3492 src/Model/Item.php:3493
+#: src/Content/Text/BBCode.php:1245 src/Model/Item.php:3493
+#: src/Model/Item.php:3499 src/Model/Item.php:3500
 msgid "Link to source"
 msgstr ""
 
@@ -2277,6 +2242,14 @@ msgstr ""
 msgid "Except to:"
 msgstr ""
 
+#: src/Core/ACL.php:326 src/Module/Post/Edit.php:151
+msgid "CC: email addresses"
+msgstr ""
+
+#: src/Core/ACL.php:327 src/Module/Post/Edit.php:158
+msgid "Example: bob@example.com, mary@example.com"
+msgstr ""
+
 #: src/Core/ACL.php:328
 msgid "Connectors"
 msgstr ""
@@ -3037,7 +3010,7 @@ msgstr ""
 msgid "No events to display"
 msgstr ""
 
-#: src/Model/Event.php:525 src/Module/Item/Display.php:221
+#: src/Model/Event.php:525 src/Module/Item/Display.php:224
 #: src/Module/Profile/Profile.php:93 src/Module/Profile/Profile.php:108
 #: src/Module/Profile/Status.php:109 src/Module/Update/Profile.php:55
 msgid "Access to this profile has been restricted."
@@ -3159,44 +3132,44 @@ msgstr ""
 msgid "Content warning: %s"
 msgstr ""
 
-#: src/Model/Item.php:3398
+#: src/Model/Item.php:3405
 msgid "bytes"
 msgstr ""
 
-#: src/Model/Item.php:3429
+#: src/Model/Item.php:3436
 #, php-format
 msgid "%2$s (%3$d%%, %1$d vote)"
 msgid_plural "%2$s (%3$d%%, %1$d votes)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Model/Item.php:3431
+#: src/Model/Item.php:3438
 #, php-format
 msgid "%2$s (%1$d vote)"
 msgid_plural "%2$s (%1$d votes)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Model/Item.php:3436
+#: src/Model/Item.php:3443
 #, php-format
 msgid "%d voter. Poll end: %s"
 msgid_plural "%d voters. Poll end: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Model/Item.php:3438
+#: src/Model/Item.php:3445
 #, php-format
 msgid "%d voter."
 msgid_plural "%d voters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Model/Item.php:3440
+#: src/Model/Item.php:3447
 #, php-format
 msgid "Poll end: %s"
 msgstr ""
 
-#: src/Model/Item.php:3474 src/Model/Item.php:3475
+#: src/Model/Item.php:3481 src/Model/Item.php:3482
 msgid "View on separate page"
 msgstr ""
 
@@ -5854,10 +5827,10 @@ msgstr[1] ""
 #: src/Module/Contact/Follow.php:69 src/Module/Contact/Redir.php:62
 #: src/Module/Contact/Redir.php:222 src/Module/Conversation/Community.php:193
 #: src/Module/Debug/ItemBody.php:38 src/Module/Diaspora/Receive.php:57
-#: src/Module/Item/Display.php:93 src/Module/Item/Feed.php:60
+#: src/Module/Item/Display.php:95 src/Module/Item/Feed.php:59
 #: src/Module/Item/Follow.php:41 src/Module/Item/Ignore.php:41
 #: src/Module/Item/Pin.php:41 src/Module/Item/Pin.php:56
-#: src/Module/Item/Star.php:42 src/Module/Update/Display.php:38
+#: src/Module/Item/Star.php:42 src/Module/Update/Display.php:37
 msgid "Access denied."
 msgstr ""
 
@@ -7116,12 +7089,12 @@ msgid ""
 "<a href=\"/settings/display\">Theme Customization settings</a>."
 msgstr ""
 
-#: src/Module/Item/Display.php:133 src/Module/Item/Display.php:247
-#: src/Module/Update/Display.php:56
+#: src/Module/Item/Display.php:135 src/Module/Item/Display.php:252
+#: src/Module/Update/Display.php:55
 msgid "The requested item doesn't exist or has been deleted."
 msgstr ""
 
-#: src/Module/Item/Feed.php:87
+#: src/Module/Item/Feed.php:86
 msgid "The feed for this item is unavailable."
 msgstr ""
 
@@ -7600,6 +7573,10 @@ msgstr ""
 msgid "Implicit Mention"
 msgstr ""
 
+#: src/Module/Moderation/Item/Source.php:88
+msgid "Item not found"
+msgstr ""
+
 #: src/Module/Moderation/Item/Source.php:89
 msgid "No source recorded"
 msgstr ""
@@ -8104,6 +8081,34 @@ msgstr ""
 msgid "Invalid photo with id %s."
 msgstr ""
 
+#: src/Module/Post/Edit.php:82 src/Module/Post/Edit.php:94
+msgid "Post not found."
+msgstr ""
+
+#: src/Module/Post/Edit.php:101
+msgid "Edit post"
+msgstr ""
+
+#: src/Module/Post/Edit.php:133
+msgid "web link"
+msgstr ""
+
+#: src/Module/Post/Edit.php:134
+msgid "Insert video link"
+msgstr ""
+
+#: src/Module/Post/Edit.php:135
+msgid "video link"
+msgstr ""
+
+#: src/Module/Post/Edit.php:136
+msgid "Insert audio link"
+msgstr ""
+
+#: src/Module/Post/Edit.php:137
+msgid "audio link"
+msgstr ""
+
 #: src/Module/Post/Tag/Remove.php:106
 msgid "Remove Item Tag"
 msgstr ""
@@ -10209,7 +10214,7 @@ msgstr ""
 msgid "Privacy Statement"
 msgstr ""
 
-#: src/Module/Update/Display.php:46
+#: src/Module/Update/Display.php:45
 msgid "Parameter uri_id is missing."
 msgstr ""
 

From 09e01b93564bb80822af4acad7eecdfa280d1caf Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Tue, 15 Nov 2022 22:52:23 +0100
Subject: [PATCH 03/45] Replace $_SESSION

---
 src/Module/Post/Edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Module/Post/Edit.php b/src/Module/Post/Edit.php
index 5531cb249e..f89f73f0bd 100644
--- a/src/Module/Post/Edit.php
+++ b/src/Module/Post/Edit.php
@@ -159,7 +159,7 @@ class Edit extends BaseModule
 			'$lockstate'           => $lockstate,
 			'$acl'                 => '', // populate_acl((($group) ? $group_acl : $a->user)),
 			'$bang'                => ($lockstate === 'lock' ? '!' : ''),
-			'$profile_uid'         => $_SESSION['uid'],
+			'$profile_uid'         => $this->session->getLocalUserId(),
 			'$preview'             => $this->t('Preview'),
 			'$jotplugins'          => $jotplugins,
 			'$cancel'              => $this->t('Cancel'),

From db7af4c45ba6b1a42201c66335d14c89e53827bd Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Wed, 16 Nov 2022 08:49:48 +0100
Subject: [PATCH 04/45] Remove jotnets

---
 src/Module/Post/Edit.php              | 4 +---
 view/theme/smoothly/templates/jot.tpl | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Module/Post/Edit.php b/src/Module/Post/Edit.php
index f89f73f0bd..ba6a736204 100644
--- a/src/Module/Post/Edit.php
+++ b/src/Module/Post/Edit.php
@@ -76,7 +76,7 @@ class Edit extends BaseModule
 			$this->errorExit($this->t('Permission denied.'), HTTPException\UnauthorizedException::class);
 		}
 
-		$postId = $this->parameters['post_id'];
+		$postId = $this->parameters['post_id'] ?? 0;
 
 		if (empty($postId)) {
 			$this->errorExit($this->t('Post not found.'), HTTPException\BadRequestException::class);
@@ -115,7 +115,6 @@ class Edit extends BaseModule
 		}
 
 		$jotplugins = '';
-		$jotnets    = '';
 
 		Hook::callAll('jot_tool', $jotplugins);
 
@@ -150,7 +149,6 @@ class Edit extends BaseModule
 			'$pvisit'              => 'none',
 			'$emailcc'             => $this->t('CC: email addresses'),
 			'$public'              => $this->t('Public post'),
-			'$jotnets'             => $jotnets,
 			'$title'               => $item['title'],
 			'$placeholdertitle'    => $this->t('Set title'),
 			'$category'            => Post\Category::getCSVByURIId($item['uri-id'], $this->session->getLocalUserId(), Post\Category::CATEGORY),
diff --git a/view/theme/smoothly/templates/jot.tpl b/view/theme/smoothly/templates/jot.tpl
index 74c9d0523a..86485cad12 100644
--- a/view/theme/smoothly/templates/jot.tpl
+++ b/view/theme/smoothly/templates/jot.tpl
@@ -70,7 +70,6 @@
         <div style="display: none;">
             <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
                 {{$acl nofilter}}
-                {{$jotnets nofilter}}
                 {{if $scheduled_at}}{{$scheduled_at nofilter}}{{/if}}
                 {{if $created_at}}{{$created_at nofilter}}{{/if}}
             </div>

From 5dc9319bb27dd2e7ecd83c0c904acfd9cb7f775d Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Wed, 16 Nov 2022 08:50:57 +0100
Subject: [PATCH 05/45] Remove geotag

---
 src/Module/Post/Edit.php                     | 2 --
 view/templates/jot-header.tpl                | 2 --
 view/theme/frio/templates/jot-header.tpl     | 2 --
 view/theme/smoothly/templates/jot-header.tpl | 3 ---
 4 files changed, 9 deletions(-)

diff --git a/src/Module/Post/Edit.php b/src/Module/Post/Edit.php
index ba6a736204..0f382aebf1 100644
--- a/src/Module/Post/Edit.php
+++ b/src/Module/Post/Edit.php
@@ -95,7 +95,6 @@ class Edit extends BaseModule
 		}
 
 		$user   = User::getById($this->session->getLocalUserId());
-		$geoTag = '';
 
 		$output = Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), [
 			'$title' => $this->t('Edit post'),
@@ -103,7 +102,6 @@ class Edit extends BaseModule
 
 		$this->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('jot-header.tpl'), [
 			'$ispublic'  => '&nbsp;', // $this->t('Visible to <strong>everybody</strong>'),
-			'$geotag'    => $geoTag,
 			'$nickname'  => $this->app->getLoggedInUserNickname(),
 			'$is_mobile' => $this->mode->isMobile(),
 		]);
diff --git a/view/templates/jot-header.tpl b/view/templates/jot-header.tpl
index a67f9c3f0c..53d5c7288e 100644
--- a/view/templates/jot-header.tpl
+++ b/view/templates/jot-header.tpl
@@ -236,7 +236,5 @@ function enableOnUser(){
 		$("#profile-jot-text").val(currentText + data);
 	}
 
-	{{$geotag nofilter}}
-
 </script>
 
diff --git a/view/theme/frio/templates/jot-header.tpl b/view/theme/frio/templates/jot-header.tpl
index 25a02b9b60..d64799c9ab 100644
--- a/view/theme/frio/templates/jot-header.tpl
+++ b/view/theme/frio/templates/jot-header.tpl
@@ -317,8 +317,6 @@
 		autosize.update($("#profile-jot-text"));
 	}
 
-	{{$geotag nofilter}}
-
 	function jotShow() {
 		var modal = $('#jot-modal').modal();
 		jotcache = $("#jot-sections");
diff --git a/view/theme/smoothly/templates/jot-header.tpl b/view/theme/smoothly/templates/jot-header.tpl
index 69233b9260..8a8f3db68d 100644
--- a/view/theme/smoothly/templates/jot-header.tpl
+++ b/view/theme/smoothly/templates/jot-header.tpl
@@ -264,7 +264,4 @@ function enableOnUser(){
 		$("#profile-jot-text").val(currentText + data);
 	}
 
-
-	{{$geotag nofilter}}
-
 </script>

From e7fd4a4cd19be78917d44239bce4653b8c437db1 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Wed, 16 Nov 2022 08:56:19 +0100
Subject: [PATCH 06/45] Remove legacy comments

---
 src/Module/Post/Edit.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Module/Post/Edit.php b/src/Module/Post/Edit.php
index 0f382aebf1..2b371ba9c1 100644
--- a/src/Module/Post/Edit.php
+++ b/src/Module/Post/Edit.php
@@ -94,14 +94,14 @@ class Edit extends BaseModule
 			$this->errorExit($this->t('Post not found.'), HTTPException\BadRequestException::class);
 		}
 
-		$user   = User::getById($this->session->getLocalUserId());
+		$user = User::getById($this->session->getLocalUserId());
 
 		$output = Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), [
 			'$title' => $this->t('Edit post'),
 		]);
 
 		$this->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('jot-header.tpl'), [
-			'$ispublic'  => '&nbsp;', // $this->t('Visible to <strong>everybody</strong>'),
+			'$ispublic'  => '&nbsp;',
 			'$nickname'  => $this->app->getLoggedInUserNickname(),
 			'$is_mobile' => $this->mode->isMobile(),
 		]);
@@ -153,7 +153,7 @@ class Edit extends BaseModule
 			'$placeholdercategory' => (Feature::isEnabled($this->session->getLocalUserId(), 'categories') ? $this->t("Categories \x28comma-separated list\x29") : ''),
 			'$emtitle'             => $this->t('Example: bob@example.com, mary@example.com'),
 			'$lockstate'           => $lockstate,
-			'$acl'                 => '', // populate_acl((($group) ? $group_acl : $a->user)),
+			'$acl'                 => '',
 			'$bang'                => ($lockstate === 'lock' ? '!' : ''),
 			'$profile_uid'         => $this->session->getLocalUserId(),
 			'$preview'             => $this->t('Preview'),

From 12fb897f54f8f11f9118d14286a003a3817eaaee Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Wed, 16 Nov 2022 08:56:37 +0100
Subject: [PATCH 07/45] Adhere PHP-CS

---
 src/Module/Post/Edit.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Module/Post/Edit.php b/src/Module/Post/Edit.php
index 2b371ba9c1..ed5ce00628 100644
--- a/src/Module/Post/Edit.php
+++ b/src/Module/Post/Edit.php
@@ -162,18 +162,18 @@ class Edit extends BaseModule
 			'$rand_num'            => Crypto::randomDigits(12),
 
 			// Formatting button labels
-			'$edbold'              => $this->t('Bold'),
-			'$editalic'            => $this->t('Italic'),
-			'$eduline'             => $this->t('Underline'),
-			'$edquote'             => $this->t('Quote'),
-			'$edcode'              => $this->t('Code'),
-			'$edurl'               => $this->t('Link'),
-			'$edattach'            => $this->t('Link or Media'),
+			'$edbold'   => $this->t('Bold'),
+			'$editalic' => $this->t('Italic'),
+			'$eduline'  => $this->t('Underline'),
+			'$edquote'  => $this->t('Quote'),
+			'$edcode'   => $this->t('Code'),
+			'$edurl'    => $this->t('Link'),
+			'$edattach' => $this->t('Link or Media'),
 
 			//jot nav tab (used in some themes)
-			'$message'             => $this->t('Message'),
-			'$browser'             => $this->t('Browser'),
-			'$shortpermset'        => $this->t('Permissions'),
+			'$message'      => $this->t('Message'),
+			'$browser'      => $this->t('Browser'),
+			'$shortpermset' => $this->t('Permissions'),
 
 			'$compose_link_title' => $this->t('Open Compose page'),
 		]);

From 96212795725e5155fea44b29d116c6dfd68c4b66 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Wed, 16 Nov 2022 10:49:12 +0100
Subject: [PATCH 08/45] Make PHP-CS happy ...

---
 src/Module/Post/Edit.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Module/Post/Edit.php b/src/Module/Post/Edit.php
index ed5ce00628..347c00725b 100644
--- a/src/Module/Post/Edit.php
+++ b/src/Module/Post/Edit.php
@@ -82,8 +82,10 @@ class Edit extends BaseModule
 			$this->errorExit($this->t('Post not found.'), HTTPException\BadRequestException::class);
 		}
 
-		$fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
-				   'body', 'title', 'uri-id', 'wall', 'post-type', 'guid'];
+		$fields = [
+			'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
+			'body', 'title', 'uri-id', 'wall', 'post-type', 'guid'
+		];
 
 		$item = Post::selectFirstForUser($this->session->getLocalUserId(), $fields, [
 			'id'  => $postId,

From 81b21c41311249cdb319c06f00cb837614338ec3 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Wed, 16 Nov 2022 21:20:24 +0100
Subject: [PATCH 09/45] Revert "Remove geotag"

This reverts commit 5dc9319b
---
 src/Module/Post/Edit.php                     | 1 +
 view/templates/jot-header.tpl                | 2 ++
 view/theme/frio/templates/jot-header.tpl     | 2 ++
 view/theme/smoothly/templates/jot-header.tpl | 3 +++
 4 files changed, 8 insertions(+)

diff --git a/src/Module/Post/Edit.php b/src/Module/Post/Edit.php
index 347c00725b..11c50ff130 100644
--- a/src/Module/Post/Edit.php
+++ b/src/Module/Post/Edit.php
@@ -104,6 +104,7 @@ class Edit extends BaseModule
 
 		$this->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('jot-header.tpl'), [
 			'$ispublic'  => '&nbsp;',
+			'$geotag'    => '',
 			'$nickname'  => $this->app->getLoggedInUserNickname(),
 			'$is_mobile' => $this->mode->isMobile(),
 		]);
diff --git a/view/templates/jot-header.tpl b/view/templates/jot-header.tpl
index 53d5c7288e..a67f9c3f0c 100644
--- a/view/templates/jot-header.tpl
+++ b/view/templates/jot-header.tpl
@@ -236,5 +236,7 @@ function enableOnUser(){
 		$("#profile-jot-text").val(currentText + data);
 	}
 
+	{{$geotag nofilter}}
+
 </script>
 
diff --git a/view/theme/frio/templates/jot-header.tpl b/view/theme/frio/templates/jot-header.tpl
index d64799c9ab..25a02b9b60 100644
--- a/view/theme/frio/templates/jot-header.tpl
+++ b/view/theme/frio/templates/jot-header.tpl
@@ -317,6 +317,8 @@
 		autosize.update($("#profile-jot-text"));
 	}
 
+	{{$geotag nofilter}}
+
 	function jotShow() {
 		var modal = $('#jot-modal').modal();
 		jotcache = $("#jot-sections");
diff --git a/view/theme/smoothly/templates/jot-header.tpl b/view/theme/smoothly/templates/jot-header.tpl
index 8a8f3db68d..69233b9260 100644
--- a/view/theme/smoothly/templates/jot-header.tpl
+++ b/view/theme/smoothly/templates/jot-header.tpl
@@ -264,4 +264,7 @@ function enableOnUser(){
 		$("#profile-jot-text").val(currentText + data);
 	}
 
+
+	{{$geotag nofilter}}
+
 </script>

From a6d96bf1b71b197ed72aca0189e71713e9ebe350 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Wed, 16 Nov 2022 07:15:35 -0500
Subject: [PATCH 10/45] Replace remaining references to contact_template.tpl by
 contact/entry.tpl

---
 view/templates/contact_drop_confirm.tpl | 4 ++--
 view/templates/directory_header.tpl     | 2 +-
 view/templates/nogroup-template.tpl     | 6 +-----
 view/templates/profile/contacts.tpl     | 2 +-
 view/theme/frio/theme.php               | 2 +-
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/view/templates/contact_drop_confirm.tpl b/view/templates/contact_drop_confirm.tpl
index bb4d3a10cb..df5e14ad57 100644
--- a/view/templates/contact_drop_confirm.tpl
+++ b/view/templates/contact_drop_confirm.tpl
@@ -1,8 +1,8 @@
 <h1>{{$l10n.header}}</h1>
 
-{{include file="contact_template.tpl" no_contacts_checkbox=True}}
+{{include file="contact/entry.tpl" no_contacts_checkbox=True}}
 
 {{include file="confirm.tpl"}}
 
 
-<div class="clear"></div>
\ No newline at end of file
+<div class="clear"></div>
diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl
index 7ee38a64a5..8c05b48692 100644
--- a/view/templates/directory_header.tpl
+++ b/view/templates/directory_header.tpl
@@ -22,7 +22,7 @@
 <div id="directory-search-end"></div>
 
 {{foreach $contacts as $contact}}
-	{{include file="contact_template.tpl"}}
+	{{include file="contact/entry.tpl"}}
 {{/foreach}}
 
 <div class="directory-end"></div>
diff --git a/view/templates/nogroup-template.tpl b/view/templates/nogroup-template.tpl
index 27626396c0..8f1c939bb2 100644
--- a/view/templates/nogroup-template.tpl
+++ b/view/templates/nogroup-template.tpl
@@ -2,12 +2,8 @@
 <h1>{{$header}}</h1>
 
 {{foreach $contacts as $contact}}
-	{{include file="contact_template.tpl"}}
+	{{include file="contact/entry.tpl"}}
 {{/foreach}}
 <div id="contact-edit-end"></div>
 
 {{$paginate nofilter}}
-
-
-
-
diff --git a/view/templates/profile/contacts.tpl b/view/templates/profile/contacts.tpl
index 7e2ae9e83d..615ab1e0fb 100644
--- a/view/templates/profile/contacts.tpl
+++ b/view/templates/profile/contacts.tpl
@@ -10,7 +10,7 @@
 {{if $contacts}}
 	<div id="viewcontact_wrapper-{{$id}}">
 	{{foreach $contacts as $contact}}
-		{{include file="contact_template.tpl"}}
+		{{include file="contact/entry.tpl"}}
 	{{/foreach}}
 	</div>
 {{else}}
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 1079a08c86..498ef69f24 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -179,7 +179,7 @@ function frio_contact_photo_menu(App $a, &$args)
 
 	// Add to pm link a new key with the value 'modal'.
 	// Later we can make conditions in the corresponding templates (e.g.
-	// contact_template.tpl)
+	// contact/entry.tpl)
 	if (strpos($pmlink, 'message/new/' . $cid) !== false) {
 		$args['menu']['pm'][3] = 'modal';
 	}

From 47ad922f9a1827e0f80f9ad473d821915abf4d60 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Wed, 16 Nov 2022 20:12:36 -0500
Subject: [PATCH 11/45] Add global styles for .icon

- Normalize user/contact profile pictures size
---
 view/global.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/view/global.css b/view/global.css
index 3365ce4aa0..800a3ea34d 100644
--- a/view/global.css
+++ b/view/global.css
@@ -35,6 +35,11 @@ a.btn, a.btn:hover {
   text-decoration: overline;
 }
 
+.icon {
+	width: 48px;
+	height: 48px;
+}
+
 /* List of social Networks */
 img.connector, img.connector-disabled {
   height: 40px;

From d1abb690a027ee86e52f12d9c6a9b47759b62558 Mon Sep 17 00:00:00 2001
From: MarekBenjamin <117765478+MarekBenjamin@users.noreply.github.com>
Date: Thu, 17 Nov 2022 19:35:27 +0100
Subject: [PATCH 12/45] Update README.md

Removed "post on facebook" since Facebook add-ons are deprecated (https://github.com/friendica/friendica/wiki/How-to:-Friendica%E2%80%99s-Facebook-connector)
Changed preposition in  "(...) receive any content on Tumblr, Wordpress or RSS." to "receive any content from Tumblr, Wordpress or RSS."
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a7494d7f8d..42f76c3af3 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Our mission is to free friends, family and colleagues from data-harvesting corpo
 
 Friendica connects you effortlessly to a federated communications network of several thousand servers, with more than half a million user registrations. You can directly connect to anyone on [Friendica]( https://friendi.ca), [Mastodon](https://joinmastodon.org/), [Diaspora](https://diasporafoundation.org/), [GnuSocial](https://gnu.io/social/), [Pleroma](https://pleroma.social/), or [Hubzilla](https://hubzilla.org/), regardless where each user profile is hosted.
 
-With Friendica, you can also fully interact with anyone on Twitter, post on Facebook and receive any content on Tumblr, Wordpress or RSS. Friendica allows you to integrate most things on the web via a range of addons such as ITTT, Buffer; you will be able to easily control your own data as you decide.
+With Friendica, you can also fully interact with anyone on Twitter and receive any content from Tumblr, Wordpress or RSS. Friendica allows you to integrate most things on the web via a range of addons such as ITTT, Buffer; you will be able to easily control your own data as you decide.
 
 Join today and [get your Friendica profile!](https://dir.friendica.social/servers 'Join Friendica today!')
 

From 8a71bdc1a02f5a25a8ccea1c33d821ea4c7061df Mon Sep 17 00:00:00 2001
From: Thorsten <thorsten.daners@antwerpes.de>
Date: Fri, 18 Nov 2022 09:38:02 +0100
Subject: [PATCH 13/45] Add meta tag to attachment to show images in mastodon
 app.

---
 src/Object/Api/Mastodon/Attachment.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/Object/Api/Mastodon/Attachment.php b/src/Object/Api/Mastodon/Attachment.php
index dc92ff38cf..8156155cde 100644
--- a/src/Object/Api/Mastodon/Attachment.php
+++ b/src/Object/Api/Mastodon/Attachment.php
@@ -44,6 +44,8 @@ class Attachment extends BaseDataTransferObject
 	protected $text_url;
 	/** @var string */
 	protected $description;
+	/** @var array */
+	protected $meta;
 
 	/**
 	 * Creates an attachment
@@ -60,6 +62,17 @@ class Attachment extends BaseDataTransferObject
 		$this->remote_url = $remote;
 		$this->text_url = $this->remote_url ?? $this->url;
 		$this->description = $attachment['description'];
+		if ($type === 'image') {
+			$this->meta['original']['width'] = (int) $attachment['width'];
+			$this->meta['original']['height'] = (int) $attachment['height'];
+			$this->meta['original']['size'] = (int) $attachment['width'] . 'x' . (int) $attachment['height'];
+			$this->meta['original']['aspect'] = (float) ((int)  $attachment['width'] / (int) $attachment['height']);
+
+			$this->meta['small']['width'] = (int) $attachment['preview-width'];
+			$this->meta['small']['height'] = (int) $attachment['preview-height'];
+			$this->meta['small']['size'] = (int) $attachment['preview-width'] . 'x' . (int) $attachment['preview-height'];
+			$this->meta['small']['aspect'] = (float) ((int)  $attachment['preview-width'] / (int) $attachment['preview-height']);
+		}
 	}
 
 	/**

From 74b10708ae201f52872bdcf44c4e562052a7156c Mon Sep 17 00:00:00 2001
From: Thorsten <thorsten.daners@antwerpes.de>
Date: Fri, 18 Nov 2022 09:42:53 +0100
Subject: [PATCH 14/45] Add meta tag to attachment to show images in mastodon
 app.

---
 src/Object/Api/Mastodon/Attachment.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/Object/Api/Mastodon/Attachment.php b/src/Object/Api/Mastodon/Attachment.php
index dc92ff38cf..8156155cde 100644
--- a/src/Object/Api/Mastodon/Attachment.php
+++ b/src/Object/Api/Mastodon/Attachment.php
@@ -44,6 +44,8 @@ class Attachment extends BaseDataTransferObject
 	protected $text_url;
 	/** @var string */
 	protected $description;
+	/** @var array */
+	protected $meta;
 
 	/**
 	 * Creates an attachment
@@ -60,6 +62,17 @@ class Attachment extends BaseDataTransferObject
 		$this->remote_url = $remote;
 		$this->text_url = $this->remote_url ?? $this->url;
 		$this->description = $attachment['description'];
+		if ($type === 'image') {
+			$this->meta['original']['width'] = (int) $attachment['width'];
+			$this->meta['original']['height'] = (int) $attachment['height'];
+			$this->meta['original']['size'] = (int) $attachment['width'] . 'x' . (int) $attachment['height'];
+			$this->meta['original']['aspect'] = (float) ((int)  $attachment['width'] / (int) $attachment['height']);
+
+			$this->meta['small']['width'] = (int) $attachment['preview-width'];
+			$this->meta['small']['height'] = (int) $attachment['preview-height'];
+			$this->meta['small']['size'] = (int) $attachment['preview-width'] . 'x' . (int) $attachment['preview-height'];
+			$this->meta['small']['aspect'] = (float) ((int)  $attachment['preview-width'] / (int) $attachment['preview-height']);
+		}
 	}
 
 	/**

From 7a39be8270c1ce56c7a2df078bfbfd310601c569 Mon Sep 17 00:00:00 2001
From: Thorsten <thorsten.daners@antwerpes.de>
Date: Fri, 18 Nov 2022 12:03:55 +0100
Subject: [PATCH 15/45] DDEV and some PHP8.1 fixes.

---
 .ddev/config.yaml                     | 258 ++++++++++++++++++++++++++
 src/App/Page.php                      |   8 +-
 src/BaseCollection.php                |   4 +-
 src/Content/Conversation.php          |   5 +-
 src/Content/Nav.php                   |   2 +-
 src/Core/Session/Handler/Database.php |   4 +-
 src/Database/Database.php             |   2 +-
 src/Model/Log/ParsedLogIterator.php   |   6 +-
 8 files changed, 275 insertions(+), 14 deletions(-)
 create mode 100644 .ddev/config.yaml

diff --git a/.ddev/config.yaml b/.ddev/config.yaml
new file mode 100644
index 0000000000..810da8d6f0
--- /dev/null
+++ b/.ddev/config.yaml
@@ -0,0 +1,258 @@
+name: my-friendica
+type: php
+docroot: ""
+php_version: "8.1"
+webserver_type: apache-fpm
+router_http_port: "80"
+router_https_port: "443"
+xdebug_enabled: false
+additional_hostnames: []
+additional_fqdns: []
+database:
+  type: mariadb
+  version: "10.4"
+nfs_mount_enabled: false
+mutagen_enabled: false
+use_dns_when_possible: true
+composer_version: "1"
+web_environment: []
+nodejs_version: "16"
+webimage_extra_packages: [php-gmp]
+
+# Key features of ddev's config.yaml:
+
+# name: <projectname> # Name of the project, automatically provides
+#   http://projectname.ddev.site and https://projectname.ddev.site
+
+# type: <projecttype>  # drupal6/7/8, backdrop, typo3, wordpress, php
+
+# docroot: <relative_path> # Relative path to the directory containing index.php.
+
+# php_version: "7.4"  # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2"
+
+# You can explicitly specify the webimage but this
+# is not recommended, as the images are often closely tied to ddev's' behavior,
+# so this can break upgrades.
+
+# webimage: <docker_image>  # nginx/php docker image.
+
+# database:
+#   type: <dbtype> # mysql, mariadb
+#   version: <version> # database version, like "10.3" or "8.0"
+# Note that mariadb_version or mysql_version from v1.18 and earlier
+# will automatically be converted to this notation with just a "ddev config --auto"
+
+# router_http_port: <port>  # Port to be used for http (defaults to port 80)
+# router_https_port: <port> # Port for https (defaults to 443)
+
+# xdebug_enabled: false  # Set to true to enable xdebug and "ddev start" or "ddev restart"
+# Note that for most people the commands
+# "ddev xdebug" to enable xdebug and "ddev xdebug off" to disable it work better,
+# as leaving xdebug enabled all the time is a big performance hit.
+
+# xhprof_enabled: false  # Set to true to enable xhprof and "ddev start" or "ddev restart"
+# Note that for most people the commands
+# "ddev xhprof" to enable xhprof and "ddev xhprof off" to disable it work better,
+# as leaving xhprof enabled all the time is a big performance hit.
+
+# webserver_type: nginx-fpm  # or apache-fpm
+
+# timezone: Europe/Berlin
+# This is the timezone used in the containers and by PHP;
+# it can be set to any valid timezone,
+# see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+# For example Europe/Dublin or MST7MDT
+
+# composer_root: <relative_path>
+# Relative path to the composer root directory from the project root. This is
+# the directory which contains the composer.json and where all Composer related
+# commands are executed.
+
+# composer_version: "2"
+# You can set it to "" or "2" (default) for Composer v2 or "1" for Composer v1
+# to use the latest major version available at the time your container is built.
+# It is also possible to use each other Composer version channel. This includes:
+#   - 2.2 (latest Composer LTS version)
+#   - stable
+#   - preview
+#   - snapshot
+# Alternatively, an explicit Composer version may be specified, for example "2.2.18".
+# To reinstall Composer after the image was built, run "ddev debug refresh".
+
+# nodejs_version: "16"
+# change from the default system Node.js version to another supported version, like 12, 14, 17, 18.
+# Note that you can use 'ddev nvm' or nvm inside the web container to provide nearly any
+# Node.js version, including v6, etc.
+
+# additional_hostnames:
+#  - somename
+#  - someothername
+# would provide http and https URLs for "somename.ddev.site"
+# and "someothername.ddev.site".
+
+# additional_fqdns:
+#  - example.com
+#  - sub1.example.com
+# would provide http and https URLs for "example.com" and "sub1.example.com"
+# Please take care with this because it can cause great confusion.
+
+# upload_dir: custom/upload/dir
+# would set the destination path for ddev import-files to <docroot>/custom/upload/dir
+# When mutagen is enabled this path is bind-mounted so that all the files
+# in the upload_dir don't have to be synced into mutagen
+
+# working_dir:
+#   web: /var/www/html
+#   db: /home
+# would set the default working directory for the web and db services.
+# These values specify the destination directory for ddev ssh and the
+# directory in which commands passed into ddev exec are run.
+
+# omit_containers: [db, dba, ddev-ssh-agent]
+# Currently only these containers are supported. Some containers can also be
+# omitted globally in the ~/.ddev/global_config.yaml. Note that if you omit
+# the "db" container, several standard features of ddev that access the
+# database container will be unusable. In the global configuration it is also
+# possible to omit ddev-router, but not here.
+
+# nfs_mount_enabled: false
+# Great performance improvement but requires host configuration first.
+# See https://ddev.readthedocs.io/en/latest/users/install/performance/#nfs
+
+# mutagen_enabled: false
+# Performance improvement using mutagen asynchronous updates.
+# See https://ddev.readthedocs.io/en/latest/users/install/performance/#mutagen
+
+# fail_on_hook_fail: False
+# Decide whether 'ddev start' should be interrupted by a failing hook
+
+# host_https_port: "59002"
+# The host port binding for https can be explicitly specified. It is
+# dynamic unless otherwise specified.
+# This is not used by most people, most people use the *router* instead
+# of the localhost port.
+
+# host_webserver_port: "59001"
+# The host port binding for the ddev-webserver can be explicitly specified. It is
+# dynamic unless otherwise specified.
+# This is not used by most people, most people use the *router* instead
+# of the localhost port.
+
+# host_db_port: "59002"
+# The host port binding for the ddev-dbserver can be explicitly specified. It is dynamic
+# unless explicitly specified.
+
+# phpmyadmin_port: "8036"
+# phpmyadmin_https_port: "8037"
+# The PHPMyAdmin ports can be changed from the default 8036 and 8037
+
+# host_phpmyadmin_port: "8036"
+# The phpmyadmin (dba) port is not normally bound on the host at all, instead being routed
+# through ddev-router, but it can be specified and bound.
+
+# mailhog_port: "8025"
+# mailhog_https_port: "8026"
+# The MailHog ports can be changed from the default 8025 and 8026
+
+# host_mailhog_port: "8025"
+# The mailhog port is not normally bound on the host at all, instead being routed
+# through ddev-router, but it can be bound directly to localhost if specified here.
+
+# webimage_extra_packages: [php7.4-tidy, php-bcmath]
+# Extra Debian packages that are needed in the webimage can be added here
+
+# dbimage_extra_packages: [telnet,netcat]
+# Extra Debian packages that are needed in the dbimage can be added here
+
+# use_dns_when_possible: true
+# If the host has internet access and the domain configured can
+# successfully be looked up, DNS will be used for hostname resolution
+# instead of editing /etc/hosts
+# Defaults to true
+
+# project_tld: ddev.site
+# The top-level domain used for project URLs
+# The default "ddev.site" allows DNS lookup via a wildcard
+# If you prefer you can change this to "ddev.local" to preserve
+# pre-v1.9 behavior.
+
+# ngrok_args: --basic-auth username:pass1234
+# Provide extra flags to the "ngrok http" command, see
+# https://ngrok.com/docs#http or run "ngrok http -h"
+
+# disable_settings_management: false
+# If true, ddev will not create CMS-specific settings files like
+# Drupal's settings.php/settings.ddev.php or TYPO3's AdditionalConfiguration.php
+# In this case the user must provide all such settings.
+
+# You can inject environment variables into the web container with:
+# web_environment:
+# - SOMEENV=somevalue
+# - SOMEOTHERENV=someothervalue
+
+# no_project_mount: false
+# (Experimental) If true, ddev will not mount the project into the web container;
+# the user is responsible for mounting it manually or via a script.
+# This is to enable experimentation with alternate file mounting strategies.
+# For advanced users only!
+
+# bind_all_interfaces: false
+# If true, host ports will be bound on all network interfaces,
+# not just the localhost interface. This means that ports
+# will be available on the local network if the host firewall
+# allows it.
+
+# default_container_timeout: 120
+# The default time that ddev waits for all containers to become ready can be increased from
+# the default 120. This helps in importing huge databases, for example.
+
+#web_extra_exposed_ports:
+#- name: nodejs
+#  container_port: 3000
+#  http_port: 2999
+#  https_port: 3000
+#- name: something
+#  container_port: 4000
+#  https_port: 4000
+#  http_port: 3999
+# Allows a set of extra ports to be exposed via ddev-router
+# The port behavior on the ddev-webserver must be arranged separately, for example
+# using web_extra_daemons.
+# For example, with a web app on port 3000 inside the container, this config would
+# expose that web app on https://<project>.ddev.site:9999 and http://<project>.ddev.site:9998
+# web_extra_exposed_ports:
+#  - container_port: 3000
+#    http_port: 9998
+#    https_port: 9999
+
+#web_extra_daemons:
+#- name: "http-1"
+#  command: "/var/www/html/node_modules/.bin/http-server -p 3000"
+#  directory: /var/www/html
+#- name: "http-2"
+#  command: "/var/www/html/node_modules/.bin/http-server /var/www/html/sub -p 3000"
+#  directory: /var/www/html
+
+# override_config: false
+# By default, config.*.yaml files are *merged* into the configuration
+# But this means that some things can't be overridden
+# For example, if you have 'nfs_mount_enabled: true'' you can't override it with a merge
+# and you can't erase existing hooks or all environment variables.
+# However, with "override_config: true" in a particular config.*.yaml file,
+# 'nfs_mount_enabled: false' can override the existing values, and
+# hooks:
+#   post-start: []
+# or
+# web_environment: []
+# or
+# additional_hostnames: []
+# can have their intended affect. 'override_config' affects only behavior of the
+# config.*.yaml file it exists in.
+
+# Many ddev commands can be extended to run tasks before or after the
+# ddev command is executed, for example "post-start", "post-import-db",
+# "pre-composer", "post-composer"
+# See https://ddev.readthedocs.io/en/stable/users/extend/custom-commands/ for more
+# information on the commands that can be extended and the tasks you can define
+# for them. Example:
+#hooks:
diff --git a/src/App/Page.php b/src/App/Page.php
index 0f14d9f6e6..5f4ac0f6dd 100644
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -130,7 +130,7 @@ class Page implements ArrayAccess
 	 * The return value will be casted to boolean if non-boolean was returned.
 	 * @since 5.0.0
 	 */
-	public function offsetExists($offset): bool
+	public function offsetExists(mixed $offset): bool
 	{
 		return isset($this->page[$offset]);
 	}
@@ -147,7 +147,7 @@ class Page implements ArrayAccess
 	 * @return mixed Can return all value types.
 	 * @since 5.0.0
 	 */
-	public function offsetGet($offset)
+	public function offsetGet(mixed $offset): mixed
 	{
 		return $this->page[$offset] ?? null;
 	}
@@ -167,7 +167,7 @@ class Page implements ArrayAccess
 	 * @return void
 	 * @since 5.0.0
 	 */
-	public function offsetSet($offset, $value)
+	public function offsetSet(mixed $offset, mixed $value): void
 	{
 		$this->page[$offset] = $value;
 	}
@@ -184,7 +184,7 @@ class Page implements ArrayAccess
 	 * @return void
 	 * @since 5.0.0
 	 */
-	public function offsetUnset($offset)
+	public function offsetUnset(mixed $offset): void
 	{
 		if (isset($this->page[$offset])) {
 			unset($this->page[$offset]);
diff --git a/src/BaseCollection.php b/src/BaseCollection.php
index f6fa9bbd4d..c711755722 100644
--- a/src/BaseCollection.php
+++ b/src/BaseCollection.php
@@ -48,7 +48,7 @@ class BaseCollection extends \ArrayIterator
 	/**
 	 * @inheritDoc
 	 */
-	public function offsetSet($offset, $value)
+	public function offsetSet(mixed $offset, mixed $value): void
 	{
 		if (is_null($offset)) {
 			$this->totalCount++;
@@ -60,7 +60,7 @@ class BaseCollection extends \ArrayIterator
 	/**
 	 * @inheritDoc
 	 */
-	public function offsetUnset($offset)
+	public function offsetUnset(mixed $offset): void
 	{
 		if ($this->offsetExists($offset)) {
 			$this->totalCount--;
diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index da9aee87b0..46a906b138 100644
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -794,7 +794,10 @@ class Conversation
 			return [];
 		}
 
-		$str_blocked = str_replace(["\n", "\r"], ",", $this->pConfig->get($this->session->getLocalUserId(), 'system', 'blocked'));
+		$blocked = $this->pConfig->get($this->session->getLocalUserId(), 'system', 'blocked');
+		if (!empty($blocked)) {
+			$str_blocked = str_replace(["\n", "\r"], ",", $blocked);
+		}
 		if (empty($str_blocked)) {
 			return [];
 		}
diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 0000b3d296..17fb1d12ce 100644
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -245,7 +245,7 @@ class Nav
 
 		$gdirpath = 'directory';
 
-		if (strlen(DI::config()->get('system', 'singleuser'))) {
+		if (empty(DI::config()->get('system', 'singleuser'))) {
 			$gdir = DI::config()->get('system', 'directory');
 			if (strlen($gdir)) {
 				$gdirpath = Profile::zrl($gdir, true);
diff --git a/src/Core/Session/Handler/Database.php b/src/Core/Session/Handler/Database.php
index 41ccb6b33f..6d067d8b6f 100644
--- a/src/Core/Session/Handler/Database.php
+++ b/src/Core/Session/Handler/Database.php
@@ -57,7 +57,7 @@ class Database extends AbstractSessionHandler
 		return true;
 	}
 
-	public function read($id)
+	public function read($id): string|false
 	{
 		if (empty($id)) {
 			return '';
@@ -136,7 +136,7 @@ class Database extends AbstractSessionHandler
 		}
 	}
 
-	public function gc($max_lifetime): bool
+	public function gc($max_lifetime): int|false
 	{
 		try {
 			return $this->dba->delete('session', ["`expire` < ?", time()]);
diff --git a/src/Database/Database.php b/src/Database/Database.php
index 79c39e9af7..5dac99bcee 100644
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -117,7 +117,7 @@ class Database
 			$port = trim($serverdata[1]);
 		}
 
-		if (!empty(trim($this->configCache->get('database', 'port')))) {
+		if (!empty(trim((string) $this->configCache->get('database', 'port')))) {
 			$port = trim($this->configCache->get('database', 'port'));
 		}
 
diff --git a/src/Model/Log/ParsedLogIterator.php b/src/Model/Log/ParsedLogIterator.php
index 4309e4cd00..151a66adb4 100644
--- a/src/Model/Log/ParsedLogIterator.php
+++ b/src/Model/Log/ParsedLogIterator.php
@@ -160,7 +160,7 @@ class ParsedLogIterator implements \Iterator
 	 * @see Iterator::next()
 	 * @return void
 	 */
-	public function next()
+	public function next(): void
 	{
 		$parsed = $this->read();
 
@@ -177,7 +177,7 @@ class ParsedLogIterator implements \Iterator
 	 * @see Iterator::rewind()
 	 * @return void
 	 */
-	public function rewind()
+	public function rewind(): void
 	{
 		$this->value = null;
 		$this->reader->rewind();
@@ -202,7 +202,7 @@ class ParsedLogIterator implements \Iterator
 	 * @see Iterator::current()
 	 * @return ?ParsedLogLing
 	 */
-	public function current()
+	public function current(): mixed
 	{
 		return $this->value;
 	}

From d7946dd985ba5f0c5a973b90c39d53ea72f4cc56 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 18 Nov 2022 16:11:07 +0100
Subject: [PATCH 16/45] DE translation update

---
 view/lang/de/messages.po | 5558 ++++++++++++++++++++------------------
 view/lang/de/strings.php |  877 +++---
 2 files changed, 3305 insertions(+), 3130 deletions(-)

diff --git a/view/lang/de/messages.po b/view/lang/de/messages.po
index 8b6b5b76f6..7adfb1c1e4 100644
--- a/view/lang/de/messages.po
+++ b/view/lang/de/messages.po
@@ -49,7 +49,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-24 18:18-0400\n"
+"POT-Creation-Date: 2022-11-15 21:34+0000\n"
 "PO-Revision-Date: 2011-05-05 10:19+0000\n"
 "Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016-2022\n"
 "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
@@ -59,429 +59,20 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mod/cal.php:45 mod/cal.php:49 mod/follow.php:39 mod/redir.php:35
-#: mod/redir.php:176 src/Module/Conversation/Community.php:193
-#: src/Module/Debug/ItemBody.php:38 src/Module/Diaspora/Receive.php:57
-#: src/Module/Item/Follow.php:41 src/Module/Item/Ignore.php:41
-#: src/Module/Item/Pin.php:41 src/Module/Item/Pin.php:56
-#: src/Module/Item/Star.php:42
-msgid "Access denied."
-msgstr "Zugriff verweigert."
-
-#: mod/cal.php:62 mod/cal.php:79 mod/photos.php:68 mod/photos.php:139
-#: mod/photos.php:793 src/Model/Profile.php:234 src/Module/Feed.php:72
-#: src/Module/HCard.php:51 src/Module/Profile/Common.php:40
-#: src/Module/Profile/Common.php:51 src/Module/Profile/Contacts.php:39
-#: src/Module/Profile/Contacts.php:49 src/Module/Profile/Media.php:38
-#: src/Module/Profile/Status.php:58 src/Module/Register.php:267
-#: src/Module/RemoteFollow.php:59
-msgid "User not found."
-msgstr "Benutzer nicht gefunden."
-
-#: mod/cal.php:121 mod/display.php:261 src/Module/Profile/Profile.php:93
-#: src/Module/Profile/Profile.php:108 src/Module/Profile/Status.php:109
-#: src/Module/Update/Profile.php:55
-msgid "Access to this profile has been restricted."
-msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt."
-
-#: mod/cal.php:242 mod/events.php:375 src/Content/Nav.php:196
-#: src/Content/Nav.php:260 src/Module/BaseProfile.php:84
-#: src/Module/BaseProfile.php:95 view/theme/frio/theme.php:241
-#: view/theme/frio/theme.php:245
-msgid "Events"
-msgstr "Veranstaltungen"
-
-#: mod/cal.php:243 mod/events.php:376
-msgid "View"
-msgstr "Ansehen"
-
-#: mod/cal.php:244 mod/events.php:378
-msgid "Previous"
-msgstr "Vorherige"
-
-#: mod/cal.php:245 mod/events.php:379 src/Module/Install.php:214
-msgid "Next"
-msgstr "Nächste"
-
-#: mod/cal.php:248 mod/events.php:384 src/Model/Event.php:460
-msgid "today"
-msgstr "Heute"
-
-#: mod/cal.php:249 mod/events.php:385 src/Model/Event.php:461
-#: src/Util/Temporal.php:341
-msgid "month"
-msgstr "Monat"
-
-#: mod/cal.php:250 mod/events.php:386 src/Model/Event.php:462
-#: src/Util/Temporal.php:342
-msgid "week"
-msgstr "Woche"
-
-#: mod/cal.php:251 mod/events.php:387 src/Model/Event.php:463
-#: src/Util/Temporal.php:343
-msgid "day"
-msgstr "Tag"
-
-#: mod/cal.php:252 mod/events.php:388
-msgid "list"
-msgstr "Liste"
-
-#: mod/cal.php:264 src/Console/User.php:182 src/Model/User.php:663
-#: src/Module/Admin/Users/Active.php:73 src/Module/Admin/Users/Blocked.php:74
-#: src/Module/Admin/Users/Index.php:80 src/Module/Admin/Users/Pending.php:71
-#: src/Module/Api/Twitter/ContactEndpoint.php:74
-msgid "User not found"
-msgstr "Nutzer nicht gefunden"
-
-#: mod/cal.php:273
-msgid "This calendar format is not supported"
-msgstr "Dieses Kalenderformat wird nicht unterstützt."
-
-#: mod/cal.php:275
-msgid "No exportable data found"
-msgstr "Keine exportierbaren Daten gefunden"
-
-#: mod/cal.php:291
-msgid "calendar"
-msgstr "Kalender"
-
-#: mod/display.php:142 mod/photos.php:797
-#: src/Module/Conversation/Community.php:187 src/Module/Directory.php:48
-#: src/Module/Search/Index.php:64
-msgid "Public access denied."
-msgstr "Öffentlicher Zugriff verweigert."
-
-#: mod/display.php:212 mod/display.php:286
-msgid "The requested item doesn't exist or has been deleted."
-msgstr "Der angeforderte Beitrag existiert nicht oder wurde gelöscht."
-
-#: mod/display.php:366
-msgid "The feed for this item is unavailable."
-msgstr "Der Feed für diesen Beitrag ist nicht verfügbar."
-
-#: mod/editpost.php:38 mod/events.php:218 mod/follow.php:56 mod/follow.php:130
-#: mod/item.php:181 mod/item.php:186 mod/item.php:864 mod/message.php:69
-#: mod/message.php:114 mod/notes.php:44 mod/ostatus_subscribe.php:33
-#: mod/photos.php:159 mod/photos.php:886 mod/repair_ostatus.php:31
-#: mod/settings.php:40 mod/settings.php:50 mod/settings.php:156
-#: mod/suggest.php:34 mod/uimport.php:33 mod/unfollow.php:35
-#: mod/unfollow.php:50 mod/unfollow.php:82 mod/wall_attach.php:66
-#: mod/wall_attach.php:68 mod/wall_upload.php:88 mod/wall_upload.php:90
-#: mod/wallmessage.php:37 mod/wallmessage.php:56 mod/wallmessage.php:90
-#: mod/wallmessage.php:110 src/Module/Attach.php:56 src/Module/BaseApi.php:94
-#: src/Module/BaseNotifications.php:98 src/Module/Contact/Advanced.php:60
-#: src/Module/Delegation.php:118 src/Module/FollowConfirm.php:38
-#: src/Module/FriendSuggest.php:57 src/Module/Group.php:40
-#: src/Module/Group.php:83 src/Module/Invite.php:42 src/Module/Invite.php:131
-#: src/Module/Notifications/Notification.php:76
-#: src/Module/Notifications/Notification.php:107
-#: src/Module/Profile/Common.php:55 src/Module/Profile/Contacts.php:55
-#: src/Module/Profile/Schedule.php:39 src/Module/Profile/Schedule.php:56
-#: src/Module/Register.php:77 src/Module/Register.php:90
-#: src/Module/Register.php:206 src/Module/Register.php:245
-#: src/Module/Search/Directory.php:37 src/Module/Settings/Account.php:50
-#: src/Module/Settings/Account.php:410 src/Module/Settings/Delegation.php:41
-#: src/Module/Settings/Delegation.php:69 src/Module/Settings/Display.php:41
-#: src/Module/Settings/Display.php:119
-#: src/Module/Settings/Profile/Photo/Crop.php:165
-#: src/Module/Settings/Profile/Photo/Index.php:111
-#: src/Module/Settings/UserExport.php:84
-#: src/Module/Settings/UserExport.php:118
-#: src/Module/Settings/UserExport.php:219
-#: src/Module/Settings/UserExport.php:239
-#: src/Module/Settings/UserExport.php:304
-msgid "Permission denied."
-msgstr "Zugriff verweigert."
-
-#: mod/editpost.php:45 mod/editpost.php:55
-msgid "Item not found"
-msgstr "Beitrag nicht gefunden"
-
-#: mod/editpost.php:64
-msgid "Edit post"
-msgstr "Beitrag bearbeiten"
-
-#: mod/editpost.php:91 mod/notes.php:56 src/Content/Text/HTML.php:882
-#: src/Module/Admin/Storage.php:142 src/Module/Filer/SaveTag.php:74
-msgid "Save"
-msgstr "Speichern"
-
-#: mod/editpost.php:92 mod/photos.php:1333 src/Content/Conversation.php:345
-#: src/Object/Post.php:992
-msgid "Loading..."
-msgstr "lädt..."
-
-#: mod/editpost.php:93 mod/message.php:201 mod/message.php:357
-#: mod/wallmessage.php:140 src/Content/Conversation.php:346
-msgid "Upload photo"
-msgstr "Foto hochladen"
-
-#: mod/editpost.php:94 src/Content/Conversation.php:347
-msgid "upload photo"
-msgstr "Bild hochladen"
-
-#: mod/editpost.php:95 src/Content/Conversation.php:348
-msgid "Attach file"
-msgstr "Datei anhängen"
-
-#: mod/editpost.php:96 src/Content/Conversation.php:349
-msgid "attach file"
-msgstr "Datei anhängen"
-
-#: mod/editpost.php:97 mod/message.php:202 mod/message.php:358
-#: mod/wallmessage.php:141
-msgid "Insert web link"
-msgstr "Einen Link einfügen"
-
-#: mod/editpost.php:98
-msgid "web link"
-msgstr "Weblink"
-
-#: mod/editpost.php:99
-msgid "Insert video link"
-msgstr "Video-Adresse einfügen"
-
-#: mod/editpost.php:100
-msgid "video link"
-msgstr "Video-Link"
-
-#: mod/editpost.php:101
-msgid "Insert audio link"
-msgstr "Audio-Adresse einfügen"
-
-#: mod/editpost.php:102
-msgid "audio link"
-msgstr "Audio-Link"
-
-#: mod/editpost.php:103 src/Content/Conversation.php:359
-#: src/Module/Item/Compose.php:200
-msgid "Set your location"
-msgstr "Deinen Standort festlegen"
-
-#: mod/editpost.php:104 src/Content/Conversation.php:360
-msgid "set location"
-msgstr "Ort setzen"
-
-#: mod/editpost.php:105 src/Content/Conversation.php:361
-msgid "Clear browser location"
-msgstr "Browser-Standort leeren"
-
-#: mod/editpost.php:106 src/Content/Conversation.php:362
-msgid "clear location"
-msgstr "Ort löschen"
-
-#: mod/editpost.php:107 mod/message.php:203 mod/message.php:360
-#: mod/photos.php:1484 mod/wallmessage.php:142
-#: src/Content/Conversation.php:375 src/Content/Conversation.php:721
-#: src/Module/Item/Compose.php:204 src/Object/Post.php:537
-msgid "Please wait"
-msgstr "Bitte warten"
-
-#: mod/editpost.php:108 src/Content/Conversation.php:376
-msgid "Permission settings"
-msgstr "Berechtigungseinstellungen"
-
-#: mod/editpost.php:116 src/Core/ACL.php:326
-msgid "CC: email addresses"
-msgstr "Cc: E-Mail-Addressen"
-
-#: mod/editpost.php:117 src/Content/Conversation.php:386
-msgid "Public post"
-msgstr "Öffentlicher Beitrag"
-
-#: mod/editpost.php:120 src/Content/Conversation.php:364
-#: src/Module/Item/Compose.php:205
-msgid "Set title"
-msgstr "Titel setzen"
-
-#: mod/editpost.php:122 src/Content/Conversation.php:366
-#: src/Module/Item/Compose.php:206
-msgid "Categories (comma-separated list)"
-msgstr "Kategorien (kommasepariert)"
-
-#: mod/editpost.php:123 src/Core/ACL.php:327
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Z.B.: bob@example.com, mary@example.com"
-
-#: mod/editpost.php:128 mod/events.php:514 mod/photos.php:1332
-#: mod/photos.php:1388 mod/photos.php:1462 src/Content/Conversation.php:390
-#: src/Module/Item/Compose.php:199 src/Object/Post.php:1002
-msgid "Preview"
-msgstr "Vorschau"
-
-#: mod/editpost.php:130 mod/fbrowser.php:119 mod/fbrowser.php:146
-#: mod/follow.php:144 mod/photos.php:999 mod/photos.php:1100 mod/tagrm.php:35
-#: mod/tagrm.php:127 mod/unfollow.php:97 src/Content/Conversation.php:393
-#: src/Module/Contact/Revoke.php:109 src/Module/RemoteFollow.php:128
-#: src/Module/Security/TwoFactor/SignOut.php:126
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: mod/editpost.php:134 src/Content/Conversation.php:350
-#: src/Module/Item/Compose.php:190 src/Object/Post.php:993
-msgid "Bold"
-msgstr "Fett"
-
-#: mod/editpost.php:135 src/Content/Conversation.php:351
-#: src/Module/Item/Compose.php:191 src/Object/Post.php:994
-msgid "Italic"
-msgstr "Kursiv"
-
-#: mod/editpost.php:136 src/Content/Conversation.php:352
-#: src/Module/Item/Compose.php:192 src/Object/Post.php:995
-msgid "Underline"
-msgstr "Unterstrichen"
-
-#: mod/editpost.php:137 src/Content/Conversation.php:353
-#: src/Module/Item/Compose.php:193 src/Object/Post.php:996
-msgid "Quote"
-msgstr "Zitat"
-
-#: mod/editpost.php:138 src/Content/Conversation.php:354
-#: src/Module/Item/Compose.php:194 src/Object/Post.php:997
-msgid "Code"
-msgstr "Code"
-
-#: mod/editpost.php:139 src/Content/Conversation.php:356
-#: src/Module/Item/Compose.php:196 src/Object/Post.php:999
-msgid "Link"
-msgstr "Link"
-
-#: mod/editpost.php:140 src/Content/Conversation.php:357
-#: src/Module/Item/Compose.php:197 src/Object/Post.php:1000
-msgid "Link or Media"
-msgstr "Link oder Mediendatei"
-
-#: mod/editpost.php:143 src/Content/Conversation.php:400
-#: src/Content/Widget/VCard.php:113 src/Model/Profile.php:465
-#: src/Module/Admin/Logs/View.php:93
-msgid "Message"
-msgstr "Nachricht"
-
-#: mod/editpost.php:144 src/Content/Conversation.php:401
-#: src/Module/Settings/TwoFactor/Trusted.php:139
-msgid "Browser"
-msgstr "Browser"
-
-#: mod/editpost.php:145 mod/events.php:519 mod/photos.php:934
-#: mod/photos.php:1286 src/Content/Conversation.php:377
-msgid "Permissions"
-msgstr "Berechtigungen"
-
-#: mod/editpost.php:147 src/Content/Conversation.php:403
-msgid "Open Compose page"
-msgstr "Composer Seite öffnen"
-
-#: mod/events.php:124 mod/events.php:126
-msgid "Event can not end before it has started."
-msgstr "Die Veranstaltung kann nicht enden, bevor sie beginnt."
-
-#: mod/events.php:132 mod/events.php:134
-msgid "Event title and start time are required."
-msgstr "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden."
-
-#: mod/events.php:377
-msgid "Create New Event"
-msgstr "Neue Veranstaltung erstellen"
-
-#: mod/events.php:475 src/Module/Admin/Logs/View.php:97
-msgid "Event details"
-msgstr "Veranstaltungsdetails"
-
-#: mod/events.php:476
-msgid "Starting date and Title are required."
-msgstr "Anfangszeitpunkt und Titel werden benötigt"
-
-#: mod/events.php:477 mod/events.php:482
-msgid "Event Starts:"
-msgstr "Veranstaltungsbeginn:"
-
-#: mod/events.php:477 mod/events.php:507
-#: src/Module/Admin/Blocklist/Server/Add.php:136
-#: src/Module/Admin/Blocklist/Server/Add.php:138
-#: src/Module/Admin/Blocklist/Server/Import.php:128
-#: src/Module/Admin/Blocklist/Server/Index.php:82
-#: src/Module/Admin/Blocklist/Server/Index.php:83
-#: src/Module/Admin/Blocklist/Server/Index.php:111
-#: src/Module/Admin/Blocklist/Server/Index.php:112
-#: src/Module/Admin/Item/Delete.php:69 src/Module/Debug/Probe.php:59
-#: src/Module/Install.php:207 src/Module/Install.php:240
-#: src/Module/Install.php:245 src/Module/Install.php:264
-#: src/Module/Install.php:275 src/Module/Install.php:280
-#: src/Module/Install.php:286 src/Module/Install.php:291
-#: src/Module/Install.php:305 src/Module/Install.php:320
-#: src/Module/Install.php:347 src/Module/Register.php:148
-#: src/Module/Security/TwoFactor/Verify.php:105
-#: src/Module/Settings/TwoFactor/Index.php:140
-#: src/Module/Settings/TwoFactor/Verify.php:154
-msgid "Required"
-msgstr "Benötigt"
-
-#: mod/events.php:490 mod/events.php:513
-msgid "Finish date/time is not known or not relevant"
-msgstr "Enddatum/-zeit ist nicht bekannt oder nicht relevant"
-
-#: mod/events.php:492 mod/events.php:497
-msgid "Event Finishes:"
-msgstr "Veranstaltungsende:"
-
-#: mod/events.php:503 src/Module/Profile/Profile.php:171
-#: src/Module/Settings/Profile/Index.php:238
-msgid "Description:"
-msgstr "Beschreibung"
-
-#: mod/events.php:505 src/Content/Widget/VCard.php:104 src/Model/Event.php:80
-#: src/Model/Event.php:107 src/Model/Event.php:469 src/Model/Event.php:919
-#: src/Model/Profile.php:373 src/Module/Contact/Profile.php:370
-#: src/Module/Directory.php:147 src/Module/Notifications/Introductions.php:187
-#: src/Module/Profile/Profile.php:193
-msgid "Location:"
-msgstr "Ort:"
-
-#: mod/events.php:507 mod/events.php:509
-msgid "Title:"
-msgstr "Titel:"
-
-#: mod/events.php:510 mod/events.php:511
-msgid "Share this event"
-msgstr "Veranstaltung teilen"
-
-#: mod/events.php:516 mod/message.php:204 mod/message.php:359
-#: mod/photos.php:916 mod/photos.php:1020 mod/photos.php:1290
-#: mod/photos.php:1331 mod/photos.php:1387 mod/photos.php:1461
-#: src/Module/Admin/Item/Source.php:60 src/Module/Contact/Advanced.php:132
-#: src/Module/Contact/Profile.php:328
-#: src/Module/Debug/ActivityPubConversion.php:140
-#: src/Module/Debug/Babel.php:313 src/Module/Debug/Localtime.php:64
-#: src/Module/Debug/Probe.php:54 src/Module/Debug/WebFinger.php:51
-#: src/Module/Delegation.php:147 src/Module/FriendSuggest.php:145
-#: src/Module/Install.php:252 src/Module/Install.php:294
-#: src/Module/Install.php:331 src/Module/Invite.php:178
-#: src/Module/Item/Compose.php:189 src/Module/Profile/Profile.php:246
-#: src/Module/Settings/Profile/Index.php:222 src/Object/Post.php:991
-#: view/theme/duepuntozero/config.php:85 view/theme/frio/config.php:171
-#: view/theme/quattro/config.php:87 view/theme/vier/config.php:135
-msgid "Submit"
-msgstr "Senden"
-
-#: mod/events.php:517 src/Module/Profile/Profile.php:247
-msgid "Basic"
-msgstr "Allgemein"
-
-#: mod/events.php:518 src/Module/Admin/Site.php:437 src/Module/Contact.php:477
-#: src/Module/Profile/Profile.php:248
-msgid "Advanced"
-msgstr "Erweitert"
-
-#: mod/events.php:535
-msgid "Failed to remove event"
-msgstr "Entfernen der Veranstaltung fehlgeschlagen"
-
-#: mod/fbrowser.php:61 src/Content/Nav.php:194 src/Module/BaseProfile.php:64
+#: mod/fbrowser.php:61 src/Content/Nav.php:195 src/Module/BaseProfile.php:64
 #: view/theme/frio/theme.php:239
 msgid "Photos"
 msgstr "Bilder"
 
+#: mod/fbrowser.php:119 mod/fbrowser.php:146 mod/photos.php:999
+#: mod/photos.php:1100 src/Content/Conversation.php:389
+#: src/Module/Contact/Follow.php:171 src/Module/Contact/Revoke.php:109
+#: src/Module/Contact/Unfollow.php:126 src/Module/Post/Edit.php:165
+#: src/Module/Post/Tag/Remove.php:109 src/Module/Profile/RemoteFollow.php:134
+#: src/Module/Security/TwoFactor/SignOut.php:125
+msgid "Cancel"
+msgstr "Abbrechen"
+
 #: mod/fbrowser.php:121 mod/fbrowser.php:148
 #: src/Module/Settings/Profile/Photo/Index.php:128
 msgid "Upload"
@@ -491,95 +82,68 @@ msgstr "Hochladen"
 msgid "Files"
 msgstr "Dateien"
 
-#: mod/follow.php:74 mod/unfollow.php:96 src/Module/RemoteFollow.php:127
-msgid "Submit Request"
-msgstr "Anfrage abschicken"
-
-#: mod/follow.php:84
-msgid "You already added this contact."
-msgstr "Du hast den Kontakt bereits hinzugefügt."
-
-#: mod/follow.php:100
-msgid "The network type couldn't be detected. Contact can't be added."
-msgstr "Der Netzwerktyp wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden."
-
-#: mod/follow.php:108
-msgid "Diaspora support isn't enabled. Contact can't be added."
-msgstr "Diaspora-Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."
-
-#: mod/follow.php:113
-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:404 src/Content/Widget.php:80
-#: src/Model/Contact.php:1194 src/Model/Contact.php:1205
-#: view/theme/vier/theme.php:198
-msgid "Connect/Follow"
-msgstr "Verbinden/Folgen"
-
-#: mod/follow.php:139 src/Module/RemoteFollow.php:126
-msgid "Please answer the following:"
-msgstr "Bitte beantworte folgendes:"
-
-#: mod/follow.php:140 mod/unfollow.php:94
-msgid "Your Identity Address:"
-msgstr "Adresse Deines Profils:"
-
-#: mod/follow.php:141 mod/unfollow.php:100
-#: src/Module/Admin/Blocklist/Contact.php:116
-#: src/Module/Contact/Profile.php:366
-#: src/Module/Notifications/Introductions.php:129
-#: src/Module/Notifications/Introductions.php:198
-msgid "Profile URL"
-msgstr "Profil URL"
-
-#: mod/follow.php:142 src/Module/Contact/Profile.php:378
-#: src/Module/Notifications/Introductions.php:191
-#: src/Module/Profile/Profile.php:206
-msgid "Tags:"
-msgstr "Tags:"
-
-#: mod/follow.php:153
-#, php-format
-msgid "%s knows you"
-msgstr "%skennt dich"
-
-#: mod/follow.php:154
-msgid "Add a personal note:"
-msgstr "Eine persönliche Notiz beifügen:"
-
-#: mod/follow.php:163 mod/unfollow.php:109 src/Module/BaseProfile.php:59
-#: src/Module/Contact.php:447
-msgid "Status Messages and Posts"
-msgstr "Statusnachrichten und Beiträge"
-
-#: mod/follow.php:191
-msgid "The contact could not be added."
-msgstr "Der Kontakt konnte nicht hinzugefügt werden."
-
 #: mod/item.php:131 mod/item.php:135
 msgid "Unable to locate original post."
 msgstr "Konnte den Originalbeitrag nicht finden."
 
+#: mod/item.php:181 mod/item.php:186 mod/item.php:870 mod/message.php:69
+#: mod/message.php:114 mod/notes.php:44 mod/photos.php:159 mod/photos.php:886
+#: src/Module/Attach.php:56 src/Module/BaseApi.php:94
+#: src/Module/BaseNotifications.php:98 src/Module/BaseSettings.php:52
+#: src/Module/Calendar/Event/API.php:88 src/Module/Calendar/Event/Form.php:84
+#: src/Module/Calendar/Event/Show.php:54 src/Module/Calendar/Export.php:62
+#: src/Module/Calendar/Show.php:64 src/Module/Contact/Advanced.php:60
+#: src/Module/Contact/Follow.php:86 src/Module/Contact/Follow.php:158
+#: src/Module/Contact/MatchInterests.php:86
+#: src/Module/Contact/Suggestions.php:54 src/Module/Contact/Unfollow.php:66
+#: src/Module/Contact/Unfollow.php:80 src/Module/Contact/Unfollow.php:112
+#: src/Module/Delegation.php:118 src/Module/FollowConfirm.php:38
+#: src/Module/FriendSuggest.php:57 src/Module/Group.php:40
+#: src/Module/Group.php:83 src/Module/Invite.php:42 src/Module/Invite.php:131
+#: src/Module/Notifications/Notification.php:76
+#: src/Module/Notifications/Notification.php:107
+#: src/Module/OStatus/Repair.php:60 src/Module/OStatus/Subscribe.php:66
+#: src/Module/Post/Edit.php:76 src/Module/Profile/Attachment/Upload.php:97
+#: src/Module/Profile/Common.php:55 src/Module/Profile/Contacts.php:55
+#: src/Module/Profile/Photos/Upload.php:108 src/Module/Profile/Schedule.php:39
+#: src/Module/Profile/Schedule.php:56 src/Module/Profile/UnkMail.php:69
+#: src/Module/Profile/UnkMail.php:121 src/Module/Profile/UnkMail.php:132
+#: src/Module/Register.php:77 src/Module/Register.php:90
+#: src/Module/Register.php:206 src/Module/Register.php:245
+#: src/Module/Search/Directory.php:37 src/Module/Settings/Account.php:50
+#: src/Module/Settings/Account.php:407 src/Module/Settings/Delegation.php:41
+#: src/Module/Settings/Delegation.php:69 src/Module/Settings/Display.php:41
+#: src/Module/Settings/Display.php:119
+#: src/Module/Settings/Profile/Photo/Crop.php:165
+#: src/Module/Settings/Profile/Photo/Index.php:111
+#: src/Module/Settings/RemoveMe.php:117 src/Module/Settings/UserExport.php:80
+#: src/Module/Settings/UserExport.php:114
+#: src/Module/Settings/UserExport.php:215
+#: src/Module/Settings/UserExport.php:235
+#: src/Module/Settings/UserExport.php:300 src/Module/User/Import.php:84
+#: src/Module/User/Import.php:91
+msgid "Permission denied."
+msgstr "Zugriff verweigert."
+
 #: mod/item.php:337 mod/item.php:342
 msgid "Empty post discarded."
 msgstr "Leerer Beitrag wurde verworfen."
 
-#: mod/item.php:674
+#: mod/item.php:680
 msgid "Post updated."
 msgstr "Beitrag aktualisiert."
 
-#: mod/item.php:684 mod/item.php:689
+#: mod/item.php:690 mod/item.php:695
 msgid "Item wasn't stored."
 msgstr "Eintrag wurde nicht gespeichert"
 
-#: mod/item.php:700
+#: mod/item.php:706
 msgid "Item couldn't be fetched."
 msgstr "Eintrag konnte nicht geholt werden."
 
-#: mod/item.php:840 src/Module/Admin/Themes/Details.php:39
+#: mod/item.php:846 src/Module/Admin/Themes/Details.php:39
 #: src/Module/Admin/Themes/Index.php:59 src/Module/Debug/ItemBody.php:42
-#: src/Module/Debug/ItemBody.php:57
+#: src/Module/Debug/ItemBody.php:57 src/Module/Item/Feed.php:80
 msgid "Item not found."
 msgstr "Beitrag nicht gefunden."
 
@@ -717,23 +281,11 @@ msgstr "\nDie Anmeldedaten sind die folgenden:\n\nAdresse der Seite: %1$s\nLogin
 msgid "Your password has been changed at %s"
 msgstr "Auf %s wurde dein Passwort geändert"
 
-#: mod/match.php:62
-msgid "No keywords to match. Please add keywords to your profile."
-msgstr "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu deinem Profil hinzu."
-
-#: mod/match.php:93 src/Module/BaseSearch.php:119
-msgid "No matches"
-msgstr "Keine Übereinstimmungen"
-
-#: mod/match.php:98
-msgid "Profile Match"
-msgstr "Profilübereinstimmungen"
-
-#: mod/message.php:46 mod/message.php:129 src/Content/Nav.php:288
+#: mod/message.php:46 mod/message.php:129 src/Content/Nav.php:289
 msgid "New Message"
 msgstr "Neue Nachricht"
 
-#: mod/message.php:83 mod/wallmessage.php:70
+#: mod/message.php:83 src/Module/Profile/UnkMail.php:100
 msgid "No recipient selected."
 msgstr "Kein Empfänger gewählt."
 
@@ -741,11 +293,11 @@ msgstr "Kein Empfänger gewählt."
 msgid "Unable to locate contact information."
 msgstr "Konnte die Kontaktinformationen nicht finden."
 
-#: mod/message.php:92 mod/wallmessage.php:76
+#: mod/message.php:92 src/Module/Profile/UnkMail.php:106
 msgid "Message could not be sent."
 msgstr "Nachricht konnte nicht gesendet werden."
 
-#: mod/message.php:96 mod/wallmessage.php:79
+#: mod/message.php:96 src/Module/Profile/UnkMail.php:109
 msgid "Message collection failure."
 msgstr "Konnte Nachrichten nicht abrufen."
 
@@ -755,7 +307,7 @@ msgstr "Konnte Nachrichten nicht abrufen."
 msgid "Discard"
 msgstr "Verwerfen"
 
-#: mod/message.php:136 src/Content/Nav.php:285 view/theme/frio/theme.php:246
+#: mod/message.php:136 src/Content/Nav.php:286 view/theme/frio/theme.php:246
 msgid "Messages"
 msgstr "Nachrichten"
 
@@ -771,27 +323,62 @@ msgstr "Nachricht wurde nicht gelöscht"
 msgid "Conversation was not removed."
 msgstr "Unterhaltung wurde nicht entfernt"
 
-#: mod/message.php:183 mod/message.php:289 mod/wallmessage.php:124
+#: mod/message.php:183 mod/message.php:289 src/Module/Profile/UnkMail.php:146
 msgid "Please enter a link URL:"
 msgstr "Bitte gib die URL des Links ein:"
 
-#: mod/message.php:192 mod/wallmessage.php:129
+#: mod/message.php:192 src/Module/Profile/UnkMail.php:152
 msgid "Send Private Message"
 msgstr "Private Nachricht senden"
 
-#: mod/message.php:193 mod/message.php:349 mod/wallmessage.php:131
+#: mod/message.php:193 mod/message.php:349
 msgid "To:"
 msgstr "An:"
 
-#: mod/message.php:194 mod/message.php:350 mod/wallmessage.php:132
+#: mod/message.php:194 mod/message.php:350
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: mod/message.php:198 mod/message.php:353 mod/wallmessage.php:138
-#: src/Module/Invite.php:171
+#: mod/message.php:198 mod/message.php:353 src/Module/Invite.php:171
 msgid "Your message:"
 msgstr "Deine Nachricht:"
 
+#: mod/message.php:201 mod/message.php:357 src/Content/Conversation.php:342
+#: src/Module/Post/Edit.php:128
+msgid "Upload photo"
+msgstr "Foto hochladen"
+
+#: mod/message.php:202 mod/message.php:358 src/Module/Post/Edit.php:132
+#: src/Module/Profile/UnkMail.php:154
+msgid "Insert web link"
+msgstr "Einen Link einfügen"
+
+#: mod/message.php:203 mod/message.php:360 mod/photos.php:1486
+#: src/Content/Conversation.php:371 src/Content/Conversation.php:717
+#: src/Module/Item/Compose.php:204 src/Module/Post/Edit.php:142
+#: src/Module/Profile/UnkMail.php:155 src/Object/Post.php:537
+msgid "Please wait"
+msgstr "Bitte warten"
+
+#: mod/message.php:204 mod/message.php:359 mod/photos.php:916
+#: mod/photos.php:1020 mod/photos.php:1292 mod/photos.php:1333
+#: mod/photos.php:1389 mod/photos.php:1463
+#: src/Module/Calendar/Event/Form.php:250 src/Module/Contact/Advanced.php:132
+#: src/Module/Contact/Profile.php:328
+#: src/Module/Debug/ActivityPubConversion.php:140
+#: src/Module/Debug/Babel.php:313 src/Module/Debug/Localtime.php:64
+#: src/Module/Debug/Probe.php:54 src/Module/Debug/WebFinger.php:51
+#: src/Module/Delegation.php:147 src/Module/FriendSuggest.php:145
+#: src/Module/Install.php:252 src/Module/Install.php:294
+#: src/Module/Install.php:331 src/Module/Invite.php:178
+#: src/Module/Item/Compose.php:189 src/Module/Moderation/Item/Source.php:79
+#: src/Module/Profile/Profile.php:246 src/Module/Profile/UnkMail.php:156
+#: src/Module/Settings/Profile/Index.php:231 src/Object/Post.php:986
+#: view/theme/duepuntozero/config.php:85 view/theme/frio/config.php:171
+#: view/theme/quattro/config.php:87 view/theme/vier/config.php:135
+msgid "Submit"
+msgstr "Senden"
+
 #: mod/message.php:225
 msgid "No messages."
 msgstr "Keine Nachrichten."
@@ -852,67 +439,37 @@ msgstr "Persönliche Notizen"
 msgid "Personal notes are visible only by yourself."
 msgstr "Persönliche Notizen sind nur für dich sichtbar."
 
-#: mod/ostatus_subscribe.php:38
-msgid "Subscribing to contacts"
-msgstr "Kontakten folgen"
+#: mod/notes.php:56 src/Content/Text/HTML.php:882
+#: src/Module/Admin/Storage.php:142 src/Module/Filer/SaveTag.php:74
+#: src/Module/Post/Edit.php:126
+msgid "Save"
+msgstr "Speichern"
 
-#: mod/ostatus_subscribe.php:47
-msgid "No contact provided."
-msgstr "Keine Kontakte gefunden."
-
-#: mod/ostatus_subscribe.php:53
-msgid "Couldn't fetch information for contact."
-msgstr "Konnte die Kontaktinformationen nicht einholen."
-
-#: mod/ostatus_subscribe.php:64
-msgid "Couldn't fetch friends for contact."
-msgstr "Konnte die Kontaktliste des Kontakts nicht abfragen."
-
-#: mod/ostatus_subscribe.php:70 mod/ostatus_subscribe.php:81
-msgid "Couldn't fetch following contacts."
-msgstr "Konnte Liste der gefolgten Kontakte nicht einholen."
-
-#: mod/ostatus_subscribe.php:76
-msgid "Couldn't fetch remote profile."
-msgstr "Konnte das entfernte Profil nicht laden."
-
-#: mod/ostatus_subscribe.php:86
-msgid "Unsupported network"
-msgstr "Netzwerk wird nicht unterstützt"
-
-#: mod/ostatus_subscribe.php:102 mod/repair_ostatus.php:51
-msgid "Done"
-msgstr "Erledigt"
-
-#: mod/ostatus_subscribe.php:116
-msgid "success"
-msgstr "Erfolg"
-
-#: mod/ostatus_subscribe.php:118
-msgid "failed"
-msgstr "Fehlgeschlagen"
-
-#: mod/ostatus_subscribe.php:121
-msgid "ignored"
-msgstr "Ignoriert"
-
-#: mod/ostatus_subscribe.php:126 mod/repair_ostatus.php:57
-msgid "Keep this window open until done."
-msgstr "Lasse dieses Fenster offen, bis der Vorgang abgeschlossen ist."
+#: mod/photos.php:68 mod/photos.php:139 mod/photos.php:793
+#: src/Model/Event.php:514 src/Model/Profile.php:234
+#: src/Module/Calendar/Export.php:67 src/Module/Feed.php:72
+#: src/Module/HCard.php:51 src/Module/Profile/Common.php:40
+#: src/Module/Profile/Common.php:51 src/Module/Profile/Contacts.php:39
+#: src/Module/Profile/Contacts.php:49 src/Module/Profile/Media.php:38
+#: src/Module/Profile/Photos/Upload.php:87
+#: src/Module/Profile/RemoteFollow.php:71 src/Module/Profile/Status.php:58
+#: src/Module/Register.php:267
+msgid "User not found."
+msgstr "Benutzer nicht gefunden."
 
 #: mod/photos.php:107 src/Module/BaseProfile.php:67
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
-#: mod/photos.php:108 mod/photos.php:1579
+#: mod/photos.php:108 mod/photos.php:1581
 msgid "Recent Photos"
 msgstr "Neueste Fotos"
 
-#: mod/photos.php:110 mod/photos.php:1068 mod/photos.php:1581
+#: mod/photos.php:110 mod/photos.php:1068 mod/photos.php:1583
 msgid "Upload New Photos"
 msgstr "Neue Fotos hochladen"
 
-#: mod/photos.php:128 src/Module/BaseSettings.php:35
+#: mod/photos.php:128 src/Module/BaseSettings.php:74
 msgid "everybody"
 msgstr "jeder"
 
@@ -946,7 +503,8 @@ msgid "%1$s was tagged in %2$s by %3$s"
 msgstr "%1$s wurde von %3$s in %2$s getaggt"
 
 #: mod/photos.php:631 mod/photos.php:634 mod/photos.php:661
-#: mod/wall_upload.php:200 src/Module/Settings/Profile/Photo/Index.php:59
+#: src/Module/Profile/Photos/Upload.php:213
+#: src/Module/Settings/Profile/Photo/Index.php:59
 #, php-format
 msgid "Image exceeds size limit of %s"
 msgstr "Bildgröße überschreitet das Limit von %s"
@@ -969,16 +527,22 @@ msgstr "Der Server kann derzeit keine neuen Datei-Uploads akzeptieren. Bitte kon
 msgid "Image file is empty."
 msgstr "Bilddatei ist leer."
 
-#: mod/photos.php:684 mod/wall_upload.php:162
+#: mod/photos.php:684 src/Module/Profile/Photos/Upload.php:179
+#: src/Module/Profile/Photos/Upload.php:180
 #: src/Module/Settings/Profile/Photo/Index.php:68
 msgid "Unable to process image."
 msgstr "Konnte das Bild nicht bearbeiten."
 
-#: mod/photos.php:710 mod/wall_upload.php:225
+#: mod/photos.php:710 src/Module/Profile/Photos/Upload.php:231
 #: src/Module/Settings/Profile/Photo/Index.php:95
 msgid "Image upload failed."
 msgstr "Hochladen des Bildes gescheitert."
 
+#: mod/photos.php:797 src/Module/Conversation/Community.php:187
+#: src/Module/Directory.php:48 src/Module/Search/Index.php:64
+msgid "Public access denied."
+msgstr "Öffentlicher Zugriff verweigert."
+
 #: mod/photos.php:802
 msgid "No photos selected"
 msgstr "Keine Bilder ausgewählt"
@@ -1003,6 +567,11 @@ msgstr "oder wähle ein bestehendes Album:"
 msgid "Do not show a status post for this upload"
 msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen"
 
+#: mod/photos.php:934 mod/photos.php:1288 src/Content/Conversation.php:373
+#: src/Module/Calendar/Event/Form.php:253 src/Module/Post/Edit.php:180
+msgid "Permissions"
+msgstr "Berechtigungen"
+
 #: mod/photos.php:997
 msgid "Do you really want to delete this photo album and all its photos?"
 msgstr "Möchtest du wirklich dieses Foto-Album und all seine Foto löschen?"
@@ -1027,7 +596,7 @@ msgstr "Zeige neueste zuerst"
 msgid "Show Oldest First"
 msgstr "Zeige älteste zuerst"
 
-#: mod/photos.php:1053 mod/photos.php:1564
+#: mod/photos.php:1053 mod/photos.php:1566
 msgid "View Photo"
 msgstr "Foto betrachten"
 
@@ -1043,7 +612,7 @@ msgstr "Foto nicht verfügbar"
 msgid "Do you really want to delete this photo?"
 msgstr "Möchtest du wirklich dieses Foto löschen?"
 
-#: mod/photos.php:1099 mod/photos.php:1291
+#: mod/photos.php:1099 mod/photos.php:1293
 msgid "Delete Photo"
 msgstr "Foto löschen"
 
@@ -1071,531 +640,108 @@ msgstr "Privates Foto"
 msgid "View Full Size"
 msgstr "Betrachte Originalgröße"
 
-#: mod/photos.php:1259
+#: mod/photos.php:1261
 msgid "Tags: "
 msgstr "Tags: "
 
-#: mod/photos.php:1262
+#: mod/photos.php:1264
 msgid "[Select tags to remove]"
 msgstr "[Zu entfernende Tags auswählen]"
 
-#: mod/photos.php:1277
+#: mod/photos.php:1279
 msgid "New album name"
 msgstr "Name des neuen Albums"
 
-#: mod/photos.php:1278
+#: mod/photos.php:1280
 msgid "Caption"
 msgstr "Bildunterschrift"
 
-#: mod/photos.php:1279
+#: mod/photos.php:1281
 msgid "Add a Tag"
 msgstr "Tag hinzufügen"
 
-#: mod/photos.php:1279
+#: mod/photos.php:1281
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: mod/photos.php:1280
+#: mod/photos.php:1282
 msgid "Do not rotate"
 msgstr "Nicht rotieren"
 
-#: mod/photos.php:1281
+#: mod/photos.php:1283
 msgid "Rotate CW (right)"
 msgstr "Drehen US (rechts)"
 
-#: mod/photos.php:1282
+#: mod/photos.php:1284
 msgid "Rotate CCW (left)"
 msgstr "Drehen EUS (links)"
 
-#: mod/photos.php:1328 mod/photos.php:1384 mod/photos.php:1458
+#: mod/photos.php:1330 mod/photos.php:1386 mod/photos.php:1460
 #: src/Module/Contact.php:547 src/Module/Item/Compose.php:188
-#: src/Object/Post.php:988
+#: src/Object/Post.php:983
 msgid "This is you"
 msgstr "Das bist du"
 
-#: mod/photos.php:1330 mod/photos.php:1386 mod/photos.php:1460
-#: src/Object/Post.php:531 src/Object/Post.php:990
+#: mod/photos.php:1332 mod/photos.php:1388 mod/photos.php:1462
+#: src/Object/Post.php:531 src/Object/Post.php:985
 msgid "Comment"
 msgstr "Kommentar"
 
-#: mod/photos.php:1419 src/Content/Conversation.php:637
+#: mod/photos.php:1334 mod/photos.php:1390 mod/photos.php:1464
+#: src/Content/Conversation.php:386 src/Module/Calendar/Event/Form.php:248
+#: src/Module/Item/Compose.php:199 src/Module/Post/Edit.php:163
+#: src/Object/Post.php:997
+msgid "Preview"
+msgstr "Vorschau"
+
+#: mod/photos.php:1335 src/Content/Conversation.php:341
+#: src/Module/Post/Edit.php:127 src/Object/Post.php:987
+msgid "Loading..."
+msgstr "lädt..."
+
+#: mod/photos.php:1421 src/Content/Conversation.php:633
 #: src/Object/Post.php:255
 msgid "Select"
 msgstr "Auswählen"
 
-#: mod/photos.php:1420 mod/settings.php:350 src/Content/Conversation.php:638
-#: src/Module/Admin/Users/Active.php:139
-#: src/Module/Admin/Users/Blocked.php:140 src/Module/Admin/Users/Index.php:153
+#: mod/photos.php:1422 src/Content/Conversation.php:634
+#: src/Module/Moderation/Users/Active.php:136
+#: src/Module/Moderation/Users/Blocked.php:136
+#: src/Module/Moderation/Users/Index.php:151
+#: src/Module/Settings/Connectors.php:242
 msgid "Delete"
 msgstr "Löschen"
 
-#: mod/photos.php:1481 src/Object/Post.php:378
+#: mod/photos.php:1483 src/Object/Post.php:378
 msgid "Like"
 msgstr "Mag ich"
 
-#: mod/photos.php:1482 src/Object/Post.php:378
+#: mod/photos.php:1484 src/Object/Post.php:378
 msgid "I like this (toggle)"
 msgstr "Ich mag das (toggle)"
 
-#: mod/photos.php:1483 src/Object/Post.php:379
+#: mod/photos.php:1485 src/Object/Post.php:379
 msgid "Dislike"
 msgstr "Mag ich nicht"
 
-#: mod/photos.php:1485 src/Object/Post.php:379
+#: mod/photos.php:1487 src/Object/Post.php:379
 msgid "I don't like this (toggle)"
 msgstr "Ich mag das nicht (toggle)"
 
-#: mod/photos.php:1507
+#: mod/photos.php:1509
 msgid "Map"
 msgstr "Karte"
 
-#: mod/photos.php:1570
+#: mod/photos.php:1572
 msgid "View Album"
 msgstr "Album betrachten"
 
-#: mod/redir.php:50 mod/redir.php:103
-msgid "Bad Request."
-msgstr "Ungültige Anfrage."
-
-#: mod/redir.php:56 mod/redir.php:130 src/Module/Contact/Advanced.php:70
-#: src/Module/Contact/Advanced.php:109 src/Module/Contact/Contacts.php:53
-#: src/Module/Contact/Conversations.php:84
-#: src/Module/Contact/Conversations.php:89
-#: src/Module/Contact/Conversations.php:94 src/Module/Contact/Media.php:43
-#: src/Module/Contact/Posts.php:78 src/Module/Contact/Posts.php:83
-#: src/Module/Contact/Posts.php:88 src/Module/Contact/Profile.php:142
-#: src/Module/Contact/Profile.php:147 src/Module/Contact/Profile.php:152
-#: src/Module/FriendSuggest.php:71 src/Module/FriendSuggest.php:109
-#: src/Module/Group.php:97 src/Module/Group.php:106
-msgid "Contact not found."
-msgstr "Kontakt nicht gefunden."
-
-#: mod/removeme.php:65 src/Navigation/Notifications/Repository/Notify.php:467
-msgid "[Friendica System Notify]"
-msgstr "[Friendica-Systembenachrichtigung]"
-
-#: mod/removeme.php:65
-msgid "User deleted their account"
-msgstr "Gelöschter Nutzeraccount"
-
-#: mod/removeme.php:66
-msgid ""
-"On your Friendica node an user deleted their account. Please ensure that "
-"their data is removed from the backups."
-msgstr "Ein Nutzer deiner Friendica-Instanz hat seinen Account gelöscht. Bitte stelle sicher, dass dessen Daten aus deinen Backups entfernt werden."
-
-#: mod/removeme.php:67
-#, php-format
-msgid "The user id is %d"
-msgstr "Die ID des Users lautet %d"
-
-#: mod/removeme.php:101 mod/removeme.php:104
-msgid "Remove My Account"
-msgstr "Konto löschen"
-
-#: mod/removeme.php:102
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
-msgstr "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen."
-
-#: mod/removeme.php:103
-msgid "Please enter your password for verification:"
-msgstr "Bitte gib dein Passwort zur Verifikation ein:"
-
-#: mod/repair_ostatus.php:36
-msgid "Resubscribing to OStatus contacts"
-msgstr "Erneuern der OStatus-Abonements"
-
-#: mod/repair_ostatus.php:46 src/Module/Debug/ActivityPubConversion.php:129
-#: src/Module/Debug/Babel.php:293 src/Module/Security/TwoFactor/Verify.php:102
-msgid "Error"
-msgid_plural "Errors"
-msgstr[0] "Fehler"
-msgstr[1] "Fehler"
-
-#: mod/settings.php:122
-msgid "Failed to connect with email account using the settings provided."
-msgstr "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich."
-
-#: mod/settings.php:175
-msgid "Connected Apps"
-msgstr "Verbundene Programme"
-
-#: mod/settings.php:176 src/Module/Admin/Blocklist/Contact.php:106
-#: src/Module/Admin/Users/Active.php:129
-#: src/Module/Admin/Users/Blocked.php:130 src/Module/Admin/Users/Create.php:71
-#: src/Module/Admin/Users/Deleted.php:88 src/Module/Admin/Users/Index.php:142
-#: src/Module/Admin/Users/Index.php:162 src/Module/Admin/Users/Pending.php:104
-#: src/Module/Contact/Advanced.php:134
-msgid "Name"
-msgstr "Name"
-
-#: mod/settings.php:177 src/Content/Nav.php:214
-msgid "Home Page"
-msgstr "Homepage"
-
-#: mod/settings.php:178 src/Module/Admin/Queue.php:78
-msgid "Created"
-msgstr "Erstellt"
-
-#: mod/settings.php:179
-msgid "Remove authorization"
-msgstr "Autorisierung entziehen"
-
-#: mod/settings.php:205 mod/settings.php:237 mod/settings.php:268
-#: mod/settings.php:352 src/Module/Admin/Addons/Index.php:69
-#: src/Module/Admin/Features.php:87 src/Module/Admin/Logs/Settings.php:81
-#: src/Module/Admin/Site.php:432 src/Module/Admin/Themes/Index.php:113
-#: src/Module/Admin/Tos.php:83 src/Module/Settings/Account.php:563
-#: src/Module/Settings/Delegation.php:169 src/Module/Settings/Display.php:200
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
-
-#: mod/settings.php:213
-msgid "Addon Settings"
-msgstr "Addon Einstellungen"
-
-#: mod/settings.php:214
-msgid "No Addon settings configured"
-msgstr "Keine Addon-Einstellungen konfiguriert"
-
-#: mod/settings.php:235
-msgid "Additional Features"
-msgstr "Zusätzliche Features"
-
-#: mod/settings.php:273
-msgid "Diaspora (Socialhome, Hubzilla)"
-msgstr "Diaspora (Socialhome, Hubzilla)"
-
-#: mod/settings.php:273 mod/settings.php:274
-msgid "enabled"
-msgstr "eingeschaltet"
-
-#: mod/settings.php:273 mod/settings.php:274
-msgid "disabled"
-msgstr "ausgeschaltet"
-
-#: mod/settings.php:273 mod/settings.php:274
-#, php-format
-msgid "Built-in support for %s connectivity is %s"
-msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s"
-
-#: mod/settings.php:274
-msgid "OStatus (GNU Social)"
-msgstr "OStatus (GNU Social)"
-
-#: mod/settings.php:300
-msgid "Email access is disabled on this site."
-msgstr "Zugriff auf E-Mails für diese Seite deaktiviert."
-
-#: mod/settings.php:305 mod/settings.php:350
-msgid "None"
-msgstr "Keine"
-
-#: mod/settings.php:311 src/Module/BaseSettings.php:78
-msgid "Social Networks"
-msgstr "Soziale Netzwerke"
-
-#: mod/settings.php:316
-msgid "General Social Media Settings"
-msgstr "Allgemeine Einstellungen zu Sozialen Medien"
-
-#: mod/settings.php:319
-msgid "Followed content scope"
-msgstr "Umfang zu folgender Inhalte"
-
-#: mod/settings.php:321
-msgid ""
-"By default, conversations in which your follows participated but didn't "
-"start will be shown in your timeline. You can turn this behavior off, or "
-"expand it to the conversations in which your follows liked a post."
-msgstr "Normalerweise werden Unterhaltungen an denen deine Kontakte beteiligt sind, sie aber nicht begonnen haben, in deiner Timeline angezeigt. Mit dieser Einstellung kann dieses Vorgehen kontrolliert werden. Es kann entweder dahin erweitert werden, dass auch Unterhaltungen angezeigt werden in denen deine Kontakte einen Kommentar mögen, oder komplett ausgeschaltet werden, so dass nur noch die Unterhaltungen angezeigt werden, die von deinen Kontakten gestartet wurden."
-
-#: mod/settings.php:323
-msgid "Only conversations my follows started"
-msgstr "Nur Unterhaltungen, die meine Kontakte gestartet haben"
-
-#: mod/settings.php:324
-msgid "Conversations my follows started or commented on (default)"
-msgstr "Unterhaltungen an denen meine Kontakte beteiligt sind (Grundeinstellung)"
-
-#: mod/settings.php:325
-msgid "Any conversation my follows interacted with, including likes"
-msgstr "Unterhaltungen mit denen meine Kontakte interagiert haben, inklusive likes"
-
-#: mod/settings.php:328
-msgid "Enable Content Warning"
-msgstr "Inhaltswarnungen einschalten"
-
-#: mod/settings.php:328
-msgid ""
-"Users on networks like Mastodon or Pleroma are able to set a content warning"
-" field which collapse their post by default. This enables the automatic "
-"collapsing instead of setting the content warning as the post title. Doesn't"
-" affect any other content filtering you eventually set up."
-msgstr "Benutzer in Netzwerken wie Mastodon oder Pleroma können eine Warnung für sensitive Inhalte ihrer Beiträge erstellen. Mit dieser Option werden derart markierte Beiträge automatisch zusammengeklappt und die Inhaltswarnung wird als Titel des Beitrags angezeigt. Diese Option hat keinen Einfluss auf andere Inhaltsfilterungen, die du eventuell eingerichtet hast."
-
-#: mod/settings.php:329
-msgid "Enable intelligent shortening"
-msgstr "Intelligentes kürzen einschalten"
-
-#: mod/settings.php:329
-msgid ""
-"Normally the system tries to find the best link to add to shortened posts. "
-"If disabled, every shortened post will always point to the original "
-"friendica post."
-msgstr "Normalerweise versucht das System, den besten Link zu finden, um ihn zum gekürzten Postings hinzuzufügen. Wird diese Option ausgewählt, wird stets ein Link auf die originale Friendica-Nachricht beigefügt."
-
-#: mod/settings.php:330
-msgid "Enable simple text shortening"
-msgstr "Einfache Textkürzung aktivieren"
-
-#: mod/settings.php:330
-msgid ""
-"Normally the system shortens posts at the next line feed. If this option is "
-"enabled then the system will shorten the text at the maximum character "
-"limit."
-msgstr "Normalerweise kürzt das System Beiträge bei Zeilenumbrüchen. Ist diese Option aktiv, wird das System die Kürzung beim Erreichen der maximalen Zeichenzahl vornehmen."
-
-#: mod/settings.php:331
-msgid "Attach the link title"
-msgstr "Link Titel hinzufügen"
-
-#: mod/settings.php:331
-msgid ""
-"When activated, the title of the attached link will be added as a title on "
-"posts to Diaspora. This is mostly helpful with \"remote-self\" contacts that"
-" share feed content."
-msgstr "Ist dies aktiviert, wird der Titel von angehangenen Links bei Beiträgen nach Diaspora* angefügt. Dies ist vorallem bei Entfernten Konten nützlich die Beiträge von Feeds weiterleiten."
-
-#: mod/settings.php:332
-msgid "Your legacy ActivityPub/GNU Social account"
-msgstr "Dein alter ActivityPub/GNU Social-Account"
-
-#: mod/settings.php:332
-msgid ""
-"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."
-msgstr "Wenn du deinen alten ActivityPub oder GNU Social/Statusnet-Account-Namen hier angibst (Format name@domain.tld), werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden."
-
-#: mod/settings.php:335
-msgid "Repair OStatus subscriptions"
-msgstr "OStatus-Abonnements reparieren"
-
-#: mod/settings.php:339
-msgid "Email/Mailbox Setup"
-msgstr "E-Mail/Postfach-Einstellungen"
-
-#: mod/settings.php:340
-msgid ""
-"If you wish to communicate with email contacts using this service "
-"(optional), please specify how to connect to your mailbox."
-msgstr "Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an."
-
-#: mod/settings.php:341
-msgid "Last successful email check:"
-msgstr "Letzter erfolgreicher E-Mail-Check"
-
-#: mod/settings.php:343
-msgid "IMAP server name:"
-msgstr "IMAP-Server-Name:"
-
-#: mod/settings.php:344
-msgid "IMAP port:"
-msgstr "IMAP-Port:"
-
-#: mod/settings.php:345
-msgid "Security:"
-msgstr "Sicherheit:"
-
-#: mod/settings.php:346
-msgid "Email login name:"
-msgstr "E-Mail-Login-Name:"
-
-#: mod/settings.php:347
-msgid "Email password:"
-msgstr "E-Mail-Passwort:"
-
-#: mod/settings.php:348
-msgid "Reply-to address:"
-msgstr "Reply-to Adresse:"
-
-#: mod/settings.php:349
-msgid "Send public posts to all email contacts:"
-msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:"
-
-#: mod/settings.php:350
-msgid "Action after import:"
-msgstr "Aktion nach Import:"
-
-#: mod/settings.php:350 src/Content/Nav.php:282
-msgid "Mark as seen"
-msgstr "Als gelesen markieren"
-
-#: mod/settings.php:350
-msgid "Move to folder"
-msgstr "In einen Ordner verschieben"
-
-#: mod/settings.php:351
-msgid "Move to folder:"
-msgstr "In diesen Ordner verschieben:"
-
-#: mod/suggest.php:44
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."
-
-#: mod/suggest.php:55 src/Content/Widget.php:83 view/theme/vier/theme.php:201
-msgid "Friend Suggestions"
-msgstr "Kontaktvorschläge"
-
-#: mod/tagger.php:77 src/Content/Item.php:304 src/Model/Item.php:2860
-msgid "photo"
-msgstr "Foto"
-
-#: mod/tagger.php:77 src/Content/Item.php:298 src/Content/Item.php:308
-msgid "status"
-msgstr "Status"
-
-#: mod/tagger.php:110 src/Content/Item.php:318
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s hat %2$ss %3$s mit %4$s getaggt"
-
-#: mod/tagrm.php:113
-msgid "Remove Item Tag"
-msgstr "Gegenstands-Tag entfernen"
-
-#: mod/tagrm.php:115
-msgid "Select a tag to remove: "
-msgstr "Wähle ein Tag zum Entfernen aus: "
-
-#: mod/tagrm.php:126 src/Module/Settings/Delegation.php:178
-#: src/Module/Settings/TwoFactor/Trusted.php:143
-msgid "Remove"
-msgstr "Entfernen"
-
-#: mod/uimport.php:46
-msgid "User imports on closed servers can only be done by an administrator."
-msgstr "Auf geschlossenen Servern können ausschließlich die Administratoren Benutzerkonten importieren."
-
-#: mod/uimport.php:55 src/Module/Register.php:99
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal."
-
-#: mod/uimport.php:62 src/Module/Register.php:173
-msgid "Import"
-msgstr "Import"
-
-#: mod/uimport.php:64
-msgid "Move account"
-msgstr "Account umziehen"
-
-#: mod/uimport.php:65
-msgid "You can import an account from another Friendica server."
-msgstr "Du kannst einen Account von einem anderen Friendica Server importieren."
-
-#: mod/uimport.php:66
-msgid ""
-"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."
-msgstr "Du musst deinen Account vom alten Server exportieren und hier hochladen. Wir stellen deinen alten Account mit all deinen Kontakten wieder her. Wir werden auch versuchen, deine Kontakte darüber zu informieren, dass du hierher umgezogen bist."
-
-#: mod/uimport.php:67
-msgid ""
-"This feature is experimental. We can't import contacts from the OStatus "
-"network (GNU Social/Statusnet) or from Diaspora"
-msgstr "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus-Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren"
-
-#: mod/uimport.php:68
-msgid "Account file"
-msgstr "Account-Datei"
-
-#: mod/uimport.php:68
-msgid ""
-"To export your account, go to \"Settings->Export your personal data\" and "
-"select \"Export account\""
-msgstr "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\""
-
-#: mod/unfollow.php:65 mod/unfollow.php:134
-msgid "You aren't following this contact."
-msgstr "Du folgst diesem Kontakt."
-
-#: mod/unfollow.php:71
-msgid "Unfollowing is currently not supported by your network."
-msgstr "Bei diesem Netzwerk wird das Entfolgen derzeit nicht unterstützt."
-
-#: mod/unfollow.php:92
-msgid "Disconnect/Unfollow"
-msgstr "Verbindung lösen/Nicht mehr folgen"
-
-#: mod/unfollow.php:143
-msgid "Contact was successfully unfollowed"
-msgstr "Kontakt wurde erfolgreich entfolgt."
-
-#: mod/unfollow.php:146
-msgid "Unable to unfollow this contact, please contact your administrator"
-msgstr "Konnte dem Kontakt nicht entfolgen. Bitte kontaktiere deinen Administrator."
-
-#: mod/wall_attach.php:39 mod/wall_attach.php:45 mod/wall_attach.php:74
-#: mod/wall_upload.php:53 mod/wall_upload.php:62 mod/wall_upload.php:96
-#: mod/wall_upload.php:147 mod/wall_upload.php:149
-msgid "Invalid request."
-msgstr "Ungültige Anfrage"
-
-#: mod/wall_attach.php:92
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
-msgstr "Entschuldige, die Datei scheint größer zu sein, als es die PHP-Konfiguration erlaubt."
-
-#: mod/wall_attach.php:92
-msgid "Or - did you try to upload an empty file?"
-msgstr "Oder - hast du versucht, eine leere Datei hochzuladen?"
-
-#: mod/wall_attach.php:103
-#, php-format
-msgid "File exceeds size limit of %s"
-msgstr "Die Datei ist größer als das erlaubte Limit von %s"
-
-#: mod/wall_attach.php:118
-msgid "File upload failed."
-msgstr "Hochladen der Datei fehlgeschlagen."
-
-#: mod/wall_upload.php:217 src/Model/Photo.php:1086
-msgid "Wall Photos"
-msgstr "Pinnwand-Bilder"
-
-#: mod/wallmessage.php:62 mod/wallmessage.php:116
-#, php-format
-msgid "Number of daily wall messages for %s exceeded. Message failed."
-msgstr "Maximale Anzahl der täglichen Pinnwand-Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen."
-
-#: mod/wallmessage.php:73
-msgid "Unable to check your home location."
-msgstr "Konnte Deinen Heimatort nicht bestimmen."
-
-#: mod/wallmessage.php:97 mod/wallmessage.php:104
-msgid "No recipient."
-msgstr "Kein Empfänger."
-
-#: mod/wallmessage.php:130
-#, php-format
-msgid ""
-"If you wish for %s to respond, please check that the privacy settings on "
-"your site allow private mail from unknown senders."
-msgstr "Wenn du möchtest, dass %s dir antworten kann, überprüfe deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern."
-
-#: src/App.php:497
+#: src/App.php:493
 msgid "No system theme config value set."
 msgstr "Es wurde kein Konfigurationswert für das systemweite Theme gesetzt."
 
-#: src/App.php:618
+#: src/App.php:614
 msgid "Apologies but the website is unavailable at the moment."
 msgstr "Entschuldigung, aber die Webseite ist derzeit nicht erreichbar."
 
@@ -1678,13 +824,13 @@ msgid "The contact entries have been archived"
 msgstr "Die Kontakteinträge wurden archiviert."
 
 #: src/Console/GlobalCommunityBlock.php:96
-#: src/Module/Admin/Blocklist/Contact.php:49
+#: src/Module/Moderation/Blocklist/Contact.php:65
 #, php-format
 msgid "Could not find any contact entry for this URL (%s)"
 msgstr "Für die URL (%s) konnte kein Kontakt gefunden werden"
 
 #: src/Console/GlobalCommunityBlock.php:101
-#: src/Module/Admin/Blocklist/Contact.php:66
+#: src/Module/Moderation/Blocklist/Contact.php:82
 msgid "The contact has been blocked from the node"
 msgstr "Der Kontakt wurde von diesem Knoten geblockt"
 
@@ -1802,6 +948,15 @@ msgstr "Alle ausstehenden Post-Updates wurden ausgeführt."
 msgid "Enter user nickname: "
 msgstr "Spitzname angeben:"
 
+#: src/Console/User.php:182 src/Model/User.php:661
+#: src/Module/Api/Twitter/ContactEndpoint.php:74
+#: src/Module/Moderation/Users/Active.php:71
+#: src/Module/Moderation/Users/Blocked.php:71
+#: src/Module/Moderation/Users/Index.php:78
+#: src/Module/Moderation/Users/Pending.php:67
+msgid "User not found"
+msgstr "Nutzer nicht gefunden"
+
 #: src/Console/User.php:202
 msgid "Enter new password: "
 msgstr "Neues Passwort eingeben:"
@@ -1901,10 +1056,14 @@ msgstr "OStatus"
 msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
-#: src/Content/ContactSelector.php:129 src/Module/Admin/Users/Active.php:129
-#: src/Module/Admin/Users/Blocked.php:130 src/Module/Admin/Users/Create.php:73
-#: src/Module/Admin/Users/Deleted.php:88 src/Module/Admin/Users/Index.php:142
-#: src/Module/Admin/Users/Index.php:162 src/Module/Admin/Users/Pending.php:104
+#: src/Content/ContactSelector.php:129
+#: src/Module/Moderation/Users/Active.php:126
+#: src/Module/Moderation/Users/Blocked.php:126
+#: src/Module/Moderation/Users/Create.php:73
+#: src/Module/Moderation/Users/Deleted.php:83
+#: src/Module/Moderation/Users/Index.php:140
+#: src/Module/Moderation/Users/Index.php:160
+#: src/Module/Moderation/Users/Pending.php:99
 msgid "Email"
 msgstr "E-Mail"
 
@@ -1965,258 +1124,355 @@ msgstr "pnut"
 msgid "%s (via %s)"
 msgstr "%s (via %s)"
 
-#: src/Content/Conversation.php:214
+#: src/Content/Conversation.php:210
 #, php-format
 msgid "%s likes this."
 msgstr "%s mag das."
 
-#: src/Content/Conversation.php:217
+#: src/Content/Conversation.php:213
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s mag das nicht."
 
-#: src/Content/Conversation.php:220
+#: src/Content/Conversation.php:216
 #, php-format
 msgid "%s attends."
 msgstr "%s nimmt teil."
 
-#: src/Content/Conversation.php:223
+#: src/Content/Conversation.php:219
 #, php-format
 msgid "%s doesn't attend."
 msgstr "%s nimmt nicht teil."
 
-#: src/Content/Conversation.php:226
+#: src/Content/Conversation.php:222
 #, php-format
 msgid "%s attends maybe."
 msgstr "%s nimmt eventuell teil."
 
-#: src/Content/Conversation.php:229 src/Content/Conversation.php:267
-#: src/Content/Conversation.php:881
+#: src/Content/Conversation.php:225 src/Content/Conversation.php:263
+#: src/Content/Conversation.php:877
 #, php-format
 msgid "%s reshared this."
 msgstr "%s hat dies geteilt"
 
-#: src/Content/Conversation.php:235
+#: src/Content/Conversation.php:231
 msgid "and"
 msgstr "und"
 
-#: src/Content/Conversation.php:238
+#: src/Content/Conversation.php:234
 #, php-format
 msgid "and %d other people"
 msgstr "und %dandere"
 
-#: src/Content/Conversation.php:246
+#: src/Content/Conversation.php:242
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this"
 msgstr "<span  %1$s>%2$d Personen</span> mögen das"
 
-#: src/Content/Conversation.php:247
+#: src/Content/Conversation.php:243
 #, php-format
 msgid "%s like this."
 msgstr "%s mögen das."
 
-#: src/Content/Conversation.php:250
+#: src/Content/Conversation.php:246
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this"
 msgstr "<span  %1$s>%2$d Personen</span> mögen das nicht"
 
-#: src/Content/Conversation.php:251
+#: src/Content/Conversation.php:247
 #, php-format
 msgid "%s don't like this."
 msgstr "%s mögen dies nicht."
 
-#: src/Content/Conversation.php:254
+#: src/Content/Conversation.php:250
 #, php-format
 msgid "<span  %1$s>%2$d people</span> attend"
 msgstr "<span %1$s>%2$d Personen</span> nehmen teil"
 
-#: src/Content/Conversation.php:255
+#: src/Content/Conversation.php:251
 #, php-format
 msgid "%s attend."
 msgstr "%s nehmen teil."
 
-#: src/Content/Conversation.php:258
+#: src/Content/Conversation.php:254
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't attend"
 msgstr "<span %1$s>%2$d Personen</span> nehmen nicht teil"
 
-#: src/Content/Conversation.php:259
+#: src/Content/Conversation.php:255
 #, php-format
 msgid "%s don't attend."
 msgstr "%s nehmen nicht teil."
 
-#: src/Content/Conversation.php:262
+#: src/Content/Conversation.php:258
 #, php-format
 msgid "<span  %1$s>%2$d people</span> attend maybe"
 msgstr "<span %1$s>%2$d Personen</span> nehmen eventuell teil"
 
-#: src/Content/Conversation.php:263
+#: src/Content/Conversation.php:259
 #, php-format
 msgid "%s attend maybe."
 msgstr "%s nimmt eventuell teil."
 
-#: src/Content/Conversation.php:266
+#: src/Content/Conversation.php:262
 #, php-format
 msgid "<span  %1$s>%2$d people</span> reshared this"
 msgstr "<span  %1$s>%2$d Personen</span> haben dies geteilt"
 
-#: src/Content/Conversation.php:314
+#: src/Content/Conversation.php:310
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Für <strong>jedermann</strong> sichtbar"
 
-#: src/Content/Conversation.php:315 src/Module/Item/Compose.php:198
-#: src/Object/Post.php:1001
+#: src/Content/Conversation.php:311 src/Module/Item/Compose.php:198
+#: src/Object/Post.php:996
 msgid "Please enter a image/video/audio/webpage URL:"
 msgstr "Bitte gib eine Bild/Video/Audio/Webseiten-URL ein:"
 
-#: src/Content/Conversation.php:316
+#: src/Content/Conversation.php:312
 msgid "Tag term:"
 msgstr "Tag:"
 
-#: src/Content/Conversation.php:317 src/Module/Filer/SaveTag.php:73
+#: src/Content/Conversation.php:313 src/Module/Filer/SaveTag.php:73
 msgid "Save to Folder:"
 msgstr "In diesem Ordner speichern:"
 
-#: src/Content/Conversation.php:318
+#: src/Content/Conversation.php:314
 msgid "Where are you right now?"
 msgstr "Wo hältst du dich jetzt gerade auf?"
 
-#: src/Content/Conversation.php:319
+#: src/Content/Conversation.php:315
 msgid "Delete item(s)?"
 msgstr "Einträge löschen?"
 
-#: src/Content/Conversation.php:331 src/Module/Item/Compose.php:175
+#: src/Content/Conversation.php:327 src/Module/Item/Compose.php:175
 msgid "Created at"
 msgstr "Erstellt am"
 
-#: src/Content/Conversation.php:341
+#: src/Content/Conversation.php:337
 msgid "New Post"
 msgstr "Neuer Beitrag"
 
-#: src/Content/Conversation.php:344
+#: src/Content/Conversation.php:340
 msgid "Share"
 msgstr "Teilen"
 
-#: src/Content/Conversation.php:355 src/Module/Item/Compose.php:195
-#: src/Object/Post.php:998
+#: src/Content/Conversation.php:343 src/Module/Post/Edit.php:129
+msgid "upload photo"
+msgstr "Bild hochladen"
+
+#: src/Content/Conversation.php:344 src/Module/Post/Edit.php:130
+msgid "Attach file"
+msgstr "Datei anhängen"
+
+#: src/Content/Conversation.php:345 src/Module/Post/Edit.php:131
+msgid "attach file"
+msgstr "Datei anhängen"
+
+#: src/Content/Conversation.php:346 src/Module/Item/Compose.php:190
+#: src/Module/Post/Edit.php:169 src/Object/Post.php:988
+msgid "Bold"
+msgstr "Fett"
+
+#: src/Content/Conversation.php:347 src/Module/Item/Compose.php:191
+#: src/Module/Post/Edit.php:170 src/Object/Post.php:989
+msgid "Italic"
+msgstr "Kursiv"
+
+#: src/Content/Conversation.php:348 src/Module/Item/Compose.php:192
+#: src/Module/Post/Edit.php:171 src/Object/Post.php:990
+msgid "Underline"
+msgstr "Unterstrichen"
+
+#: src/Content/Conversation.php:349 src/Module/Item/Compose.php:193
+#: src/Module/Post/Edit.php:172 src/Object/Post.php:991
+msgid "Quote"
+msgstr "Zitat"
+
+#: src/Content/Conversation.php:350 src/Module/Item/Compose.php:194
+#: src/Module/Post/Edit.php:173 src/Object/Post.php:992
+msgid "Code"
+msgstr "Code"
+
+#: src/Content/Conversation.php:351 src/Module/Item/Compose.php:195
+#: src/Object/Post.php:993
 msgid "Image"
 msgstr "Bild"
 
-#: src/Content/Conversation.php:358
+#: src/Content/Conversation.php:352 src/Module/Item/Compose.php:196
+#: src/Module/Post/Edit.php:174 src/Object/Post.php:994
+msgid "Link"
+msgstr "Link"
+
+#: src/Content/Conversation.php:353 src/Module/Item/Compose.php:197
+#: src/Module/Post/Edit.php:175 src/Object/Post.php:995
+msgid "Link or Media"
+msgstr "Link oder Mediendatei"
+
+#: src/Content/Conversation.php:354
 msgid "Video"
 msgstr "Video"
 
-#: src/Content/Conversation.php:371 src/Module/Item/Compose.php:222
+#: src/Content/Conversation.php:355 src/Module/Item/Compose.php:200
+#: src/Module/Post/Edit.php:138
+msgid "Set your location"
+msgstr "Deinen Standort festlegen"
+
+#: src/Content/Conversation.php:356 src/Module/Post/Edit.php:139
+msgid "set location"
+msgstr "Ort setzen"
+
+#: src/Content/Conversation.php:357 src/Module/Post/Edit.php:140
+msgid "Clear browser location"
+msgstr "Browser-Standort leeren"
+
+#: src/Content/Conversation.php:358 src/Module/Post/Edit.php:141
+msgid "clear location"
+msgstr "Ort löschen"
+
+#: src/Content/Conversation.php:360 src/Module/Item/Compose.php:205
+#: src/Module/Post/Edit.php:155
+msgid "Set title"
+msgstr "Titel setzen"
+
+#: src/Content/Conversation.php:362 src/Module/Item/Compose.php:206
+#: src/Module/Post/Edit.php:157
+msgid "Categories (comma-separated list)"
+msgstr "Kategorien (kommasepariert)"
+
+#: src/Content/Conversation.php:367 src/Module/Item/Compose.php:222
 msgid "Scheduled at"
 msgstr "Geplant für"
 
-#: src/Content/Conversation.php:665 src/Object/Post.php:243
+#: src/Content/Conversation.php:372 src/Module/Post/Edit.php:143
+msgid "Permission settings"
+msgstr "Berechtigungseinstellungen"
+
+#: src/Content/Conversation.php:382 src/Module/Post/Edit.php:152
+msgid "Public post"
+msgstr "Öffentlicher Beitrag"
+
+#: src/Content/Conversation.php:396 src/Content/Widget/VCard.php:113
+#: src/Model/Profile.php:465 src/Module/Admin/Logs/View.php:93
+#: src/Module/Post/Edit.php:178
+msgid "Message"
+msgstr "Nachricht"
+
+#: src/Content/Conversation.php:397 src/Module/Post/Edit.php:179
+#: src/Module/Settings/TwoFactor/Trusted.php:139
+msgid "Browser"
+msgstr "Browser"
+
+#: src/Content/Conversation.php:399 src/Module/Post/Edit.php:182
+msgid "Open Compose page"
+msgstr "Composer Seite öffnen"
+
+#: src/Content/Conversation.php:661 src/Object/Post.php:243
 msgid "Pinned item"
 msgstr "Angehefteter Beitrag"
 
-#: src/Content/Conversation.php:681 src/Object/Post.php:485
+#: src/Content/Conversation.php:677 src/Object/Post.php:485
 #: src/Object/Post.php:486
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Das Profil von %s auf %s betrachten."
 
-#: src/Content/Conversation.php:694 src/Object/Post.php:473
+#: src/Content/Conversation.php:690 src/Object/Post.php:473
 msgid "Categories:"
 msgstr "Kategorien:"
 
-#: src/Content/Conversation.php:695 src/Object/Post.php:474
+#: src/Content/Conversation.php:691 src/Object/Post.php:474
 msgid "Filed under:"
 msgstr "Abgelegt unter:"
 
-#: src/Content/Conversation.php:703 src/Object/Post.php:499
+#: src/Content/Conversation.php:699 src/Object/Post.php:499
 #, php-format
 msgid "%s from %s"
 msgstr "%s von %s"
 
-#: src/Content/Conversation.php:719
+#: src/Content/Conversation.php:715
 msgid "View in context"
 msgstr "Im Zusammenhang betrachten"
 
-#: src/Content/Conversation.php:784
+#: src/Content/Conversation.php:780
 msgid "remove"
 msgstr "löschen"
 
-#: src/Content/Conversation.php:788
+#: src/Content/Conversation.php:784
 msgid "Delete Selected Items"
 msgstr "Lösche die markierten Beiträge"
 
-#: src/Content/Conversation.php:853 src/Content/Conversation.php:856
-#: src/Content/Conversation.php:859 src/Content/Conversation.php:862
+#: src/Content/Conversation.php:849 src/Content/Conversation.php:852
+#: src/Content/Conversation.php:855 src/Content/Conversation.php:858
 #, php-format
 msgid "You had been addressed (%s)."
 msgstr "Du wurdest angeschrieben (%s)."
 
-#: src/Content/Conversation.php:865
+#: src/Content/Conversation.php:861
 #, php-format
 msgid "You are following %s."
 msgstr "Du folgst %s."
 
-#: src/Content/Conversation.php:868
+#: src/Content/Conversation.php:864
 msgid "You subscribed to one or more tags in this post."
 msgstr "Du folgst einem oder mehreren Hashtags dieses Beitrags."
 
-#: src/Content/Conversation.php:883
+#: src/Content/Conversation.php:879
 msgid "Reshared"
 msgstr "Geteilt"
 
-#: src/Content/Conversation.php:883
+#: src/Content/Conversation.php:879
 #, php-format
 msgid "Reshared by %s <%s>"
 msgstr "Geteilt von %s <%s>"
 
-#: src/Content/Conversation.php:886
+#: src/Content/Conversation.php:882
 #, php-format
 msgid "%s is participating in this thread."
 msgstr "%s ist an der Unterhaltung beteiligt."
 
-#: src/Content/Conversation.php:889
+#: src/Content/Conversation.php:885
 msgid "Stored for general reasons"
 msgstr "Aus allgemeinen Gründen aufbewahrt"
 
-#: src/Content/Conversation.php:892
+#: src/Content/Conversation.php:888
 msgid "Global post"
 msgstr "Globaler Beitrag"
 
-#: src/Content/Conversation.php:895
+#: src/Content/Conversation.php:891
 msgid "Sent via an relay server"
 msgstr "Über einen Relay-Server gesendet"
 
-#: src/Content/Conversation.php:895
+#: src/Content/Conversation.php:891
 #, php-format
 msgid "Sent via the relay server %s <%s>"
 msgstr "Über den Relay-Server %s <%s> gesendet"
 
-#: src/Content/Conversation.php:898
+#: src/Content/Conversation.php:894
 msgid "Fetched"
 msgstr "Abgerufen"
 
-#: src/Content/Conversation.php:898
+#: src/Content/Conversation.php:894
 #, php-format
 msgid "Fetched because of %s <%s>"
 msgstr "Wegen %s <%s> abgerufen"
 
-#: src/Content/Conversation.php:901
+#: src/Content/Conversation.php:897
 msgid "Stored because of a child post to complete this thread."
 msgstr "Gespeichert wegen eines untergeordneten Beitrags zur Vervollständigung dieses Themas."
 
-#: src/Content/Conversation.php:904
+#: src/Content/Conversation.php:900
 msgid "Local delivery"
 msgstr "Lokale Zustellung"
 
-#: src/Content/Conversation.php:907
+#: src/Content/Conversation.php:903
 msgid "Stored because of your activity (like, comment, star, ...)"
 msgstr "Gespeichert aufgrund Ihrer Aktivität (Like, Kommentar, Stern, ...)"
 
-#: src/Content/Conversation.php:910
+#: src/Content/Conversation.php:906
 msgid "Distributed"
 msgstr "Verteilt"
 
-#: src/Content/Conversation.php:913
+#: src/Content/Conversation.php:909
 msgid "Pushed to us"
 msgstr "Zu uns gepusht"
 
@@ -2318,7 +1574,7 @@ msgstr "Mitgliedschaftsdatum anzeigen"
 msgid "Display membership date in profile"
 msgstr "Das Datum der Registrierung deines Accounts im Profil anzeigen"
 
-#: src/Content/ForumManager.php:151 src/Content/Nav.php:241
+#: src/Content/ForumManager.php:151 src/Content/Nav.php:242
 #: src/Content/Text/HTML.php:903 src/Content/Widget.php:524
 msgid "Forums"
 msgstr "Foren"
@@ -2336,62 +1592,84 @@ msgstr "weniger anzeigen"
 msgid "show more"
 msgstr "mehr anzeigen"
 
-#: src/Content/Item.php:295 src/Model/Item.php:2858
+#: src/Content/Item.php:294 src/Model/Item.php:2871
 msgid "event"
 msgstr "Veranstaltung"
 
-#: src/Content/Item.php:387 view/theme/frio/theme.php:267
+#: src/Content/Item.php:297 src/Content/Item.php:307
+#: src/Module/Post/Tag/Add.php:123
+msgid "status"
+msgstr "Status"
+
+#: src/Content/Item.php:303 src/Model/Item.php:2873
+#: src/Module/Post/Tag/Add.php:123
+msgid "photo"
+msgstr "Foto"
+
+#: src/Content/Item.php:317 src/Module/Post/Tag/Add.php:141
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s hat %2$ss %3$s mit %4$s getaggt"
+
+#: src/Content/Item.php:386 view/theme/frio/theme.php:267
 msgid "Follow Thread"
 msgstr "Folge der Unterhaltung"
 
-#: src/Content/Item.php:388 src/Model/Contact.php:1199
+#: src/Content/Item.php:387 src/Model/Contact.php:1197
 msgid "View Status"
 msgstr "Status anschauen"
 
-#: src/Content/Item.php:389 src/Content/Item.php:407
-#: src/Model/Contact.php:1137 src/Model/Contact.php:1191
-#: src/Model/Contact.php:1200 src/Module/Directory.php:157
-#: src/Module/Settings/Profile/Index.php:225
+#: src/Content/Item.php:388 src/Content/Item.php:406
+#: src/Model/Contact.php:1135 src/Model/Contact.php:1189
+#: src/Model/Contact.php:1198 src/Module/Directory.php:157
+#: src/Module/Settings/Profile/Index.php:234
 msgid "View Profile"
 msgstr "Profil anschauen"
 
-#: src/Content/Item.php:390 src/Model/Contact.php:1201
+#: src/Content/Item.php:389 src/Model/Contact.php:1199
 msgid "View Photos"
 msgstr "Bilder anschauen"
 
-#: src/Content/Item.php:391 src/Model/Contact.php:1192
-#: src/Model/Contact.php:1202
+#: src/Content/Item.php:390 src/Model/Contact.php:1190
+#: src/Model/Contact.php:1200
 msgid "Network Posts"
 msgstr "Netzwerkbeiträge"
 
-#: src/Content/Item.php:392 src/Model/Contact.php:1193
-#: src/Model/Contact.php:1203
+#: src/Content/Item.php:391 src/Model/Contact.php:1191
+#: src/Model/Contact.php:1201
 msgid "View Contact"
 msgstr "Kontakt anzeigen"
 
-#: src/Content/Item.php:393 src/Model/Contact.php:1204
+#: src/Content/Item.php:392 src/Model/Contact.php:1202
 msgid "Send PM"
 msgstr "Private Nachricht senden"
 
-#: src/Content/Item.php:394 src/Module/Admin/Blocklist/Contact.php:100
-#: src/Module/Admin/Users/Active.php:140 src/Module/Admin/Users/Index.php:154
-#: src/Module/Contact.php:401 src/Module/Contact/Profile.php:349
-#: src/Module/Contact/Profile.php:450
+#: src/Content/Item.php:393 src/Module/Contact.php:401
+#: src/Module/Contact/Profile.php:349 src/Module/Contact/Profile.php:468
+#: src/Module/Moderation/Blocklist/Contact.php:116
+#: src/Module/Moderation/Users/Active.php:137
+#: src/Module/Moderation/Users/Index.php:152
 msgid "Block"
 msgstr "Sperren"
 
-#: src/Content/Item.php:395 src/Module/Contact.php:402
-#: src/Module/Contact/Profile.php:350 src/Module/Contact/Profile.php:458
+#: src/Content/Item.php:394 src/Module/Contact.php:402
+#: src/Module/Contact/Profile.php:350 src/Module/Contact/Profile.php:476
 #: src/Module/Notifications/Introductions.php:134
 #: src/Module/Notifications/Introductions.php:206
 #: src/Module/Notifications/Notification.php:89
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: src/Content/Item.php:399 src/Object/Post.php:454
+#: src/Content/Item.php:398 src/Object/Post.php:454
 msgid "Languages"
 msgstr "Sprachen"
 
+#: src/Content/Item.php:403 src/Content/Widget.php:80
+#: src/Model/Contact.php:1192 src/Model/Contact.php:1203
+#: src/Module/Contact/Follow.php:165 view/theme/vier/theme.php:198
+msgid "Connect/Follow"
+msgstr "Verbinden/Folgen"
+
 #: src/Content/Nav.php:90
 msgid "Nothing new here"
 msgstr "Keine Neuigkeiten"
@@ -2408,85 +1686,97 @@ msgstr "Bereinige Benachrichtigungen"
 msgid "@name, !forum, #tags, content"
 msgstr "@name, !forum, #tags, content"
 
-#: src/Content/Nav.php:185 src/Module/Security/Login.php:158
+#: src/Content/Nav.php:186 src/Module/Security/Login.php:158
 msgid "Logout"
 msgstr "Abmelden"
 
-#: src/Content/Nav.php:185
+#: src/Content/Nav.php:186
 msgid "End this session"
 msgstr "Diese Sitzung beenden"
 
-#: src/Content/Nav.php:187 src/Module/Bookmarklet.php:44
+#: src/Content/Nav.php:188 src/Module/Bookmarklet.php:44
 #: src/Module/Security/Login.php:159
 msgid "Login"
 msgstr "Anmeldung"
 
-#: src/Content/Nav.php:187
+#: src/Content/Nav.php:188
 msgid "Sign in"
 msgstr "Anmelden"
 
-#: src/Content/Nav.php:192 src/Module/BaseProfile.php:56
+#: src/Content/Nav.php:193 src/Module/BaseProfile.php:56
 #: src/Module/Contact.php:436 src/Module/Contact/Profile.php:381
 #: src/Module/Settings/TwoFactor/Index.php:119 view/theme/frio/theme.php:237
 msgid "Status"
 msgstr "Status"
 
-#: src/Content/Nav.php:192 src/Content/Nav.php:275
+#: src/Content/Nav.php:193 src/Content/Nav.php:276
 #: view/theme/frio/theme.php:237
 msgid "Your posts and conversations"
 msgstr "Deine Beiträge und Unterhaltungen"
 
-#: src/Content/Nav.php:193 src/Module/BaseProfile.php:48
-#: src/Module/BaseSettings.php:55 src/Module/Contact.php:460
+#: src/Content/Nav.php:194 src/Module/BaseProfile.php:48
+#: src/Module/BaseSettings.php:100 src/Module/Contact.php:460
 #: src/Module/Contact/Profile.php:383 src/Module/Profile/Profile.php:240
 #: src/Module/Welcome.php:57 view/theme/frio/theme.php:238
 msgid "Profile"
 msgstr "Profil"
 
-#: src/Content/Nav.php:193 view/theme/frio/theme.php:238
+#: src/Content/Nav.php:194 view/theme/frio/theme.php:238
 msgid "Your profile page"
 msgstr "Deine Profilseite"
 
-#: src/Content/Nav.php:194 view/theme/frio/theme.php:239
+#: src/Content/Nav.php:195 view/theme/frio/theme.php:239
 msgid "Your photos"
 msgstr "Deine Fotos"
 
-#: src/Content/Nav.php:195 src/Module/BaseProfile.php:72
+#: src/Content/Nav.php:196 src/Module/BaseProfile.php:72
 #: src/Module/BaseProfile.php:75 src/Module/Contact.php:452
 #: view/theme/frio/theme.php:240
 msgid "Media"
 msgstr "Medien"
 
-#: src/Content/Nav.php:195 view/theme/frio/theme.php:240
+#: src/Content/Nav.php:196 view/theme/frio/theme.php:240
 msgid "Your postings with media"
 msgstr "Deine Beiträge die Medien beinhalten"
 
-#: src/Content/Nav.php:196 view/theme/frio/theme.php:241
-msgid "Your events"
-msgstr "Deine Ereignisse"
+#: src/Content/Nav.php:197 src/Content/Nav.php:261
+#: src/Module/BaseProfile.php:84 src/Module/BaseProfile.php:87
+#: src/Module/BaseProfile.php:95 src/Module/BaseProfile.php:98
+#: src/Module/Settings/Display.php:205 view/theme/frio/theme.php:241
+#: view/theme/frio/theme.php:245
+msgid "Calendar"
+msgstr "Kalender"
 
-#: src/Content/Nav.php:197
+#: src/Content/Nav.php:197 view/theme/frio/theme.php:241
+msgid "Your calendar"
+msgstr "Dein Kalender"
+
+#: src/Content/Nav.php:198
 msgid "Personal notes"
 msgstr "Persönliche Notizen"
 
-#: src/Content/Nav.php:197
+#: src/Content/Nav.php:198
 msgid "Your personal notes"
 msgstr "Deine persönlichen Notizen"
 
-#: src/Content/Nav.php:214 src/Content/Nav.php:275
+#: src/Content/Nav.php:215 src/Content/Nav.php:276
 msgid "Home"
 msgstr "Pinnwand"
 
-#: src/Content/Nav.php:218 src/Module/Register.php:168
+#: src/Content/Nav.php:215 src/Module/Settings/OAuth.php:74
+msgid "Home Page"
+msgstr "Homepage"
+
+#: src/Content/Nav.php:219 src/Module/Register.php:168
 #: src/Module/Security/Login.php:124
 msgid "Register"
 msgstr "Registrieren"
 
-#: src/Content/Nav.php:218
+#: src/Content/Nav.php:219
 msgid "Create an account"
 msgstr "Nutzerkonto erstellen"
 
-#: src/Content/Nav.php:224 src/Module/Help.php:67
+#: src/Content/Nav.php:225 src/Module/Help.php:67
 #: src/Module/Settings/TwoFactor/AppSpecific.php:128
 #: src/Module/Settings/TwoFactor/Index.php:118
 #: src/Module/Settings/TwoFactor/Recovery.php:106
@@ -2494,158 +1784,176 @@ msgstr "Nutzerkonto erstellen"
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/Content/Nav.php:224
+#: src/Content/Nav.php:225
 msgid "Help and documentation"
 msgstr "Hilfe und Dokumentation"
 
-#: src/Content/Nav.php:228
+#: src/Content/Nav.php:229
 msgid "Apps"
 msgstr "Apps"
 
-#: src/Content/Nav.php:228
+#: src/Content/Nav.php:229
 msgid "Addon applications, utilities, games"
 msgstr "Zusätzliche Anwendungen, Dienstprogramme, Spiele"
 
-#: src/Content/Nav.php:232 src/Content/Text/HTML.php:888
+#: src/Content/Nav.php:233 src/Content/Text/HTML.php:888
 #: src/Module/Admin/Logs/View.php:87 src/Module/Search/Index.php:111
 msgid "Search"
 msgstr "Suche"
 
-#: src/Content/Nav.php:232
+#: src/Content/Nav.php:233
 msgid "Search site content"
 msgstr "Inhalt der Seite durchsuchen"
 
-#: src/Content/Nav.php:235 src/Content/Text/HTML.php:897
+#: src/Content/Nav.php:236 src/Content/Text/HTML.php:897
 msgid "Full Text"
 msgstr "Volltext"
 
-#: src/Content/Nav.php:236 src/Content/Text/HTML.php:898
+#: src/Content/Nav.php:237 src/Content/Text/HTML.php:898
 #: src/Content/Widget/TagCloud.php:68
 msgid "Tags"
 msgstr "Tags"
 
-#: src/Content/Nav.php:237 src/Content/Nav.php:296
+#: src/Content/Nav.php:238 src/Content/Nav.php:297
 #: src/Content/Text/HTML.php:899 src/Module/BaseProfile.php:125
 #: src/Module/BaseProfile.php:128 src/Module/Contact.php:373
 #: src/Module/Contact.php:467 view/theme/frio/theme.php:248
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: src/Content/Nav.php:256
+#: src/Content/Nav.php:257
 msgid "Community"
 msgstr "Gemeinschaft"
 
-#: src/Content/Nav.php:256
+#: src/Content/Nav.php:257
 msgid "Conversations on this and other servers"
 msgstr "Unterhaltungen auf diesem und anderen Servern"
 
-#: src/Content/Nav.php:260 src/Module/BaseProfile.php:87
-#: src/Module/BaseProfile.php:98 view/theme/frio/theme.php:245
-msgid "Events and Calendar"
-msgstr "Ereignisse und Kalender"
-
-#: src/Content/Nav.php:263
+#: src/Content/Nav.php:264
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: src/Content/Nav.php:263
+#: src/Content/Nav.php:264
 msgid "People directory"
 msgstr "Nutzerverzeichnis"
 
-#: src/Content/Nav.php:265 src/Module/BaseAdmin.php:85
+#: src/Content/Nav.php:266 src/Module/BaseAdmin.php:85
+#: src/Module/BaseModeration.php:108
 msgid "Information"
 msgstr "Information"
 
-#: src/Content/Nav.php:265
+#: src/Content/Nav.php:266
 msgid "Information about this friendica instance"
 msgstr "Informationen zu dieser Friendica-Instanz"
 
-#: src/Content/Nav.php:268 src/Module/Admin/Tos.php:76
-#: src/Module/BaseAdmin.php:96 src/Module/Register.php:176
+#: src/Content/Nav.php:269 src/Module/Admin/Tos.php:76
+#: src/Module/BaseAdmin.php:95 src/Module/Register.php:176
 #: src/Module/Tos.php:87
 msgid "Terms of Service"
 msgstr "Nutzungsbedingungen"
 
-#: src/Content/Nav.php:268
+#: src/Content/Nav.php:269
 msgid "Terms of Service of this Friendica instance"
 msgstr "Die Nutzungsbedingungen dieser Friendica-Instanz"
 
-#: src/Content/Nav.php:273 view/theme/frio/theme.php:244
+#: src/Content/Nav.php:274 view/theme/frio/theme.php:244
 msgid "Network"
 msgstr "Netzwerk"
 
-#: src/Content/Nav.php:273 view/theme/frio/theme.php:244
+#: src/Content/Nav.php:274 view/theme/frio/theme.php:244
 msgid "Conversations from your friends"
 msgstr "Unterhaltungen Deiner Kontakte"
 
-#: src/Content/Nav.php:279
+#: src/Content/Nav.php:280
 msgid "Introductions"
 msgstr "Kontaktanfragen"
 
-#: src/Content/Nav.php:279
+#: src/Content/Nav.php:280
 msgid "Friend Requests"
 msgstr "Kontaktanfragen"
 
-#: src/Content/Nav.php:280 src/Module/BaseNotifications.php:149
+#: src/Content/Nav.php:281 src/Module/BaseNotifications.php:149
 #: src/Module/Notifications/Introductions.php:75
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: src/Content/Nav.php:281
+#: src/Content/Nav.php:282
 msgid "See all notifications"
 msgstr "Alle Benachrichtigungen anzeigen"
 
-#: src/Content/Nav.php:282
+#: src/Content/Nav.php:283 src/Module/Settings/Connectors.php:242
+msgid "Mark as seen"
+msgstr "Als gelesen markieren"
+
+#: src/Content/Nav.php:283
 msgid "Mark all system notifications as seen"
 msgstr "Markiere alle Systembenachrichtigungen als gelesen"
 
-#: src/Content/Nav.php:285 view/theme/frio/theme.php:246
+#: src/Content/Nav.php:286 view/theme/frio/theme.php:246
 msgid "Private mail"
 msgstr "Private E-Mail"
 
-#: src/Content/Nav.php:286
+#: src/Content/Nav.php:287
 msgid "Inbox"
 msgstr "Eingang"
 
-#: src/Content/Nav.php:287
+#: src/Content/Nav.php:288
 msgid "Outbox"
 msgstr "Ausgang"
 
-#: src/Content/Nav.php:291
+#: src/Content/Nav.php:292
 msgid "Accounts"
 msgstr "Nutzerkonten"
 
-#: src/Content/Nav.php:291
+#: src/Content/Nav.php:292
 msgid "Manage other pages"
 msgstr "Andere Seiten verwalten"
 
-#: src/Content/Nav.php:294 src/Module/Admin/Addons/Details.php:114
-#: src/Module/Admin/Themes/Details.php:93 src/Module/BaseSettings.php:122
+#: src/Content/Nav.php:295 src/Module/Admin/Addons/Details.php:114
+#: src/Module/Admin/Themes/Details.php:93 src/Module/BaseSettings.php:170
 #: src/Module/Welcome.php:52 view/theme/frio/theme.php:247
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: src/Content/Nav.php:294 view/theme/frio/theme.php:247
+#: src/Content/Nav.php:295 view/theme/frio/theme.php:247
 msgid "Account settings"
 msgstr "Kontoeinstellungen"
 
-#: src/Content/Nav.php:296 view/theme/frio/theme.php:248
+#: src/Content/Nav.php:297 view/theme/frio/theme.php:248
 msgid "Manage/edit friends and contacts"
 msgstr "Freunde und Kontakte verwalten/bearbeiten"
 
-#: src/Content/Nav.php:301 src/Module/BaseAdmin.php:126
+#: src/Content/Nav.php:302 src/Module/BaseAdmin.php:119
 msgid "Admin"
 msgstr "Administration"
 
-#: src/Content/Nav.php:301
+#: src/Content/Nav.php:302
 msgid "Site setup and configuration"
 msgstr "Einstellungen der Seite und Konfiguration"
 
-#: src/Content/Nav.php:304
+#: src/Content/Nav.php:303 src/Module/BaseModeration.php:127
+#: src/Module/Moderation/Blocklist/Contact.php:110
+#: src/Module/Moderation/Blocklist/Server/Add.php:119
+#: src/Module/Moderation/Blocklist/Server/Import.php:115
+#: src/Module/Moderation/Blocklist/Server/Index.php:92
+#: src/Module/Moderation/Item/Delete.php:61
+#: src/Module/Moderation/Summary.php:76
+#: src/Module/Moderation/Users/Active.php:133
+#: src/Module/Moderation/Users/Blocked.php:133
+#: src/Module/Moderation/Users/Deleted.php:80
+#: src/Module/Moderation/Users/Index.php:147
+msgid "Moderation"
+msgstr "Moderation"
+
+#: src/Content/Nav.php:303
+msgid "Content and user moderation"
+msgstr "Moderation von Nutzern und Inhalten"
+
+#: src/Content/Nav.php:306
 msgid "Navigation"
 msgstr "Navigation"
 
-#: src/Content/Nav.php:304
+#: src/Content/Nav.php:306
 msgid "Site map"
 msgstr "Sitemap"
 
@@ -2673,38 +1981,38 @@ msgstr "nächste"
 msgid "last"
 msgstr "letzte"
 
-#: src/Content/Text/BBCode.php:1002 src/Content/Text/BBCode.php:1883
-#: src/Content/Text/BBCode.php:1884
+#: src/Content/Text/BBCode.php:1003 src/Content/Text/BBCode.php:1865
+#: src/Content/Text/BBCode.php:1866
 msgid "Image/photo"
 msgstr "Bild/Foto"
 
-#: src/Content/Text/BBCode.php:1238
+#: src/Content/Text/BBCode.php:1220
 #, php-format
 msgid "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
 msgstr "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a>%3$s"
 
-#: src/Content/Text/BBCode.php:1263 src/Model/Item.php:3461
-#: src/Model/Item.php:3467 src/Model/Item.php:3468
+#: src/Content/Text/BBCode.php:1245 src/Model/Item.php:3493
+#: src/Model/Item.php:3499 src/Model/Item.php:3500
 msgid "Link to source"
 msgstr "Link zum Originalbeitrag"
 
-#: src/Content/Text/BBCode.php:1801 src/Content/Text/HTML.php:940
+#: src/Content/Text/BBCode.php:1783 src/Content/Text/HTML.php:940
 msgid "Click to open/close"
 msgstr "Zum Öffnen/Schließen klicken"
 
-#: src/Content/Text/BBCode.php:1832
+#: src/Content/Text/BBCode.php:1814
 msgid "$1 wrote:"
 msgstr "$1 hat geschrieben:"
 
-#: src/Content/Text/BBCode.php:1888 src/Content/Text/BBCode.php:1889
+#: src/Content/Text/BBCode.php:1870 src/Content/Text/BBCode.php:1871
 msgid "Encrypted content"
 msgstr "Verschlüsselter Inhalt"
 
-#: src/Content/Text/BBCode.php:2109
+#: src/Content/Text/BBCode.php:2098
 msgid "Invalid source protocol"
 msgstr "Ungültiges Quell-Protokoll"
 
-#: src/Content/Text/BBCode.php:2124
+#: src/Content/Text/BBCode.php:2113
 msgid "Invalid link protocol"
 msgstr "Ungültiges Link-Protokoll"
 
@@ -2717,7 +2025,7 @@ msgid "The end"
 msgstr "Das Ende"
 
 #: src/Content/Text/HTML.php:882 src/Content/Widget/VCard.php:109
-#: src/Model/Profile.php:459
+#: src/Model/Profile.php:459 src/Module/Contact/Profile.php:428
 msgid "Follow"
 msgstr "Folge"
 
@@ -2761,6 +2069,11 @@ msgstr "Beispiel: Robert Morgenstein, Angeln"
 msgid "Find"
 msgstr "Finde"
 
+#: src/Content/Widget.php:83 src/Module/Contact/Suggestions.php:73
+#: view/theme/vier/theme.php:201
+msgid "Friend Suggestions"
+msgstr "Kontaktvorschläge"
+
 #: src/Content/Widget.php:84 view/theme/vier/theme.php:202
 msgid "Similar Interests"
 msgstr "Ähnliche Interessen"
@@ -2839,15 +2152,15 @@ msgstr "Personen"
 msgid "Organisations"
 msgstr "Organisationen"
 
-#: src/Content/Widget.php:523 src/Model/Contact.php:1630
+#: src/Content/Widget.php:523 src/Model/Contact.php:1629
 msgid "News"
 msgstr "Nachrichten"
 
-#: src/Content/Widget.php:527 src/Module/Settings/Account.php:456
+#: src/Content/Widget.php:527 src/Module/Settings/Account.php:453
 msgid "Account Types"
 msgstr "Kontenarten"
 
-#: src/Content/Widget.php:528 src/Module/Admin/BaseUsers.php:51
+#: src/Content/Widget.php:528 src/Module/Moderation/BaseUsers.php:69
 msgid "All"
 msgstr "Alle"
 
@@ -2907,12 +2220,23 @@ msgstr "XMPP:"
 msgid "Matrix:"
 msgstr "Matrix:"
 
-#: src/Content/Widget/VCard.php:107 src/Model/Profile.php:471
+#: src/Content/Widget/VCard.php:104 src/Model/Event.php:82
+#: src/Model/Event.php:109 src/Model/Event.php:471 src/Model/Event.php:992
+#: src/Model/Profile.php:373 src/Module/Calendar/Event/Form.php:239
+#: src/Module/Contact/Profile.php:370 src/Module/Directory.php:147
+#: src/Module/Notifications/Introductions.php:187
+#: src/Module/Profile/Profile.php:193
+msgid "Location:"
+msgstr "Ort:"
+
+#: src/Content/Widget/VCard.php:107 src/Model/Profile.php:472
 #: src/Module/Notifications/Introductions.php:201
 msgid "Network:"
 msgstr "Netzwerk:"
 
-#: src/Content/Widget/VCard.php:111 src/Model/Profile.php:461
+#: src/Content/Widget/VCard.php:111 src/Model/Contact.php:1193
+#: src/Model/Contact.php:1204 src/Model/Profile.php:461
+#: src/Module/Contact/Profile.php:420
 msgid "Unfollow"
 msgstr "Entfolgen"
 
@@ -2959,6 +2283,14 @@ msgstr "Sichtbar für:"
 msgid "Except to:"
 msgstr "Ausgenommen:"
 
+#: src/Core/ACL.php:326 src/Module/Post/Edit.php:151
+msgid "CC: email addresses"
+msgstr "Cc: E-Mail-Addressen"
+
+#: src/Core/ACL.php:327 src/Module/Post/Edit.php:158
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Z.B.: bob@example.com, mary@example.com"
+
 #: src/Core/ACL.php:328
 msgid "Connectors"
 msgstr "Connectoren"
@@ -3282,142 +2614,142 @@ msgstr "Die Datenbank wird bereits verwendet."
 msgid "Could not connect to database."
 msgstr "Verbindung zur Datenbank gescheitert."
 
-#: src/Core/L10n.php:403 src/Model/Event.php:428
+#: src/Core/L10n.php:403 src/Model/Event.php:430
 #: src/Module/Settings/Display.php:183
 msgid "Monday"
 msgstr "Montag"
 
-#: src/Core/L10n.php:403 src/Model/Event.php:429
+#: src/Core/L10n.php:403 src/Model/Event.php:431
 #: src/Module/Settings/Display.php:184
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: src/Core/L10n.php:403 src/Model/Event.php:430
+#: src/Core/L10n.php:403 src/Model/Event.php:432
 #: src/Module/Settings/Display.php:185
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: src/Core/L10n.php:403 src/Model/Event.php:431
+#: src/Core/L10n.php:403 src/Model/Event.php:433
 #: src/Module/Settings/Display.php:186
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: src/Core/L10n.php:403 src/Model/Event.php:432
+#: src/Core/L10n.php:403 src/Model/Event.php:434
 #: src/Module/Settings/Display.php:187
 msgid "Friday"
 msgstr "Freitag"
 
-#: src/Core/L10n.php:403 src/Model/Event.php:433
+#: src/Core/L10n.php:403 src/Model/Event.php:435
 #: src/Module/Settings/Display.php:188
 msgid "Saturday"
 msgstr "Samstag"
 
-#: src/Core/L10n.php:403 src/Model/Event.php:427
+#: src/Core/L10n.php:403 src/Model/Event.php:429
 #: src/Module/Settings/Display.php:182
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: src/Core/L10n.php:407 src/Model/Event.php:448
+#: src/Core/L10n.php:407 src/Model/Event.php:450
 msgid "January"
 msgstr "Januar"
 
-#: src/Core/L10n.php:407 src/Model/Event.php:449
+#: src/Core/L10n.php:407 src/Model/Event.php:451
 msgid "February"
 msgstr "Februar"
 
-#: src/Core/L10n.php:407 src/Model/Event.php:450
+#: src/Core/L10n.php:407 src/Model/Event.php:452
 msgid "March"
 msgstr "März"
 
-#: src/Core/L10n.php:407 src/Model/Event.php:451
+#: src/Core/L10n.php:407 src/Model/Event.php:453
 msgid "April"
 msgstr "April"
 
-#: src/Core/L10n.php:407 src/Core/L10n.php:426 src/Model/Event.php:439
+#: src/Core/L10n.php:407 src/Core/L10n.php:426 src/Model/Event.php:441
 msgid "May"
 msgstr "Mai"
 
-#: src/Core/L10n.php:407 src/Model/Event.php:452
+#: src/Core/L10n.php:407 src/Model/Event.php:454
 msgid "June"
 msgstr "Juni"
 
-#: src/Core/L10n.php:407 src/Model/Event.php:453
+#: src/Core/L10n.php:407 src/Model/Event.php:455
 msgid "July"
 msgstr "Juli"
 
-#: src/Core/L10n.php:407 src/Model/Event.php:454
+#: src/Core/L10n.php:407 src/Model/Event.php:456
 msgid "August"
 msgstr "August"
 
-#: src/Core/L10n.php:407 src/Model/Event.php:455
+#: src/Core/L10n.php:407 src/Model/Event.php:457
 msgid "September"
 msgstr "September"
 
-#: src/Core/L10n.php:407 src/Model/Event.php:456
+#: src/Core/L10n.php:407 src/Model/Event.php:458
 msgid "October"
 msgstr "Oktober"
 
-#: src/Core/L10n.php:407 src/Model/Event.php:457
+#: src/Core/L10n.php:407 src/Model/Event.php:459
 msgid "November"
 msgstr "November"
 
-#: src/Core/L10n.php:407 src/Model/Event.php:458
+#: src/Core/L10n.php:407 src/Model/Event.php:460
 msgid "December"
 msgstr "Dezember"
 
-#: src/Core/L10n.php:422 src/Model/Event.php:420
+#: src/Core/L10n.php:422 src/Model/Event.php:422
 msgid "Mon"
 msgstr "Mo"
 
-#: src/Core/L10n.php:422 src/Model/Event.php:421
+#: src/Core/L10n.php:422 src/Model/Event.php:423
 msgid "Tue"
 msgstr "Di"
 
-#: src/Core/L10n.php:422 src/Model/Event.php:422
+#: src/Core/L10n.php:422 src/Model/Event.php:424
 msgid "Wed"
 msgstr "Mi"
 
-#: src/Core/L10n.php:422 src/Model/Event.php:423
+#: src/Core/L10n.php:422 src/Model/Event.php:425
 msgid "Thu"
 msgstr "Do"
 
-#: src/Core/L10n.php:422 src/Model/Event.php:424
+#: src/Core/L10n.php:422 src/Model/Event.php:426
 msgid "Fri"
 msgstr "Fr"
 
-#: src/Core/L10n.php:422 src/Model/Event.php:425
+#: src/Core/L10n.php:422 src/Model/Event.php:427
 msgid "Sat"
 msgstr "Sa"
 
-#: src/Core/L10n.php:422 src/Model/Event.php:419
+#: src/Core/L10n.php:422 src/Model/Event.php:421
 msgid "Sun"
 msgstr "So"
 
-#: src/Core/L10n.php:426 src/Model/Event.php:435
+#: src/Core/L10n.php:426 src/Model/Event.php:437
 msgid "Jan"
 msgstr "Jan"
 
-#: src/Core/L10n.php:426 src/Model/Event.php:436
+#: src/Core/L10n.php:426 src/Model/Event.php:438
 msgid "Feb"
 msgstr "Feb"
 
-#: src/Core/L10n.php:426 src/Model/Event.php:437
+#: src/Core/L10n.php:426 src/Model/Event.php:439
 msgid "Mar"
 msgstr "März"
 
-#: src/Core/L10n.php:426 src/Model/Event.php:438
+#: src/Core/L10n.php:426 src/Model/Event.php:440
 msgid "Apr"
 msgstr "Apr"
 
-#: src/Core/L10n.php:426 src/Model/Event.php:440
+#: src/Core/L10n.php:426 src/Model/Event.php:442
 msgid "Jun"
 msgstr "Jun"
 
-#: src/Core/L10n.php:426 src/Model/Event.php:441
+#: src/Core/L10n.php:426 src/Model/Event.php:443
 msgid "Jul"
 msgstr "Juli"
 
-#: src/Core/L10n.php:426 src/Model/Event.php:442
+#: src/Core/L10n.php:426 src/Model/Event.php:444
 msgid "Aug"
 msgstr "Aug"
 
@@ -3425,15 +2757,15 @@ msgstr "Aug"
 msgid "Sep"
 msgstr "Sep"
 
-#: src/Core/L10n.php:426 src/Model/Event.php:444
+#: src/Core/L10n.php:426 src/Model/Event.php:446
 msgid "Oct"
 msgstr "Okt"
 
-#: src/Core/L10n.php:426 src/Model/Event.php:445
+#: src/Core/L10n.php:426 src/Model/Event.php:447
 msgid "Nov"
 msgstr "Nov"
 
-#: src/Core/L10n.php:426 src/Model/Event.php:446
+#: src/Core/L10n.php:426 src/Model/Event.php:448
 msgid "Dec"
 msgstr "Dez"
 
@@ -3467,36 +2799,36 @@ msgstr "Verzeichnis, in das Dateien hochgeladen werden. Für maximale Sicherheit
 msgid "Enter a valid existing folder"
 msgstr "Gib einen gültigen, existierenden Ordner ein"
 
-#: src/Core/Update.php:69
+#: src/Core/Update.php:70
 #, php-format
 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 "Aktualisierungen von der Version %s werden nicht unterstützt. Bitte aktualisiere vorher auf die Version 2021.01 von Friendica und warte bis das Postupdate auf die Version 1383 abgeschlossen ist."
 
-#: src/Core/Update.php:80
+#: src/Core/Update.php:81
 #, 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 "Aktualisierungen von der Postupdate Version %s werden nicht unterstützt. Bitte aktualisiere zunächst auf die Friendica Version 2021.01 und warte bis das Postupdate 1383 abgeschlossen ist."
 
-#: src/Core/Update.php:155
+#: src/Core/Update.php:156
 #, php-format
 msgid "%s: executing pre update %d"
 msgstr "%s: Pre-Update %d wird ausgeführt"
 
-#: src/Core/Update.php:193
+#: src/Core/Update.php:194
 #, php-format
 msgid "%s: executing post update %d"
 msgstr "%s: Post-Update %d wird ausgeführt"
 
-#: src/Core/Update.php:263
+#: src/Core/Update.php:264
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."
 
-#: src/Core/Update.php:317
+#: src/Core/Update.php:304
 #, php-format
 msgid ""
 "\n"
@@ -3506,53 +2838,21 @@ msgid ""
 "\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
 msgstr "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler, falls du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein."
 
-#: src/Core/Update.php:323
+#: src/Core/Update.php:310
 #, php-format
 msgid "The error message is\\n[pre]%s[/pre]"
 msgstr "Die Fehlermeldung lautet [pre]%s[/pre]"
 
-#: src/Core/Update.php:327 src/Core/Update.php:369
+#: src/Core/Update.php:314 src/Core/Update.php:342
 msgid "[Friendica Notify] Database update"
 msgstr "[Friendica-Benachrichtigung]: Datenbank Update"
 
-#: src/Core/Update.php:363
+#: src/Core/Update.php:336
 #, php-format
 msgid ""
 "\n"
-"\t\t\t\t\tThe friendica database was successfully updated from %s to %s."
-msgstr "\n \t\t\t\t\tDie Friendica Datenbank wurde erfolgreich von %s auf %s aktualisiert."
-
-#: src/Core/UserImport.php:126
-msgid "Error decoding account file"
-msgstr "Fehler beim Verarbeiten der Account-Datei"
-
-#: src/Core/UserImport.php:132
-msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica-Account-Datei?"
-
-#: src/Core/UserImport.php:140
-#, php-format
-msgid "User '%s' already exists on this server!"
-msgstr "Nutzer '%s' existiert bereits auf diesem Server!"
-
-#: src/Core/UserImport.php:176
-msgid "User creation error"
-msgstr "Fehler beim Anlegen des Nutzer-Accounts aufgetreten"
-
-#: src/Core/UserImport.php:221
-#, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] "%d Kontakt nicht importiert"
-msgstr[1] "%d Kontakte nicht importiert"
-
-#: src/Core/UserImport.php:274
-msgid "User profile creation error"
-msgstr "Fehler beim Anlegen des Nutzer-Profils"
-
-#: src/Core/UserImport.php:327
-msgid "Done. You can now login with your username and password"
-msgstr "Erledigt. Du kannst dich jetzt mit deinem Nutzernamen und Passwort anmelden"
+"\t\t\t\tThe friendica database was successfully updated from %s to %s."
+msgstr "\n\t\t\t\tDie Friendica Datenbank wurde erfolgreich von %s auf %s aktualisiert."
 
 #: src/Database/DBStructure.php:57
 #, php-format
@@ -3632,152 +2932,177 @@ msgstr "Interner Serverfehler"
 msgid "Legacy module file not found: %s"
 msgstr "Legacy-Moduldatei nicht gefunden: %s"
 
-#: src/Model/Contact.php:1195 src/Model/Contact.php:1206
-msgid "UnFollow"
-msgstr "Entfolgen"
-
-#: src/Model/Contact.php:1212 src/Module/Admin/Users/Pending.php:107
+#: src/Model/Contact.php:1210 src/Module/Moderation/Users/Pending.php:102
 #: src/Module/Notifications/Introductions.php:132
 #: src/Module/Notifications/Introductions.php:204
 msgid "Approve"
 msgstr "Genehmigen"
 
-#: src/Model/Contact.php:1626
+#: src/Model/Contact.php:1625
 msgid "Organisation"
 msgstr "Organisation"
 
-#: src/Model/Contact.php:1634
+#: src/Model/Contact.php:1633
 msgid "Forum"
 msgstr "Forum"
 
-#: src/Model/Contact.php:2820
+#: src/Model/Contact.php:2819
 msgid "Disallowed profile URL."
 msgstr "Nicht erlaubte Profil-URL."
 
-#: src/Model/Contact.php:2825 src/Module/Friendica.php:82
+#: src/Model/Contact.php:2824 src/Module/Friendica.php:82
 msgid "Blocked domain"
 msgstr "Blockierte Domain"
 
-#: src/Model/Contact.php:2830
+#: src/Model/Contact.php:2829
 msgid "Connect URL missing."
 msgstr "Connect-URL fehlt"
 
-#: src/Model/Contact.php:2839
+#: src/Model/Contact.php:2838
 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:2881
+#: src/Model/Contact.php:2880
 msgid "The profile address specified does not provide adequate information."
 msgstr "Die angegebene Profiladresse liefert unzureichende Informationen."
 
-#: src/Model/Contact.php:2883
+#: src/Model/Contact.php:2882
 msgid "No compatible communication protocols or feeds were discovered."
 msgstr "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden."
 
-#: src/Model/Contact.php:2886
+#: src/Model/Contact.php:2885
 msgid "An author or name was not found."
 msgstr "Es wurde kein Autor oder Name gefunden."
 
-#: src/Model/Contact.php:2889
+#: src/Model/Contact.php:2888
 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:2892
+#: src/Model/Contact.php:2891
 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:2893
+#: src/Model/Contact.php:2892
 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:2899
+#: src/Model/Contact.php:2898
 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:2904
+#: src/Model/Contact.php:2903
 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:2963
+#: src/Model/Contact.php:2962
 msgid "Unable to retrieve contact information."
 msgstr "Konnte die Kontaktinformationen nicht empfangen."
 
-#: src/Model/Event.php:52
+#: src/Model/Event.php:54
 msgid "l F d, Y \\@ g:i A \\G\\M\\TP (e)"
 msgstr "l F d, Y \\@ g:i A \\G\\M\\TP (e)"
 
-#: src/Model/Event.php:73 src/Model/Event.php:90 src/Model/Event.php:467
-#: src/Model/Event.php:901
+#: src/Model/Event.php:75 src/Model/Event.php:92 src/Model/Event.php:469
+#: src/Model/Event.php:974
 msgid "Starts:"
 msgstr "Beginnt:"
 
-#: src/Model/Event.php:76 src/Model/Event.php:96 src/Model/Event.php:468
-#: src/Model/Event.php:905
+#: src/Model/Event.php:78 src/Model/Event.php:98 src/Model/Event.php:470
+#: src/Model/Event.php:978
 msgid "Finishes:"
 msgstr "Endet:"
 
-#: src/Model/Event.php:417
+#: src/Model/Event.php:419
 msgid "all-day"
 msgstr "ganztägig"
 
-#: src/Model/Event.php:443
+#: src/Model/Event.php:445
 msgid "Sept"
 msgstr "Sep"
 
-#: src/Model/Event.php:465
+#: src/Model/Event.php:462 src/Module/Calendar/Show.php:125
+msgid "today"
+msgstr "Heute"
+
+#: src/Model/Event.php:463 src/Module/Calendar/Show.php:126
+#: src/Util/Temporal.php:341
+msgid "month"
+msgstr "Monat"
+
+#: src/Model/Event.php:464 src/Module/Calendar/Show.php:127
+#: src/Util/Temporal.php:342
+msgid "week"
+msgstr "Woche"
+
+#: src/Model/Event.php:465 src/Module/Calendar/Show.php:128
+#: src/Util/Temporal.php:343
+msgid "day"
+msgstr "Tag"
+
+#: src/Model/Event.php:467
 msgid "No events to display"
 msgstr "Keine Veranstaltung zum Anzeigen"
 
-#: src/Model/Event.php:581
+#: src/Model/Event.php:525 src/Module/Item/Display.php:224
+#: src/Module/Profile/Profile.php:93 src/Module/Profile/Profile.php:108
+#: src/Module/Profile/Status.php:109 src/Module/Update/Profile.php:55
+msgid "Access to this profile has been restricted."
+msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt."
+
+#: src/Model/Event.php:567 src/Module/Calendar/Event/Show.php:60
+msgid "Event not found."
+msgstr "Veranstaltung nicht gefunden."
+
+#: src/Model/Event.php:662
 msgid "l, F j"
 msgstr "l, F j"
 
-#: src/Model/Event.php:612
+#: src/Model/Event.php:689
 msgid "Edit event"
 msgstr "Veranstaltung bearbeiten"
 
-#: src/Model/Event.php:613
+#: src/Model/Event.php:690
 msgid "Duplicate event"
 msgstr "Veranstaltung kopieren"
 
-#: src/Model/Event.php:614
+#: src/Model/Event.php:691
 msgid "Delete event"
 msgstr "Veranstaltung löschen"
 
-#: src/Model/Event.php:857 src/Module/Debug/Localtime.php:38
+#: src/Model/Event.php:930 src/Module/Debug/Localtime.php:38
 msgid "l F d, Y \\@ g:i A"
 msgstr "l, d. F Y\\, H:i"
 
-#: src/Model/Event.php:858
+#: src/Model/Event.php:931
 msgid "D g:i A"
 msgstr "D H:i"
 
-#: src/Model/Event.php:859
+#: src/Model/Event.php:932
 msgid "g:i A"
 msgstr "H:i"
 
-#: src/Model/Event.php:920 src/Model/Event.php:922
+#: src/Model/Event.php:993 src/Model/Event.php:995
 msgid "Show map"
 msgstr "Karte anzeigen"
 
-#: src/Model/Event.php:921
+#: src/Model/Event.php:994
 msgid "Hide map"
 msgstr "Karte verbergen"
 
-#: src/Model/Event.php:1014
+#: src/Model/Event.php:1087
 #, php-format
 msgid "%s's birthday"
 msgstr "%ss Geburtstag"
 
-#: src/Model/Event.php:1015
+#: src/Model/Event.php:1088
 #, php-format
 msgid "Happy Birthday %s"
 msgstr "Herzlichen Glückwunsch, %s"
@@ -3826,66 +3151,66 @@ msgstr "Gruppenname:"
 msgid "Edit groups"
 msgstr "Gruppen bearbeiten"
 
-#: src/Model/Item.php:1970
+#: src/Model/Item.php:1983
 #, php-format
 msgid "Detected languages in this post:\\n%s"
 msgstr "Erkannte Sprachen in diesem Beitrag:\\n%s"
 
-#: src/Model/Item.php:2862
+#: src/Model/Item.php:2875
 msgid "activity"
 msgstr "Aktivität"
 
-#: src/Model/Item.php:2864
+#: src/Model/Item.php:2877
 msgid "comment"
 msgstr "Kommentar"
 
-#: src/Model/Item.php:2867
+#: src/Model/Item.php:2880
 msgid "post"
 msgstr "Beitrag"
 
-#: src/Model/Item.php:3010
+#: src/Model/Item.php:3021
 #, php-format
 msgid "Content warning: %s"
 msgstr "Inhaltswarnung: %s"
 
-#: src/Model/Item.php:3373
+#: src/Model/Item.php:3405
 msgid "bytes"
 msgstr "Byte"
 
-#: src/Model/Item.php:3404
+#: src/Model/Item.php:3436
 #, php-format
 msgid "%2$s (%3$d%%, %1$d vote)"
 msgid_plural "%2$s (%3$d%%, %1$d votes)"
 msgstr[0] "%2$s (%3$d%%, %1$d Stimme)"
 msgstr[1] "%2$s (%3$d%%, %1$d Stimmen)"
 
-#: src/Model/Item.php:3406
+#: src/Model/Item.php:3438
 #, php-format
 msgid "%2$s (%1$d vote)"
 msgid_plural "%2$s (%1$d votes)"
 msgstr[0] "%2$s (%1$d Stimme)"
 msgstr[1] "%2$s (%1$d Stimmen)"
 
-#: src/Model/Item.php:3411
+#: src/Model/Item.php:3443
 #, php-format
 msgid "%d voter. Poll end: %s"
 msgid_plural "%d voters. Poll end: %s"
 msgstr[0] "%d Stimme, Abstimmung endet: %s"
 msgstr[1] "%d Stimmen, Abstimmung endet: %s"
 
-#: src/Model/Item.php:3413
+#: src/Model/Item.php:3445
 #, php-format
 msgid "%d voter."
 msgid_plural "%d voters."
 msgstr[0] "%d Stimme."
 msgstr[1] "%d Stimmen."
 
-#: src/Model/Item.php:3415
+#: src/Model/Item.php:3447
 #, php-format
 msgid "Poll end: %s"
 msgstr "Abstimmung endet: %s"
 
-#: src/Model/Item.php:3449 src/Model/Item.php:3450
+#: src/Model/Item.php:3481 src/Model/Item.php:3482
 msgid "View on separate page"
 msgstr "Auf separater Seite ansehen"
 
@@ -3893,6 +3218,10 @@ msgstr "Auf separater Seite ansehen"
 msgid "[no subject]"
 msgstr "[kein Betreff]"
 
+#: src/Model/Photo.php:1086 src/Module/Profile/Photos/Upload.php:223
+msgid "Wall Photos"
+msgstr "Pinnwand-Bilder"
+
 #: src/Model/Profile.php:361 src/Module/Profile/Profile.php:255
 #: src/Module/Profile/Profile.php:257
 msgid "Edit profile"
@@ -3916,263 +3245,268 @@ msgstr "Über:"
 msgid "Atom feed"
 msgstr "Atom-Feed"
 
-#: src/Model/Profile.php:506
+#: src/Model/Profile.php:470
+msgid "This website has been verified to belong to the same person."
+msgstr "Die Webseite wurde verifiziert und gehört der gleichen Person."
+
+#: src/Model/Profile.php:507
 msgid "F d"
 msgstr "d. F"
 
-#: src/Model/Profile.php:570 src/Model/Profile.php:659
+#: src/Model/Profile.php:571 src/Model/Profile.php:660
 msgid "[today]"
 msgstr "[heute]"
 
-#: src/Model/Profile.php:579
+#: src/Model/Profile.php:580
 msgid "Birthday Reminders"
 msgstr "Geburtstagserinnerungen"
 
-#: src/Model/Profile.php:580
+#: src/Model/Profile.php:581
 msgid "Birthdays this week:"
 msgstr "Geburtstage diese Woche:"
 
-#: src/Model/Profile.php:608
+#: src/Model/Profile.php:609
 msgid "g A l F d"
 msgstr "l, d. F G \\U\\h\\r"
 
-#: src/Model/Profile.php:646
+#: src/Model/Profile.php:647
 msgid "[No description]"
 msgstr "[keine Beschreibung]"
 
-#: src/Model/Profile.php:672
+#: src/Model/Profile.php:673
 msgid "Event Reminders"
 msgstr "Veranstaltungserinnerungen"
 
-#: src/Model/Profile.php:673
+#: src/Model/Profile.php:674
 msgid "Upcoming events the next 7 days:"
 msgstr "Veranstaltungen der nächsten 7 Tage:"
 
-#: src/Model/Profile.php:867
+#: src/Model/Profile.php:869
 #, php-format
 msgid "OpenWebAuth: %1$s welcomes %2$s"
 msgstr "OpenWebAuth: %1$s heißt %2$s herzlich willkommen"
 
-#: src/Model/Profile.php:1007
+#: src/Model/Profile.php:1009
 msgid "Hometown:"
 msgstr "Heimatort:"
 
-#: src/Model/Profile.php:1008
+#: src/Model/Profile.php:1010
 msgid "Marital Status:"
 msgstr "Familienstand:"
 
-#: src/Model/Profile.php:1009
+#: src/Model/Profile.php:1011
 msgid "With:"
 msgstr "Mit:"
 
-#: src/Model/Profile.php:1010
+#: src/Model/Profile.php:1012
 msgid "Since:"
 msgstr "Seit:"
 
-#: src/Model/Profile.php:1011
+#: src/Model/Profile.php:1013
 msgid "Sexual Preference:"
 msgstr "Sexuelle Vorlieben:"
 
-#: src/Model/Profile.php:1012
+#: src/Model/Profile.php:1014
 msgid "Political Views:"
 msgstr "Politische Ansichten:"
 
-#: src/Model/Profile.php:1013
+#: src/Model/Profile.php:1015
 msgid "Religious Views:"
 msgstr "Religiöse Ansichten:"
 
-#: src/Model/Profile.php:1014
+#: src/Model/Profile.php:1016
 msgid "Likes:"
 msgstr "Likes:"
 
-#: src/Model/Profile.php:1015
+#: src/Model/Profile.php:1017
 msgid "Dislikes:"
 msgstr "Dislikes:"
 
-#: src/Model/Profile.php:1016
+#: src/Model/Profile.php:1018
 msgid "Title/Description:"
 msgstr "Titel/Beschreibung:"
 
-#: src/Model/Profile.php:1017 src/Module/Admin/Summary.php:235
+#: src/Model/Profile.php:1019 src/Module/Admin/Summary.php:215
+#: src/Module/Moderation/Summary.php:77
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: src/Model/Profile.php:1018
+#: src/Model/Profile.php:1020
 msgid "Musical interests"
 msgstr "Musikalische Interessen"
 
-#: src/Model/Profile.php:1019
+#: src/Model/Profile.php:1021
 msgid "Books, literature"
 msgstr "Bücher, Literatur"
 
-#: src/Model/Profile.php:1020
+#: src/Model/Profile.php:1022
 msgid "Television"
 msgstr "Fernsehen"
 
-#: src/Model/Profile.php:1021
+#: src/Model/Profile.php:1023
 msgid "Film/dance/culture/entertainment"
 msgstr "Filme/Tänze/Kultur/Unterhaltung"
 
-#: src/Model/Profile.php:1022
+#: src/Model/Profile.php:1024
 msgid "Hobbies/Interests"
 msgstr "Hobbies/Interessen"
 
-#: src/Model/Profile.php:1023
+#: src/Model/Profile.php:1025
 msgid "Love/romance"
 msgstr "Liebe/Romantik"
 
-#: src/Model/Profile.php:1024
+#: src/Model/Profile.php:1026
 msgid "Work/employment"
 msgstr "Arbeit/Anstellung"
 
-#: src/Model/Profile.php:1025
+#: src/Model/Profile.php:1027
 msgid "School/education"
 msgstr "Schule/Ausbildung"
 
-#: src/Model/Profile.php:1026
+#: src/Model/Profile.php:1028
 msgid "Contact information and Social Networks"
 msgstr "Kontaktinformationen und Soziale Netzwerke"
 
-#: src/Model/User.php:212 src/Model/User.php:1085
+#: src/Model/User.php:212 src/Model/User.php:1080
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden."
 
-#: src/Model/User.php:572 src/Model/User.php:605
+#: src/Model/User.php:570 src/Model/User.php:603
 msgid "Login failed"
 msgstr "Anmeldung fehlgeschlagen"
 
-#: src/Model/User.php:637
+#: src/Model/User.php:635
 msgid "Not enough information to authenticate"
 msgstr "Nicht genügend Informationen für die Authentifizierung"
 
-#: src/Model/User.php:732
+#: src/Model/User.php:730
 msgid "Password can't be empty"
 msgstr "Das Passwort kann nicht leer sein"
 
-#: src/Model/User.php:774
+#: src/Model/User.php:772
 msgid "Empty passwords are not allowed."
 msgstr "Leere Passwörter sind nicht erlaubt."
 
-#: src/Model/User.php:778
+#: src/Model/User.php:776
 msgid ""
 "The new password has been exposed in a public data dump, please choose "
 "another."
 msgstr "Das neue Passwort wurde in einem öffentlichen Daten-Dump veröffentlicht. Bitte verwende ein anderes Passwort."
 
-#: src/Model/User.php:782
+#: src/Model/User.php:780
 msgid "The password length is limited to 72 characters."
 msgstr "Die Länge des Passworts ist auf 72 Zeichen begrenzt."
 
-#: src/Model/User.php:786
+#: src/Model/User.php:784
 msgid ""
 "The password can't contain accentuated letters, white spaces or colons (:)"
 msgstr "Das Passwort darf keine akzentuierten Buchstaben, Leerzeichen oder Doppelpunkte (:) beinhalten"
 
-#: src/Model/User.php:965
+#: src/Model/User.php:963
 msgid "Passwords do not match. Password unchanged."
 msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."
 
-#: src/Model/User.php:972
+#: src/Model/User.php:970
 msgid "An invitation is required."
 msgstr "Du benötigst eine Einladung."
 
-#: src/Model/User.php:976
+#: src/Model/User.php:974
 msgid "Invitation could not be verified."
 msgstr "Die Einladung konnte nicht überprüft werden."
 
-#: src/Model/User.php:984
+#: src/Model/User.php:982
 msgid "Invalid OpenID url"
 msgstr "Ungültige OpenID URL"
 
-#: src/Model/User.php:997 src/Security/Authentication.php:239
+#: src/Model/User.php:995 src/Security/Authentication.php:239
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr "Beim Versuch, dich mit der von dir angegebenen OpenID anzumelden, trat ein Problem auf. Bitte überprüfe, dass du die OpenID richtig geschrieben hast."
 
-#: src/Model/User.php:997 src/Security/Authentication.php:239
+#: src/Model/User.php:995 src/Security/Authentication.php:239
 msgid "The error message was:"
 msgstr "Die Fehlermeldung lautete:"
 
-#: src/Model/User.php:1003
+#: src/Model/User.php:1001
 msgid "Please enter the required information."
 msgstr "Bitte trage die erforderlichen Informationen ein."
 
-#: src/Model/User.php:1017
+#: src/Model/User.php:1015
 #, php-format
 msgid ""
 "system.username_min_length (%s) and system.username_max_length (%s) are "
 "excluding each other, swapping values."
 msgstr "system.username_min_length (%s) and system.username_max_length (%s) schließen sich gegenseitig aus, tausche Werte aus."
 
-#: src/Model/User.php:1024
+#: src/Model/User.php:1022
 #, php-format
 msgid "Username should be at least %s character."
 msgid_plural "Username should be at least %s characters."
 msgstr[0] "Der Benutzername sollte aus mindestens %s Zeichen bestehen."
 msgstr[1] "Der Benutzername sollte aus mindestens %s Zeichen bestehen."
 
-#: src/Model/User.php:1028
+#: src/Model/User.php:1026
 #, php-format
 msgid "Username should be at most %s character."
 msgid_plural "Username should be at most %s characters."
 msgstr[0] "Der Benutzername sollte aus maximal %s Zeichen bestehen."
 msgstr[1] "Der Benutzername sollte aus maximal %s Zeichen bestehen."
 
-#: src/Model/User.php:1036
+#: src/Model/User.php:1034
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr "Das scheint nicht dein kompletter Name (Vor- und Nachname) zu sein."
 
-#: src/Model/User.php:1041
+#: src/Model/User.php:1039
 msgid "Your email domain is not among those allowed on this site."
 msgstr "Die Domain Deiner E-Mail-Adresse ist auf dieser Seite nicht erlaubt."
 
-#: src/Model/User.php:1045
+#: src/Model/User.php:1043
 msgid "Not a valid email address."
 msgstr "Keine gültige E-Mail-Adresse."
 
-#: src/Model/User.php:1048
+#: src/Model/User.php:1046
 msgid "The nickname was blocked from registration by the nodes admin."
 msgstr "Der Admin des Knotens hat den Spitznamen für die Registrierung gesperrt."
 
-#: src/Model/User.php:1052 src/Model/User.php:1060
+#: src/Model/User.php:1050 src/Model/User.php:1056
 msgid "Cannot use that email."
 msgstr "Konnte diese E-Mail-Adresse nicht verwenden."
 
-#: src/Model/User.php:1067
+#: src/Model/User.php:1062
 msgid "Your nickname can only contain a-z, 0-9 and _."
 msgstr "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen."
 
-#: src/Model/User.php:1075 src/Model/User.php:1132
+#: src/Model/User.php:1070 src/Model/User.php:1127
 msgid "Nickname is already registered. Please choose another."
 msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."
 
-#: src/Model/User.php:1119 src/Model/User.php:1123
+#: src/Model/User.php:1114 src/Model/User.php:1118
 msgid "An error occurred during registration. Please try again."
 msgstr "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
 
-#: src/Model/User.php:1146
+#: src/Model/User.php:1141
 msgid "An error occurred creating your default profile. Please try again."
 msgstr "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
 
-#: src/Model/User.php:1153
+#: src/Model/User.php:1148
 msgid "An error occurred creating your self contact. Please try again."
 msgstr "Bei der Erstellung deines self-Kontakts ist ein Fehler aufgetreten. Bitte versuche es erneut."
 
-#: src/Model/User.php:1158
+#: src/Model/User.php:1153
 msgid "Friends"
 msgstr "Kontakte"
 
-#: src/Model/User.php:1162
+#: src/Model/User.php:1157
 msgid ""
 "An error occurred creating your default contact group. Please try again."
 msgstr "Bei der Erstellung deiner Standardgruppe für Kontakte ist ein Fehler aufgetreten. Bitte versuche es erneut."
 
-#: src/Model/User.php:1201
+#: src/Model/User.php:1196
 msgid "Profile Photos"
 msgstr "Profilbilder"
 
-#: src/Model/User.php:1394
+#: src/Model/User.php:1389
 #, php-format
 msgid ""
 "\n"
@@ -4180,7 +3514,7 @@ msgid ""
 "\t\t\tthe administrator of %2$s has set up an account for you."
 msgstr "\nHallo %1$s\nein Admin von %2$s hat dir ein Nutzerkonto angelegt."
 
-#: src/Model/User.php:1397
+#: src/Model/User.php:1392
 #, php-format
 msgid ""
 "\n"
@@ -4207,17 +3541,17 @@ msgid ""
 "\t\tIf you are new and do not know anybody here, they may help\n"
 "\t\tyou to make some new and interesting friends.\n"
 "\n"
-"\t\tIf you ever want to delete your account, you can do so at %1$s/removeme\n"
+"\t\tIf you ever want to delete your account, you can do so at %1$s/settings/removeme\n"
 "\n"
 "\t\tThank you and welcome to %4$s."
-msgstr "\nNachfolgend die Anmeldedetails:\n\nAdresse der Seite: %1$s\nBenutzername: %2$s\nPasswort: %3$s\n\nDu kannst dein Passwort unter \"Einstellungen\" ändern, sobald du dich angemeldet hast.Bitte nimm dir ein paar Minuten, um die anderen Einstellungen auf dieser Seite zu kontrollieren.Eventuell magst du ja auch einige Informationen über dich in deinem Profil veröffentlichen, damit andere Leute dich einfacher finden können.Bearbeite hierfür einfach dein Standard-Profil (über die Profil-Seite).Wir empfehlen dir, deinen kompletten Namen anzugeben und ein zu dir passendes Profilbild zu wählen, damit dich alte Bekannte wiederfinden.Außerdem ist es nützlich, wenn du auf deinem Profil Schlüsselwörter angibst. Das erleichtert es, Leute zu finden, die deine Interessen teilen.Wir respektieren deine Privatsphäre - keine dieser Angaben ist nötig.Wenn du neu im Netzwerk bist und noch niemanden kennst, dann können sie allerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nDu kannst dein Nutzerkonto  jederzeit unter %1$s/removeme wieder löschen.\n\nDanke und willkommen auf %4$s."
+msgstr "\nNachfolgend die Anmeldedetails:\n\nAdresse der Seite: %1$s\nBenutzername: %2$s\nPasswort: %3$s\n\nDu kannst dein Passwort unter \"Einstellungen\" ändern, sobald du dich angemeldet hast.Bitte nimm dir ein paar Minuten, um die anderen Einstellungen auf dieser Seite zu kontrollieren.Eventuell magst du ja auch einige Informationen über dich in deinem Profil veröffentlichen, damit andere Leute dich einfacher finden können.Bearbeite hierfür einfach dein Standard-Profil (über die Profil-Seite).Wir empfehlen dir, deinen kompletten Namen anzugeben und ein zu dir passendes Profilbild zu wählen, damit dich alte Bekannte wiederfinden.Außerdem ist es nützlich, wenn du auf deinem Profil Schlüsselwörter angibst. Das erleichtert es, Leute zu finden, die deine Interessen teilen.Wir respektieren deine Privatsphäre - keine dieser Angaben ist nötig.Wenn du neu im Netzwerk bist und noch niemanden kennst, dann können sie allerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nDu kannst dein Nutzerkonto  jederzeit unter %1$s/settings/removeme wieder löschen.\n\nDanke und willkommen auf %4$s."
 
-#: src/Model/User.php:1430 src/Model/User.php:1537
+#: src/Model/User.php:1425 src/Model/User.php:1532
 #, php-format
 msgid "Registration details for %s"
 msgstr "Details der Registration von %s"
 
-#: src/Model/User.php:1450
+#: src/Model/User.php:1445
 #, php-format
 msgid ""
 "\n"
@@ -4232,12 +3566,12 @@ msgid ""
 "\t\t"
 msgstr "\n\t\t\tHallo %1$s,\n\t\t\t\tdanke für deine Registrierung auf %2$s. Dein Account muss noch vom Admin des Knotens freigeschaltet werden.\n\n\t\t\tDeine Zugangsdaten lauten wie folgt:\n\n\t\t\tSeitenadresse:\t%3$s\n\t\t\tAnmeldename:\t\t%4$s\n\t\t\tPasswort:\t\t%5$s\n\t\t"
 
-#: src/Model/User.php:1469
+#: src/Model/User.php:1464
 #, php-format
 msgid "Registration at %s"
 msgstr "Registrierung als %s"
 
-#: src/Model/User.php:1493
+#: src/Model/User.php:1488
 #, php-format
 msgid ""
 "\n"
@@ -4246,7 +3580,7 @@ msgid ""
 "\t\t\t"
 msgstr "\n\t\t\t\tHallo %1$s,\n\t\t\t\tDanke für die Registrierung auf %2$s. Dein Account wurde angelegt.\n\t\t\t"
 
-#: src/Model/User.php:1501
+#: src/Model/User.php:1496
 #, php-format
 msgid ""
 "\n"
@@ -4273,25 +3607,10 @@ msgid ""
 "\t\t\tIf you are new and do not know anybody here, they may help\n"
 "\t\t\tyou to make some new and interesting friends.\n"
 "\n"
-"\t\t\tIf you ever want to delete your account, you can do so at %3$s/removeme\n"
+"\t\t\tIf you ever want to delete your account, you can do so at %3$s/settings/removeme\n"
 "\n"
 "\t\t\tThank you and welcome to %2$s."
-msgstr "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3$s\n\tBenutzernamename:\t%1$s\n\tPasswort:\t%5$s\n\nDu kannst dein Passwort unter \"Einstellungen\" ändern, sobald du dich\nangemeldet hast.\n\nBitte nimm dir ein paar Minuten, um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst du ja auch einige Informationen über dich in deinem\nProfil veröffentlichen, damit andere Leute dich einfacher finden können.\nBearbeite hierfür einfach dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen dir, deinen kompletten Namen anzugeben und ein zu dir\npassendes Profilbild zu wählen, damit dich alte Bekannte wiederfinden.\nAußerdem ist es nützlich, wenn du auf deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die deine Interessen teilen.\n\nWir respektieren deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %3$s/removeme jederzeit tun.\n\nDanke für deine Aufmerksamkeit und willkommen auf %2$s."
-
-#: src/Moderation/DomainPatternBlocklist.php:228
-#, php-format
-msgid "[%s] Notice of remote server domain pattern block list update"
-msgstr "[%s] Die Liste der blockierten Domain Muster wurde aktualisiert"
-
-#: src/Moderation/DomainPatternBlocklist.php:230
-#, php-format
-msgid ""
-"Dear %s,\n"
-"\n"
-"You are receiving this email because the Friendica node at %s where you are registered as a user updated their remote server domain pattern block list.\n"
-"\n"
-"Please review the updated list at %s at your earliest convenience."
-msgstr "Hallo %s,\n\ndu erhällst diese EMail, da du auf dem Friendica Knoten %s einen Account besitzt. Die Blockliste für gesperrte Knoten wurde aktualisiert.\n\nDie Änderungen an der Blockliste kannst du unter %s einsehen."
+msgstr "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3$s\n\tBenutzernamename:\t%1$s\n\tPasswort:\t%5$s\n\nDu kannst dein Passwort unter \"Einstellungen\" ändern, sobald du dich\nangemeldet hast.\n\nBitte nimm dir ein paar Minuten, um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst du ja auch einige Informationen über dich in deinem\nProfil veröffentlichen, damit andere Leute dich einfacher finden können.\nBearbeite hierfür einfach dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen dir, deinen kompletten Namen anzugeben und ein zu dir\npassendes Profilbild zu wählen, damit dich alte Bekannte wiederfinden.\nAußerdem ist es nützlich, wenn du auf deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die deine Interessen teilen.\n\nWir respektieren deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %3$s/settings/removeme jederzeit tun.\n\nDanke für deine Aufmerksamkeit und willkommen auf %2$s."
 
 #: src/Module/Admin/Addons/Details.php:65
 msgid "Addon not found."
@@ -4318,27 +3637,20 @@ msgid "Enable"
 msgstr "Einschalten"
 
 #: src/Module/Admin/Addons/Details.php:111
-#: src/Module/Admin/Addons/Index.php:67
-#: src/Module/Admin/Blocklist/Contact.php:94
-#: src/Module/Admin/Blocklist/Server/Add.php:121
-#: src/Module/Admin/Blocklist/Server/Import.php:117
-#: src/Module/Admin/Blocklist/Server/Index.php:91
-#: src/Module/Admin/Federation.php:202 src/Module/Admin/Item/Delete.php:64
+#: src/Module/Admin/Addons/Index.php:67 src/Module/Admin/Federation.php:202
 #: src/Module/Admin/Logs/Settings.php:79 src/Module/Admin/Logs/View.php:84
-#: src/Module/Admin/Queue.php:72 src/Module/Admin/Site.php:429
-#: src/Module/Admin/Storage.php:138 src/Module/Admin/Summary.php:234
+#: src/Module/Admin/Queue.php:72 src/Module/Admin/Site.php:431
+#: src/Module/Admin/Storage.php:138 src/Module/Admin/Summary.php:214
 #: src/Module/Admin/Themes/Details.php:90
 #: src/Module/Admin/Themes/Index.php:111 src/Module/Admin/Tos.php:75
-#: src/Module/Admin/Users/Active.php:136
-#: src/Module/Admin/Users/Blocked.php:137 src/Module/Admin/Users/Create.php:61
-#: src/Module/Admin/Users/Deleted.php:85 src/Module/Admin/Users/Index.php:149
-#: src/Module/Admin/Users/Pending.php:101
+#: src/Module/Moderation/Users/Create.php:61
+#: src/Module/Moderation/Users/Pending.php:96
 msgid "Administration"
 msgstr "Administration"
 
 #: src/Module/Admin/Addons/Details.php:112
-#: src/Module/Admin/Addons/Index.php:68 src/Module/BaseAdmin.php:93
-#: src/Module/BaseSettings.php:85
+#: src/Module/Admin/Addons/Index.php:68 src/Module/BaseAdmin.php:92
+#: src/Module/BaseSettings.php:134
 msgid "Addons"
 msgstr "Addons"
 
@@ -4366,6 +3678,17 @@ msgstr "Addons neu geladen"
 msgid "Addon %s failed to install."
 msgstr "Addon %s konnte nicht installiert werden"
 
+#: src/Module/Admin/Addons/Index.php:69 src/Module/Admin/Features.php:87
+#: src/Module/Admin/Logs/Settings.php:81 src/Module/Admin/Site.php:434
+#: src/Module/Admin/Themes/Index.php:113 src/Module/Admin/Tos.php:83
+#: src/Module/Settings/Account.php:560 src/Module/Settings/Addons.php:81
+#: src/Module/Settings/Connectors.php:159
+#: src/Module/Settings/Connectors.php:244
+#: src/Module/Settings/Delegation.php:169 src/Module/Settings/Display.php:200
+#: src/Module/Settings/Features.php:76
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
 #: src/Module/Admin/Addons/Index.php:70
 msgid "Reload active addons"
 msgstr "Aktivierte Addons neu laden"
@@ -4378,414 +3701,6 @@ msgid ""
 " the open addon registry at %2$s"
 msgstr "Es sind derzeit keine Addons auf diesem Knoten verfügbar. Du findest das offizielle Addon-Repository unter %1$s und weitere eventuell interessante Addons im offenen Addon-Verzeichnis auf %2$s."
 
-#: src/Module/Admin/BaseUsers.php:54
-msgid "List of all users"
-msgstr "Liste aller Benutzerkonten"
-
-#: src/Module/Admin/BaseUsers.php:59
-msgid "Active"
-msgstr "Aktive"
-
-#: src/Module/Admin/BaseUsers.php:62
-msgid "List of active accounts"
-msgstr "Liste der aktiven Benutzerkonten"
-
-#: src/Module/Admin/BaseUsers.php:67 src/Module/Contact.php:317
-#: src/Module/Contact.php:377
-msgid "Pending"
-msgstr "Ausstehend"
-
-#: src/Module/Admin/BaseUsers.php:70
-msgid "List of pending registrations"
-msgstr "Liste der anstehenden Benutzerkonten"
-
-#: src/Module/Admin/BaseUsers.php:75 src/Module/Contact.php:325
-#: src/Module/Contact.php:378
-msgid "Blocked"
-msgstr "Geblockt"
-
-#: src/Module/Admin/BaseUsers.php:78
-msgid "List of blocked users"
-msgstr "Liste der geblockten Benutzer"
-
-#: src/Module/Admin/BaseUsers.php:83
-msgid "Deleted"
-msgstr "Gelöscht"
-
-#: src/Module/Admin/BaseUsers.php:86
-msgid "List of pending user deletions"
-msgstr "Liste der auf Löschung wartenden Benutzer"
-
-#: src/Module/Admin/BaseUsers.php:100 src/Module/Settings/Account.php:494
-msgid "Normal Account Page"
-msgstr "Normales Konto"
-
-#: src/Module/Admin/BaseUsers.php:101 src/Module/Settings/Account.php:501
-msgid "Soapbox Page"
-msgstr "Marktschreier-Konto"
-
-#: src/Module/Admin/BaseUsers.php:102 src/Module/Settings/Account.php:508
-msgid "Public Forum"
-msgstr "Öffentliches Forum"
-
-#: src/Module/Admin/BaseUsers.php:103 src/Module/Settings/Account.php:515
-msgid "Automatic Friend Page"
-msgstr "Automatische Freunde-Seite"
-
-#: src/Module/Admin/BaseUsers.php:104
-msgid "Private Forum"
-msgstr "Privates Forum"
-
-#: src/Module/Admin/BaseUsers.php:107 src/Module/Settings/Account.php:466
-msgid "Personal Page"
-msgstr "Persönliche Seite"
-
-#: src/Module/Admin/BaseUsers.php:108 src/Module/Settings/Account.php:473
-msgid "Organisation Page"
-msgstr "Organisationsseite"
-
-#: src/Module/Admin/BaseUsers.php:109 src/Module/Settings/Account.php:480
-msgid "News Page"
-msgstr "Nachrichtenseite"
-
-#: src/Module/Admin/BaseUsers.php:110 src/Module/Settings/Account.php:487
-msgid "Community Forum"
-msgstr "Gemeinschaftsforum"
-
-#: src/Module/Admin/BaseUsers.php:111
-msgid "Relay"
-msgstr "Relais"
-
-#: src/Module/Admin/Blocklist/Contact.php:54
-msgid "You can't block a local contact, please block the user instead"
-msgstr "Lokale Kontakte können nicht geblockt werden. Bitte blocke den Nutzer stattdessen."
-
-#: src/Module/Admin/Blocklist/Contact.php:73
-#, php-format
-msgid "%s contact unblocked"
-msgid_plural "%s contacts unblocked"
-msgstr[0] "%sKontakt wieder freigegeben"
-msgstr[1] "%sKontakte wieder freigegeben"
-
-#: src/Module/Admin/Blocklist/Contact.php:95
-msgid "Remote Contact Blocklist"
-msgstr "Blockliste entfernter Kontakte"
-
-#: src/Module/Admin/Blocklist/Contact.php:96
-msgid ""
-"This page allows you to prevent any message from a remote contact to reach "
-"your node."
-msgstr "Auf dieser Seite kannst du Accounts von anderen Knoten blockieren und damit verhindern, dass ihre Beiträge von deinem Knoten angenommen werden."
-
-#: src/Module/Admin/Blocklist/Contact.php:97
-msgid "Block Remote Contact"
-msgstr "Blockiere entfernten Kontakt"
-
-#: src/Module/Admin/Blocklist/Contact.php:98
-#: src/Module/Admin/Users/Active.php:138
-#: src/Module/Admin/Users/Blocked.php:139 src/Module/Admin/Users/Index.php:151
-#: src/Module/Admin/Users/Pending.php:103
-msgid "select all"
-msgstr "Alle auswählen"
-
-#: src/Module/Admin/Blocklist/Contact.php:99
-msgid "select none"
-msgstr "Auswahl aufheben"
-
-#: src/Module/Admin/Blocklist/Contact.php:101
-#: src/Module/Admin/Users/Blocked.php:142 src/Module/Admin/Users/Index.php:156
-#: src/Module/Contact.php:401 src/Module/Contact/Profile.php:349
-#: src/Module/Contact/Profile.php:450
-msgid "Unblock"
-msgstr "Entsperren"
-
-#: src/Module/Admin/Blocklist/Contact.php:102
-msgid "No remote contact is blocked from this node."
-msgstr "Derzeit werden keine Kontakte auf diesem Knoten blockiert."
-
-#: src/Module/Admin/Blocklist/Contact.php:104
-msgid "Blocked Remote Contacts"
-msgstr "Blockierte Kontakte von anderen Knoten"
-
-#: src/Module/Admin/Blocklist/Contact.php:105
-msgid "Block New Remote Contact"
-msgstr "Blockieren von weiteren Kontakten"
-
-#: src/Module/Admin/Blocklist/Contact.php:106
-msgid "Photo"
-msgstr "Foto:"
-
-#: src/Module/Admin/Blocklist/Contact.php:106
-msgid "Reason"
-msgstr "Grund"
-
-#: src/Module/Admin/Blocklist/Contact.php:114
-#, php-format
-msgid "%s total blocked contact"
-msgid_plural "%s total blocked contacts"
-msgstr[0] "Insgesamt %s blockierter Kontakt"
-msgstr[1] "Insgesamt %s blockierte Kontakte"
-
-#: src/Module/Admin/Blocklist/Contact.php:116
-msgid "URL of the remote contact to block."
-msgstr "Die URL des entfernten Kontakts, der blockiert werden soll."
-
-#: src/Module/Admin/Blocklist/Contact.php:117
-msgid "Also purge contact"
-msgstr "Kontakt auch löschen"
-
-#: src/Module/Admin/Blocklist/Contact.php:117
-msgid ""
-"Removes all content related to this contact from the node. Keeps the contact"
-" record. This action cannot be undone."
-msgstr "Entfernt alle Inhalte von diesem Knoten, die in Verbindung zu dem Kontakt stehen. Der Kontakt-Eintrag bleibt erhalten. Dieser Vorgang kann nicht rückgängig gemacht werden."
-
-#: src/Module/Admin/Blocklist/Contact.php:118
-#: src/Module/Admin/Blocklist/Server/Import.php:123
-msgid "Block Reason"
-msgstr "Sperrgrund"
-
-#: src/Module/Admin/Blocklist/Server/Add.php:80
-msgid "Server domain pattern added to the blocklist."
-msgstr "Server Domain Muster zur Blockliste hinzugefügt"
-
-#: src/Module/Admin/Blocklist/Server/Add.php:88
-#, php-format
-msgid "%s server scheduled to be purged."
-msgid_plural "%s servers scheduled to be purged."
-msgstr[0] "%s Server für die Löschung eingeplant."
-msgstr[1] "%s Server für die Löschung eingeplant."
-
-#: src/Module/Admin/Blocklist/Server/Add.php:120
-#: src/Module/Admin/Blocklist/Server/Import.php:116
-msgid "← Return to the list"
-msgstr "← zurück zur Liste"
-
-#: src/Module/Admin/Blocklist/Server/Add.php:122
-msgid "Block A New Server Domain Pattern"
-msgstr "Neues Domainmuster blockieren"
-
-#: src/Module/Admin/Blocklist/Server/Add.php:123
-#: src/Module/Admin/Blocklist/Server/Index.php:95
-msgid ""
-"<p>The server domain pattern syntax is case-insensitive shell wildcard, comprising the following special characters:</p>\n"
-"<ul>\n"
-"\t<li><code>*</code>: Any number of characters</li>\n"
-"\t<li><code>?</code>: Any single character</li>\n"
-"</ul>"
-msgstr "<p>Die Syntax für das Domainmuster ist unabhängig von der Groß-/Kleinschreibung. Shell Willdcards bestehen aus den folgenden Zeichen:</p>\n<ul>\n<li><code>*</code>: Eine beliebige Anzahl von Zeichen</li>\n<li><code>?</code>: Ein einzelnes Zeichen</li>\n</ul>"
-
-#: src/Module/Admin/Blocklist/Server/Add.php:128
-#: src/Module/Admin/Blocklist/Server/Index.php:103
-msgid "Check pattern"
-msgstr "Muster überprüfen"
-
-#: src/Module/Admin/Blocklist/Server/Add.php:129
-msgid "Matching known servers"
-msgstr "Passende bekannte Server"
-
-#: src/Module/Admin/Blocklist/Server/Add.php:130
-msgid "Server Name"
-msgstr "Server Name"
-
-#: src/Module/Admin/Blocklist/Server/Add.php:131
-msgid "Server Domain"
-msgstr "Server Domain"
-
-#: src/Module/Admin/Blocklist/Server/Add.php:132
-msgid "Known Contacts"
-msgstr "Bekannte Kontakte"
-
-#: src/Module/Admin/Blocklist/Server/Add.php:133
-#, php-format
-msgid "%d known server"
-msgid_plural "%d known servers"
-msgstr[0] "%d bekannter Server"
-msgstr[1] "%d bekannte Server"
-
-#: src/Module/Admin/Blocklist/Server/Add.php:134
-msgid "Add pattern to the blocklist"
-msgstr "Muster zur Blockliste hinzufügen"
-
-#: src/Module/Admin/Blocklist/Server/Add.php:136
-#: src/Module/Admin/Blocklist/Server/Index.php:112
-msgid "Server Domain Pattern"
-msgstr "Server Domain Muster"
-
-#: src/Module/Admin/Blocklist/Server/Add.php:136
-#: src/Module/Admin/Blocklist/Server/Index.php:112
-msgid ""
-"The domain pattern of the new server to add to the blocklist. Do not include"
-" the protocol."
-msgstr "Das Muster zur Erkennung der Domain, das zur Blockliste hinzugefügt werden soll. Das Protokoll nicht mir angeben."
-
-#: src/Module/Admin/Blocklist/Server/Add.php:137
-msgid "Purge server"
-msgstr "Server entfernen"
-
-#: src/Module/Admin/Blocklist/Server/Add.php:137
-msgid ""
-"Also purges all the locally stored content authored by the known contacts "
-"registered on that server. Keeps the contacts and the server records. This "
-"action cannot be undone."
-msgid_plural ""
-"Also purges all the locally stored content authored by the known contacts "
-"registered on these servers. Keeps the contacts and the servers records. "
-"This action cannot be undone."
-msgstr[0] "Sollen die Inhalte der bekannten Kontakte die auf diesem Server registriert sind, auch lokal gelöscht werden. Die Kontakt- und Server-Einträge verbleiben in der Datenbank deines Servers. Diese Aktion kann nicht rückgängig gemacht werden."
-msgstr[1] "Sollen die Inhalte der bekannten Kontakte die auf diesen Servern registriert sind, auch lokal gelöscht werden. Die Kontakt- und Server-Einträge verbleiben in der Datenbank deines Servers. Diese Aktion kann nicht rückgängig gemacht werden."
-
-#: src/Module/Admin/Blocklist/Server/Add.php:138
-msgid "Block reason"
-msgstr "Begründung der Blockierung"
-
-#: src/Module/Admin/Blocklist/Server/Add.php:138
-msgid ""
-"The reason why you blocked this server domain pattern. This reason will be "
-"shown publicly in the server information page."
-msgstr "Warum werden Server die diesem Domainmuster entsprechen geblockt? Die Begründung wird öffentlich auf der Server-Informationsseite sichtbar sein."
-
-#: src/Module/Admin/Blocklist/Server/Import.php:75
-#: src/Module/Admin/Blocklist/Server/Import.php:84
-msgid "Error importing pattern file"
-msgstr "Fehler beim Import der Muster Datei"
-
-#: src/Module/Admin/Blocklist/Server/Import.php:90
-msgid "Local blocklist replaced with the provided file."
-msgstr "Lokale Blockliste wurde durch die bereitgestellte Datei ersetzt."
-
-#: src/Module/Admin/Blocklist/Server/Import.php:94
-#, php-format
-msgid "%d pattern was added to the local blocklist."
-msgid_plural "%d patterns were added to the local blocklist."
-msgstr[0] "%d Muster wurde zur lokalen Blockliste hinzugefügt."
-msgstr[1] "%d Muster wurden zur lokalen Blockliste hinzugefügt."
-
-#: src/Module/Admin/Blocklist/Server/Import.php:96
-msgid "No pattern was added to the local blocklist."
-msgstr "Kein Muster wurde zur lokalen Blockliste hinzugefügt."
-
-#: src/Module/Admin/Blocklist/Server/Import.php:118
-msgid "Import a Server Domain Pattern Blocklist"
-msgstr "Server Domain Muster Blockliste importieren"
-
-#: src/Module/Admin/Blocklist/Server/Import.php:119
-msgid ""
-"<p>This file can be downloaded from the <code>/friendica</code> path of any "
-"Friendica server.</p>"
-msgstr "<p>Diese Datei kann vom <code>/friendica</code> Pfad auf jedem  Friendica Server heruntergeladen werden.</p>"
-
-#: src/Module/Admin/Blocklist/Server/Import.php:120
-#: src/Module/Admin/Blocklist/Server/Index.php:102
-msgid "Upload file"
-msgstr "Datei hochladen"
-
-#: src/Module/Admin/Blocklist/Server/Import.php:121
-msgid "Patterns to import"
-msgstr "Zu importierende Muster"
-
-#: src/Module/Admin/Blocklist/Server/Import.php:122
-msgid "Domain Pattern"
-msgstr "Domain Muster"
-
-#: src/Module/Admin/Blocklist/Server/Import.php:124
-msgid "Import Mode"
-msgstr "Importmodus"
-
-#: src/Module/Admin/Blocklist/Server/Import.php:125
-msgid "Import Patterns"
-msgstr "Muster importieren"
-
-#: src/Module/Admin/Blocklist/Server/Import.php:126
-#, php-format
-msgid "%d total pattern"
-msgid_plural "%d total patterns"
-msgstr[0] "%dMuster gesamt"
-msgstr[1] "%dMuster gesamt"
-
-#: src/Module/Admin/Blocklist/Server/Import.php:128
-#: src/Module/Admin/Blocklist/Server/Index.php:111
-msgid "Server domain pattern blocklist CSV file"
-msgstr "Server Domain Muster Blockliste CSV-Datei"
-
-#: src/Module/Admin/Blocklist/Server/Import.php:129
-msgid "Append"
-msgstr "Anhängen"
-
-#: src/Module/Admin/Blocklist/Server/Import.php:129
-msgid ""
-"Imports patterns from the file that weren't already existing in the current "
-"blocklist."
-msgstr "Importiert Muster aus der Datei, die nicht bereits in der aktuellen Blockliste vorhanden waren."
-
-#: src/Module/Admin/Blocklist/Server/Import.php:130
-msgid "Replace"
-msgstr "Ersetzen"
-
-#: src/Module/Admin/Blocklist/Server/Import.php:130
-msgid "Replaces the current blocklist by the imported patterns."
-msgstr "Ersetzt die aktuelle Blockliste durch die importierten Muster."
-
-#: src/Module/Admin/Blocklist/Server/Index.php:82
-#: src/Module/Admin/Blocklist/Server/Index.php:106
-msgid "Blocked server domain pattern"
-msgstr "Blockierte Server Domain Muster"
-
-#: src/Module/Admin/Blocklist/Server/Index.php:83
-#: src/Module/Admin/Blocklist/Server/Index.php:107 src/Module/Friendica.php:83
-msgid "Reason for the block"
-msgstr "Begründung für die Blockierung"
-
-#: src/Module/Admin/Blocklist/Server/Index.php:84
-msgid "Delete server domain pattern"
-msgstr "Server Domain Muster löschen"
-
-#: src/Module/Admin/Blocklist/Server/Index.php:84
-msgid "Check to delete this entry from the blocklist"
-msgstr "Markieren, um diesen Eintrag von der Blocklist zu entfernen"
-
-#: src/Module/Admin/Blocklist/Server/Index.php:92
-msgid "Server Domain Pattern Blocklist"
-msgstr "Server Domain Muster Blockliste"
-
-#: src/Module/Admin/Blocklist/Server/Index.php:93
-msgid ""
-"This page can be used to define a blocklist of server domain patterns from "
-"the federated network that are not allowed to interact with your node. For "
-"each domain pattern you should also provide the reason why you block it."
-msgstr "Auf dieser Seite kannst du Muster definieren mit denen Server Domains aus dem föderierten Netzwerk daran gehindert werden mit deiner Instanz zu interagieren. Es ist ratsam für jedes Muster anzugeben, warum du es zur Blockliste hinzugefügt hast."
-
-#: src/Module/Admin/Blocklist/Server/Index.php:94
-msgid ""
-"The list of blocked server domain patterns will be made publically available"
-" on the <a href=\"/friendica\">/friendica</a> page so that your users and "
-"people investigating communication problems can find the reason easily."
-msgstr "Die Liste der blockierten Domain Muster wird auf der Seite <a href=\"/friendica\">/friendica</a> öffentlich einsehbar gemacht, damit deine Nutzer und Personen, die Kommunikationsprobleme erkunden, die Ursachen einfach finden können."
-
-#: src/Module/Admin/Blocklist/Server/Index.php:100
-msgid "Import server domain pattern blocklist"
-msgstr "Server Domain Muster Blockliste importieren"
-
-#: src/Module/Admin/Blocklist/Server/Index.php:101
-msgid "Add new entry to the blocklist"
-msgstr "Neuen Eintrag in die Blockliste"
-
-#: src/Module/Admin/Blocklist/Server/Index.php:104
-msgid "Save changes to the blocklist"
-msgstr "Änderungen der Blockliste speichern"
-
-#: src/Module/Admin/Blocklist/Server/Index.php:105
-msgid "Current Entries in the Blocklist"
-msgstr "Aktuelle Einträge der Blockliste"
-
-#: src/Module/Admin/Blocklist/Server/Index.php:108
-msgid "Delete entry from the blocklist"
-msgstr "Eintrag von der Blockliste entfernen"
-
-#: src/Module/Admin/Blocklist/Server/Index.php:109
-msgid "Delete entry from the blocklist?"
-msgstr "Eintrag von der Blockliste entfernen?"
-
 #: src/Module/Admin/DBSync.php:51
 msgid "Update has been marked successful"
 msgstr "Update wurde als erfolgreich markiert"
@@ -4935,84 +3850,6 @@ msgid_plural ""
 msgstr[0] "Derzeit kennt dieser Knoten %2$s andere Knoten (mit %3$s aktiven Nutzern im letzten Monat, %4$s aktiven Nutzern im letzten halben Jahr, %5$s registrierten Nutzern insgesamt) von den folgenden Plattformen:"
 msgstr[1] "Derzeit kennt dieser Knoten %2$s andere Knoten (mit %3$s aktiven Nutzern im letzten Monat, %4$s aktiven Nutzern im letzten halben Jahr, %5$s registrierten Nutzern insgesamt) von den folgenden Plattformen:"
 
-#: src/Module/Admin/Item/Delete.php:53
-msgid "Item marked for deletion."
-msgstr "Eintrag wurden zur Löschung markiert"
-
-#: src/Module/Admin/Item/Delete.php:65 src/Module/BaseAdmin.php:106
-msgid "Delete Item"
-msgstr "Eintrag löschen"
-
-#: src/Module/Admin/Item/Delete.php:66
-msgid "Delete this Item"
-msgstr "Diesen Eintrag löschen"
-
-#: src/Module/Admin/Item/Delete.php:67
-msgid ""
-"On this page you can delete an item from your node. If the item is a top "
-"level posting, the entire thread will be deleted."
-msgstr "Auf dieser Seite kannst du Einträge von deinem Knoten löschen. Wenn der Eintrag der Anfang einer Diskussion ist, wird der gesamte Diskussionsverlauf gelöscht."
-
-#: src/Module/Admin/Item/Delete.php:68
-msgid ""
-"You need to know the GUID of the item. You can find it e.g. by looking at "
-"the display URL. The last part of http://example.com/display/123456 is the "
-"GUID, here 123456."
-msgstr "Zur Löschung musst du die GUID des Eintrags kennen. Diese findest du z.B. durch die /display URL des Eintrags. Der letzte Teil der URL ist die GUID. Lautet die URL beispielsweise http://example.com/display/123456, ist die GUID 123456."
-
-#: src/Module/Admin/Item/Delete.php:69
-msgid "GUID"
-msgstr "GUID"
-
-#: src/Module/Admin/Item/Delete.php:69
-msgid "The GUID of the item you want to delete."
-msgstr "Die GUID des zu löschenden Eintrags"
-
-#: src/Module/Admin/Item/Source.php:53 src/Module/BaseAdmin.php:116
-msgid "Item Source"
-msgstr "Beitrags Quelle"
-
-#: src/Module/Admin/Item/Source.php:54
-msgid "Item Guid"
-msgstr "Beitrags-Guid"
-
-#: src/Module/Admin/Item/Source.php:58
-msgid "Item Id"
-msgstr "Item Id"
-
-#: src/Module/Admin/Item/Source.php:59
-msgid "Item URI"
-msgstr "Item URI"
-
-#: src/Module/Admin/Item/Source.php:61
-msgid "Terms"
-msgstr "Terms"
-
-#: src/Module/Admin/Item/Source.php:62
-msgid "Tag"
-msgstr "Tag"
-
-#: src/Module/Admin/Item/Source.php:63 src/Module/Admin/Users/Active.php:129
-#: src/Module/Admin/Users/Blocked.php:130 src/Module/Admin/Users/Index.php:142
-msgid "Type"
-msgstr "Typ"
-
-#: src/Module/Admin/Item/Source.php:64
-msgid "Term"
-msgstr "Term"
-
-#: src/Module/Admin/Item/Source.php:65
-msgid "URL"
-msgstr "URL"
-
-#: src/Module/Admin/Item/Source.php:66
-msgid "Mention"
-msgstr "Mention"
-
-#: src/Module/Admin/Item/Source.php:67
-msgid "Implicit Mention"
-msgstr "Implicit Mention"
-
 #: src/Module/Admin/Logs/Settings.php:47
 #, php-format
 msgid "The logfile '%s' is not writable. No logging possible"
@@ -5026,8 +3863,8 @@ msgstr "PHP Protokollierung ist derzeit aktiviert."
 msgid "PHP log currently disabled."
 msgstr "PHP Protokollierung ist derzeit nicht aktiviert."
 
-#: src/Module/Admin/Logs/Settings.php:80 src/Module/BaseAdmin.php:108
-#: src/Module/BaseAdmin.php:109
+#: src/Module/Admin/Logs/Settings.php:80 src/Module/BaseAdmin.php:102
+#: src/Module/BaseAdmin.php:103
 msgid "Logs"
 msgstr "Protokolle"
 
@@ -5080,7 +3917,7 @@ msgid ""
 "is readable."
 msgstr "Konnte die Logdatei <strong>%1$s</strong> nicht öffnen.<br/>Bitte stelle sicher, dass die Datei %1$s lesbar ist."
 
-#: src/Module/Admin/Logs/View.php:85 src/Module/BaseAdmin.php:110
+#: src/Module/Admin/Logs/View.php:85 src/Module/BaseAdmin.php:104
 msgid "View Logs"
 msgstr "Protokolle anzeigen"
 
@@ -5117,6 +3954,10 @@ msgstr "Details anzeigen"
 msgid "Click to view details"
 msgstr "Anklicken zum Anzeigen der Details"
 
+#: src/Module/Admin/Logs/View.php:97 src/Module/Calendar/Event/Form.php:207
+msgid "Event details"
+msgstr "Veranstaltungsdetails"
+
 #: src/Module/Admin/Logs/View.php:98
 msgid "Data"
 msgstr "Daten"
@@ -5182,463 +4023,472 @@ msgstr "Befehl"
 msgid "Job Parameters"
 msgstr "Parameter der Aufgabe"
 
+#: src/Module/Admin/Queue.php:78 src/Module/Settings/OAuth.php:75
+msgid "Created"
+msgstr "Erstellt"
+
 #: src/Module/Admin/Queue.php:79
 msgid "Priority"
 msgstr "Priorität"
 
-#: src/Module/Admin/Site.php:334 src/Module/Settings/Display.php:137
+#: src/Module/Admin/Site.php:336 src/Module/Settings/Display.php:137
 msgid "No special theme for mobile devices"
 msgstr "Kein spezielles Theme für mobile Geräte verwenden."
 
-#: src/Module/Admin/Site.php:351 src/Module/Settings/Display.php:147
+#: src/Module/Admin/Site.php:353 src/Module/Settings/Display.php:147
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (Experimentell)"
 
-#: src/Module/Admin/Site.php:363
+#: src/Module/Admin/Site.php:365
 msgid "No community page"
 msgstr "Keine Gemeinschaftsseite"
 
-#: src/Module/Admin/Site.php:364
+#: src/Module/Admin/Site.php:366
 msgid "No community page for visitors"
 msgstr "Keine Gemeinschaftsseite für Besucher"
 
-#: src/Module/Admin/Site.php:365
+#: src/Module/Admin/Site.php:367
 msgid "Public postings from users of this site"
 msgstr "Öffentliche Beiträge von NutzerInnen dieser Seite"
 
-#: src/Module/Admin/Site.php:366
+#: src/Module/Admin/Site.php:368
 msgid "Public postings from the federated network"
 msgstr "Öffentliche Beiträge aus dem föderalen Netzwerk"
 
-#: src/Module/Admin/Site.php:367
+#: src/Module/Admin/Site.php:369
 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:373
+#: src/Module/Admin/Site.php:375
 msgid "Multi user instance"
 msgstr "Mehrbenutzer-Instanz"
 
-#: src/Module/Admin/Site.php:400
+#: src/Module/Admin/Site.php:402
 msgid "Closed"
 msgstr "Geschlossen"
 
-#: src/Module/Admin/Site.php:401
+#: src/Module/Admin/Site.php:403
 msgid "Requires approval"
 msgstr "Bedarf der Zustimmung"
 
-#: src/Module/Admin/Site.php:402
+#: src/Module/Admin/Site.php:404
 msgid "Open"
 msgstr "Offen"
 
-#: src/Module/Admin/Site.php:406 src/Module/Install.php:222
+#: src/Module/Admin/Site.php:408 src/Module/Install.php:222
 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:407 src/Module/Install.php:223
+#: src/Module/Admin/Site.php:409 src/Module/Install.php:223
 msgid "Force all links to use SSL"
 msgstr "SSL für alle Links erzwingen"
 
-#: src/Module/Admin/Site.php:408 src/Module/Install.php:224
+#: src/Module/Admin/Site.php:410 src/Module/Install.php:224
 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:412
+#: src/Module/Admin/Site.php:414
 msgid "Don't check"
 msgstr "Nicht überprüfen"
 
-#: src/Module/Admin/Site.php:413
+#: src/Module/Admin/Site.php:415
 msgid "check the stable version"
 msgstr "überprüfe die stabile Version"
 
-#: src/Module/Admin/Site.php:414
+#: src/Module/Admin/Site.php:416
 msgid "check the development version"
 msgstr "überprüfe die Entwicklungsversion"
 
-#: src/Module/Admin/Site.php:418
+#: src/Module/Admin/Site.php:420
 msgid "none"
 msgstr "keine"
 
-#: src/Module/Admin/Site.php:419
+#: src/Module/Admin/Site.php:421
 msgid "Local contacts"
 msgstr "Lokale Kontakte"
 
-#: src/Module/Admin/Site.php:420
+#: src/Module/Admin/Site.php:422
 msgid "Interactors"
 msgstr "Interaktionen"
 
-#: src/Module/Admin/Site.php:430 src/Module/BaseAdmin.php:90
+#: src/Module/Admin/Site.php:432 src/Module/BaseAdmin.php:90
 msgid "Site"
 msgstr "Seite"
 
-#: src/Module/Admin/Site.php:431
+#: src/Module/Admin/Site.php:433
 msgid "General Information"
 msgstr "Allgemeine Informationen"
 
-#: src/Module/Admin/Site.php:433
+#: src/Module/Admin/Site.php:435
 msgid "Republish users to directory"
 msgstr "Nutzer erneut im globalen Verzeichnis veröffentlichen."
 
-#: src/Module/Admin/Site.php:434 src/Module/Register.php:152
+#: src/Module/Admin/Site.php:436 src/Module/Register.php:152
 msgid "Registration"
 msgstr "Registrierung"
 
-#: src/Module/Admin/Site.php:435
+#: src/Module/Admin/Site.php:437
 msgid "File upload"
 msgstr "Datei hochladen"
 
-#: src/Module/Admin/Site.php:436
+#: src/Module/Admin/Site.php:438
 msgid "Policies"
 msgstr "Regeln"
 
-#: src/Module/Admin/Site.php:438
+#: src/Module/Admin/Site.php:439 src/Module/Calendar/Event/Form.php:252
+#: src/Module/Contact.php:477 src/Module/Profile/Profile.php:248
+msgid "Advanced"
+msgstr "Erweitert"
+
+#: src/Module/Admin/Site.php:440
 msgid "Auto Discovered Contact Directory"
 msgstr "Automatisch ein Kontaktverzeichnis erstellen"
 
-#: src/Module/Admin/Site.php:439
+#: src/Module/Admin/Site.php:441
 msgid "Performance"
 msgstr "Performance"
 
-#: src/Module/Admin/Site.php:440
+#: src/Module/Admin/Site.php:442
 msgid "Worker"
 msgstr "Worker"
 
-#: src/Module/Admin/Site.php:441
+#: src/Module/Admin/Site.php:443
 msgid "Message Relay"
 msgstr "Nachrichten-Relais"
 
-#: src/Module/Admin/Site.php:442
+#: src/Module/Admin/Site.php:444
 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:443
+#: src/Module/Admin/Site.php:445
 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:444
+#: src/Module/Admin/Site.php:446
 msgid "The system is currently subscribed to the following relays:"
 msgstr "Das System hat derzeit Abonnements bei folgenden Releays:"
 
-#: src/Module/Admin/Site.php:446
+#: src/Module/Admin/Site.php:448
 msgid "Relocate Node"
 msgstr "Knoten umziehen"
 
-#: src/Module/Admin/Site.php:447
+#: src/Module/Admin/Site.php:449
 msgid ""
 "Relocating your node enables you to change the DNS domain of this node and "
 "keep all the existing users and posts. This process takes a while and can "
 "only be started from the relocate console command like this:"
 msgstr "Um deinen Friendica Knoten auf einen andere Domainnamen umzuziehen, und dabei alle existierenden Accounts und Beiträge zu behalten, kannst du dazu einen Konsolenbefehl verwenden. Die nötigen Aktualisierungen wird einige Zeit dauern und können nur auf der Konsole gestartet werden. Hierzu verwendest du einen Befehl wie den folgenden:"
 
-#: src/Module/Admin/Site.php:448
+#: src/Module/Admin/Site.php:450
 msgid "(Friendica directory)# bin/console relocate https://newdomain.com"
 msgstr "(Friendica Verzeichnis)# bin/console relocate https://newdomain.com"
 
-#: src/Module/Admin/Site.php:452
+#: src/Module/Admin/Site.php:454
 msgid "Site name"
 msgstr "Seitenname"
 
-#: src/Module/Admin/Site.php:453
+#: src/Module/Admin/Site.php:455
 msgid "Sender Email"
 msgstr "Absender für Emails"
 
-#: src/Module/Admin/Site.php:453
+#: src/Module/Admin/Site.php:455
 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:454
+#: src/Module/Admin/Site.php:456
 msgid "Name of the system actor"
 msgstr "Name des System-Actors"
 
-#: src/Module/Admin/Site.php:454
+#: src/Module/Admin/Site.php:456
 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:455
+#: src/Module/Admin/Site.php:457
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: src/Module/Admin/Site.php:456
+#: src/Module/Admin/Site.php:458
 msgid "Email Banner/Logo"
 msgstr "E-Mail Banner / Logo"
 
-#: src/Module/Admin/Site.php:457
+#: src/Module/Admin/Site.php:459
 msgid "Shortcut icon"
 msgstr "Shortcut Icon"
 
-#: src/Module/Admin/Site.php:457
+#: src/Module/Admin/Site.php:459
 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:458
+#: src/Module/Admin/Site.php:460
 msgid "Touch icon"
 msgstr "Touch Icon"
 
-#: src/Module/Admin/Site.php:458
+#: src/Module/Admin/Site.php:460
 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:459
+#: src/Module/Admin/Site.php:461
 msgid "Additional Info"
 msgstr "Zusätzliche Informationen"
 
-#: src/Module/Admin/Site.php:459
+#: src/Module/Admin/Site.php:461
 #, 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:460
+#: src/Module/Admin/Site.php:462
 msgid "System language"
 msgstr "Systemsprache"
 
-#: src/Module/Admin/Site.php:461
+#: src/Module/Admin/Site.php:463
 msgid "System theme"
 msgstr "Systemweites Theme"
 
-#: src/Module/Admin/Site.php:461
+#: src/Module/Admin/Site.php:463
 #, php-format
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href=\"%s\" "
 "id=\"cnftheme\">Change default theme settings</a>"
 msgstr "Standard-Theme des Systems - kann von Benutzerprofilen überschrieben werden - <a href=\"%s\" id=\"cnftheme\">Einstellungen des Standard-Themes ändern</a>"
 
-#: src/Module/Admin/Site.php:462
+#: src/Module/Admin/Site.php:464
 msgid "Mobile system theme"
 msgstr "Systemweites mobiles Theme"
 
-#: src/Module/Admin/Site.php:462
+#: src/Module/Admin/Site.php:464
 msgid "Theme for mobile devices"
 msgstr "Theme für mobile Geräte"
 
-#: src/Module/Admin/Site.php:463 src/Module/Install.php:232
+#: src/Module/Admin/Site.php:465 src/Module/Install.php:232
 msgid "SSL link policy"
 msgstr "Regeln für SSL Links"
 
-#: src/Module/Admin/Site.php:463 src/Module/Install.php:234
+#: src/Module/Admin/Site.php:465 src/Module/Install.php:234
 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:464
+#: src/Module/Admin/Site.php:466
 msgid "Force SSL"
 msgstr "Erzwinge SSL"
 
-#: src/Module/Admin/Site.php:464
+#: src/Module/Admin/Site.php:466
 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:465
+#: src/Module/Admin/Site.php:467
 msgid "Show help entry from navigation menu"
 msgstr "Zeige den Hilfe-Eintrag im Navigationsmenü an"
 
-#: src/Module/Admin/Site.php:465
+#: src/Module/Admin/Site.php:467
 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:466
+#: src/Module/Admin/Site.php:468
 msgid "Single user instance"
 msgstr "Ein-Nutzer Instanz"
 
-#: src/Module/Admin/Site.php:466
+#: src/Module/Admin/Site.php:468
 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:468
+#: src/Module/Admin/Site.php:470
 msgid "Maximum image size"
 msgstr "Maximale Bildgröße"
 
-#: src/Module/Admin/Site.php:468
+#: src/Module/Admin/Site.php:470
 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:469
+#: src/Module/Admin/Site.php:471
 msgid "Maximum image length"
 msgstr "Maximale Bildlänge"
 
-#: src/Module/Admin/Site.php:469
+#: src/Module/Admin/Site.php:471
 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:470
+#: src/Module/Admin/Site.php:472
 msgid "JPEG image quality"
 msgstr "Qualität des JPEG Bildes"
 
-#: src/Module/Admin/Site.php:470
+#: src/Module/Admin/Site.php:472
 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:472
+#: src/Module/Admin/Site.php:474
 msgid "Register policy"
 msgstr "Registrierungsmethode"
 
-#: src/Module/Admin/Site.php:473
+#: src/Module/Admin/Site.php:475
 msgid "Maximum Daily Registrations"
 msgstr "Maximum täglicher Registrierungen"
 
-#: src/Module/Admin/Site.php:473
+#: src/Module/Admin/Site.php:475
 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:474
+#: src/Module/Admin/Site.php:476
 msgid "Register text"
 msgstr "Registrierungstext"
 
-#: src/Module/Admin/Site.php:474
+#: src/Module/Admin/Site.php:476
 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:475
+#: src/Module/Admin/Site.php:477
 msgid "Forbidden Nicknames"
 msgstr "Verbotene Spitznamen"
 
-#: src/Module/Admin/Site.php:475
+#: src/Module/Admin/Site.php:477
 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:476
+#: src/Module/Admin/Site.php:478
 msgid "Accounts abandoned after x days"
 msgstr "Nutzerkonten gelten nach x Tagen als unbenutzt"
 
-#: src/Module/Admin/Site.php:476
+#: src/Module/Admin/Site.php:478
 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:477
+#: src/Module/Admin/Site.php:479
 msgid "Allowed friend domains"
 msgstr "Erlaubte Domains für Kontakte"
 
-#: src/Module/Admin/Site.php:477
+#: src/Module/Admin/Site.php:479
 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:478
+#: src/Module/Admin/Site.php:480
 msgid "Allowed email domains"
 msgstr "Erlaubte Domains für E-Mails"
 
-#: src/Module/Admin/Site.php:478
+#: src/Module/Admin/Site.php:480
 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:479
+#: src/Module/Admin/Site.php:481
 msgid "No OEmbed rich content"
 msgstr "OEmbed nicht verwenden"
 
-#: src/Module/Admin/Site.php:479
+#: src/Module/Admin/Site.php:481
 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:480
+#: src/Module/Admin/Site.php:482
 msgid "Trusted third-party domains"
 msgstr "Vertrauenswürdige Drittanbieter-Domains"
 
-#: src/Module/Admin/Site.php:480
+#: src/Module/Admin/Site.php:482
 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:481
+#: src/Module/Admin/Site.php:483
 msgid "Block public"
 msgstr "Öffentlichen Zugriff blockieren"
 
-#: src/Module/Admin/Site.php:481
+#: src/Module/Admin/Site.php:483
 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:482
+#: src/Module/Admin/Site.php:484
 msgid "Force publish"
 msgstr "Erzwinge Veröffentlichung"
 
-#: src/Module/Admin/Site.php:482
+#: src/Module/Admin/Site.php:484
 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:482
+#: src/Module/Admin/Site.php:484
 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:483
+#: src/Module/Admin/Site.php:485
 msgid "Global directory URL"
 msgstr "URL des weltweiten Verzeichnisses"
 
-#: src/Module/Admin/Site.php:483
+#: src/Module/Admin/Site.php:485
 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:484
+#: src/Module/Admin/Site.php:486
 msgid "Private posts by default for new users"
 msgstr "Private Beiträge als Standard für neue Nutzer"
 
-#: src/Module/Admin/Site.php:484
+#: src/Module/Admin/Site.php:486
 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:485
+#: src/Module/Admin/Site.php:487
 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:485
+#: src/Module/Admin/Site.php:487
 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:486
+#: src/Module/Admin/Site.php:488
 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:486
+#: src/Module/Admin/Site.php:488
 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:487
+#: src/Module/Admin/Site.php:489
 msgid "Don't embed private images in posts"
 msgstr "Private Bilder nicht in Beiträgen einbetten."
 
-#: src/Module/Admin/Site.php:487
+#: src/Module/Admin/Site.php:489
 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 "
@@ -5646,11 +4496,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:488
+#: src/Module/Admin/Site.php:490
 msgid "Explicit Content"
 msgstr "Sensibler Inhalt"
 
-#: src/Module/Admin/Site.php:488
+#: src/Module/Admin/Site.php:490
 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 "
@@ -5659,257 +4509,267 @@ 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:489
+#: src/Module/Admin/Site.php:491
 msgid "Proxify external content"
 msgstr "Proxy für externe Inhalte"
 
-#: src/Module/Admin/Site.php:489
+#: src/Module/Admin/Site.php:491
 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:490
+#: src/Module/Admin/Site.php:492
 msgid "Cache contact avatars"
 msgstr "Kontaktprofilbilder zwischenspeichern"
 
-#: src/Module/Admin/Site.php:490
+#: src/Module/Admin/Site.php:492
 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:491
+#: src/Module/Admin/Site.php:493
 msgid "Allow Users to set remote_self"
 msgstr "Nutzern erlauben, das remote_self Flag zu setzen"
 
-#: src/Module/Admin/Site.php:491
+#: src/Module/Admin/Site.php:493
 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:492
+#: src/Module/Admin/Site.php:494
 msgid "Enable multiple registrations"
 msgstr "Erlaube Mehrfachregistrierung"
 
-#: src/Module/Admin/Site.php:492
+#: src/Module/Admin/Site.php:494
 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:493
+#: src/Module/Admin/Site.php:495
 msgid "Enable OpenID"
 msgstr "OpenID aktivieren"
 
-#: src/Module/Admin/Site.php:493
+#: src/Module/Admin/Site.php:495
 msgid "Enable OpenID support for registration and logins."
 msgstr "OpenID Unterstützung bei der Registrierung und dem Login aktivieren."
 
-#: src/Module/Admin/Site.php:494
+#: src/Module/Admin/Site.php:496
 msgid "Enable Fullname check"
 msgstr "Namen auf Vollständigkeit überprüfen"
 
-#: src/Module/Admin/Site.php:494
+#: src/Module/Admin/Site.php:496
 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:495
+#: src/Module/Admin/Site.php:497
+msgid "Email administrators on new registration"
+msgstr "Email den Administratoren bei neuen Registrierungen"
+
+#: src/Module/Admin/Site.php:497
+msgid ""
+"If enabled and the system is set to an open registration, an email for each "
+"new registration is sent to the administrators."
+msgstr "Wenn diese Option aktiviert ist und die Registrierung auf offen eingestellt ist, wird den Administratoren bei jeder neuen Registierung eine Email geschickt."
+
+#: src/Module/Admin/Site.php:498
 msgid "Community pages for visitors"
 msgstr "Für Besucher verfügbare Gemeinschaftsseite"
 
-#: src/Module/Admin/Site.php:495
+#: src/Module/Admin/Site.php:498
 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:496
+#: src/Module/Admin/Site.php:499
 msgid "Posts per user on community page"
 msgstr "Anzahl der Beiträge pro Benutzer auf der Gemeinschaftsseite"
 
-#: src/Module/Admin/Site.php:496
+#: src/Module/Admin/Site.php:499
 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:498
+#: src/Module/Admin/Site.php:501
 msgid "Enable Mail support"
 msgstr "E-Mail Unterstützung aktivieren"
 
-#: src/Module/Admin/Site.php:498
+#: src/Module/Admin/Site.php:501
 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:499
+#: src/Module/Admin/Site.php:502
 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:500
+#: src/Module/Admin/Site.php:503
 msgid "Enable OStatus support"
 msgstr "OStatus Unterstützung aktivieren"
 
-#: src/Module/Admin/Site.php:500
+#: src/Module/Admin/Site.php:503
 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:502
+#: src/Module/Admin/Site.php:505
 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:503
+#: src/Module/Admin/Site.php:506
 msgid "Enable Diaspora support"
 msgstr "Diaspora-Unterstützung aktivieren"
 
-#: src/Module/Admin/Site.php:503
+#: src/Module/Admin/Site.php:506
 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:504
+#: src/Module/Admin/Site.php:507
 msgid "Verify SSL"
 msgstr "SSL Überprüfen"
 
-#: src/Module/Admin/Site.php:504
+#: src/Module/Admin/Site.php:507
 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:505
+#: src/Module/Admin/Site.php:508
 msgid "Proxy user"
 msgstr "Proxy-Nutzer"
 
-#: src/Module/Admin/Site.php:505
+#: src/Module/Admin/Site.php:508
 msgid "User name for the proxy server."
 msgstr "Nutzername für den Proxy-Server"
 
-#: src/Module/Admin/Site.php:506
+#: src/Module/Admin/Site.php:509
 msgid "Proxy URL"
 msgstr "Proxy-URL"
 
-#: src/Module/Admin/Site.php:506
+#: src/Module/Admin/Site.php:509
 msgid ""
 "If you want to use a proxy server that Friendica should use to connect to "
 "the network, put the URL of the proxy here."
 msgstr "Wenn Friendica einen Proxy-Server verwenden soll um das Netzwerk zu erreichen, füge hier die URL des Proxys ein."
 
-#: src/Module/Admin/Site.php:507
+#: src/Module/Admin/Site.php:510
 msgid "Network timeout"
 msgstr "Netzwerk-Wartezeit"
 
-#: src/Module/Admin/Site.php:507
+#: src/Module/Admin/Site.php:510
 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:508
+#: src/Module/Admin/Site.php:511
 msgid "Maximum Load Average"
 msgstr "Maximum Load Average"
 
-#: src/Module/Admin/Site.php:508
+#: src/Module/Admin/Site.php:511
 #, 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:509
+#: src/Module/Admin/Site.php:512
 msgid "Minimal Memory"
 msgstr "Minimaler Speicher"
 
-#: src/Module/Admin/Site.php:509
+#: src/Module/Admin/Site.php:512
 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:510
+#: src/Module/Admin/Site.php:513
 msgid "Periodically optimize tables"
 msgstr "Optimiere die Tabellen regelmäßig"
 
-#: src/Module/Admin/Site.php:510
+#: src/Module/Admin/Site.php:513
 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:512
+#: src/Module/Admin/Site.php:515
 msgid "Discover followers/followings from contacts"
 msgstr "Endecke folgende und gefolgte Kontakte von Kontakten"
 
-#: src/Module/Admin/Site.php:512
+#: src/Module/Admin/Site.php:515
 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:513
+#: src/Module/Admin/Site.php:516
 msgid "None - deactivated"
 msgstr "Keine - deaktiviert"
 
-#: src/Module/Admin/Site.php:514
+#: src/Module/Admin/Site.php:517
 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:515
+#: src/Module/Admin/Site.php:518
 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:517
+#: src/Module/Admin/Site.php:520
 msgid "Synchronize the contacts with the directory server"
 msgstr "Gleiche die Kontakte mit dem Directory-Server ab"
 
-#: src/Module/Admin/Site.php:517
+#: src/Module/Admin/Site.php:520
 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:519
+#: src/Module/Admin/Site.php:522
 msgid "Days between requery"
 msgstr "Tage zwischen erneuten Abfragen"
 
-#: src/Module/Admin/Site.php:519
+#: src/Module/Admin/Site.php:522
 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:520
+#: src/Module/Admin/Site.php:523
 msgid "Discover contacts from other servers"
 msgstr "Neue Kontakte auf anderen Servern entdecken"
 
-#: src/Module/Admin/Site.php:520
+#: src/Module/Admin/Site.php:523
 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:521
+#: src/Module/Admin/Site.php:524
 msgid "Search the local directory"
 msgstr "Lokales Verzeichnis durchsuchen"
 
-#: src/Module/Admin/Site.php:521
+#: src/Module/Admin/Site.php:524
 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:523
+#: src/Module/Admin/Site.php:526
 msgid "Publish server information"
 msgstr "Server-Informationen veröffentlichen"
 
-#: src/Module/Admin/Site.php:523
+#: src/Module/Admin/Site.php:526
 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 "
@@ -5917,50 +4777,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:525
+#: src/Module/Admin/Site.php:528
 msgid "Check upstream version"
 msgstr "Suche nach Updates"
 
-#: src/Module/Admin/Site.php:525
+#: src/Module/Admin/Site.php:528
 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:526
+#: src/Module/Admin/Site.php:529
 msgid "Suppress Tags"
 msgstr "Tags unterdrücken"
 
-#: src/Module/Admin/Site.php:526
+#: src/Module/Admin/Site.php:529
 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:527
+#: src/Module/Admin/Site.php:530
 msgid "Clean database"
 msgstr "Datenbank aufräumen"
 
-#: src/Module/Admin/Site.php:527
+#: src/Module/Admin/Site.php:530
 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:528
+#: src/Module/Admin/Site.php:531
 msgid "Lifespan of remote items"
 msgstr "Lebensdauer von Beiträgen anderer Knoten"
 
-#: src/Module/Admin/Site.php:528
+#: src/Module/Admin/Site.php:531
 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:529
+#: src/Module/Admin/Site.php:532
 msgid "Lifespan of unclaimed items"
 msgstr "Lebensdauer nicht angeforderter Beiträge"
 
-#: src/Module/Admin/Site.php:529
+#: src/Module/Admin/Site.php:532
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "unclaimed remote items (mostly content from the relay) will be deleted. "
@@ -5968,144 +4828,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:530
+#: src/Module/Admin/Site.php:533
 msgid "Lifespan of raw conversation data"
 msgstr "Lebensdauer der Beiträge"
 
-#: src/Module/Admin/Site.php:530
+#: src/Module/Admin/Site.php:533
 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:531
+#: src/Module/Admin/Site.php:534
 msgid "Maximum numbers of comments per post"
 msgstr "Maximale Anzahl von Kommentaren pro Beitrag"
 
-#: src/Module/Admin/Site.php:531
+#: src/Module/Admin/Site.php:534
 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:532
+#: src/Module/Admin/Site.php:535
 msgid "Maximum numbers of comments per post on the display page"
 msgstr "Maximale Anzahl von Kommentaren in der Einzelansicht"
 
-#: src/Module/Admin/Site.php:532
+#: src/Module/Admin/Site.php:535
 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:533
+#: src/Module/Admin/Site.php:536
 msgid "Temp path"
 msgstr "Temp-Pfad"
 
-#: src/Module/Admin/Site.php:533
+#: src/Module/Admin/Site.php:536
 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:534
+#: src/Module/Admin/Site.php:537
 msgid "Only search in tags"
 msgstr "Nur in Tags suchen"
 
-#: src/Module/Admin/Site.php:534
+#: src/Module/Admin/Site.php:537
 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:535
+#: src/Module/Admin/Site.php:538
 msgid "Generate counts per contact group when calculating network count"
 msgstr "Erstelle Zählungen je Kontaktgruppe bei der Berechnung der Netzwerkanzahl"
 
-#: src/Module/Admin/Site.php:535
+#: src/Module/Admin/Site.php:538
 msgid ""
 "On systems with users that heavily use contact groups the query can be very "
 "expensive."
 msgstr "Auf Systemen mit Benutzern, die häufig Kontaktgruppen verwenden, kann die Abfrage sehr aufwändig sein."
 
-#: src/Module/Admin/Site.php:537
+#: src/Module/Admin/Site.php:540
 msgid "Maximum number of parallel workers"
 msgstr "Maximale Anzahl parallel laufender Worker"
 
-#: src/Module/Admin/Site.php:537
+#: src/Module/Admin/Site.php:540
 #, 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:538
+#: src/Module/Admin/Site.php:541
 msgid "Enable fastlane"
 msgstr "Aktiviere Fastlane"
 
-#: src/Module/Admin/Site.php:538
+#: src/Module/Admin/Site.php:541
 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:540
+#: src/Module/Admin/Site.php:543
 msgid "Direct relay transfer"
 msgstr "Direkte Relais-Übertragung"
 
-#: src/Module/Admin/Site.php:540
+#: src/Module/Admin/Site.php:543
 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:541
+#: src/Module/Admin/Site.php:544
 msgid "Relay scope"
 msgstr "Geltungsbereich des Relais"
 
-#: src/Module/Admin/Site.php:541
+#: src/Module/Admin/Site.php:544
 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:541 src/Module/Contact/Profile.php:274
+#: src/Module/Admin/Site.php:544 src/Module/Contact/Profile.php:274
 #: src/Module/Settings/TwoFactor/Index.php:125
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: src/Module/Admin/Site.php:541
+#: src/Module/Admin/Site.php:544
 msgid "all"
 msgstr "Alle"
 
-#: src/Module/Admin/Site.php:541
+#: src/Module/Admin/Site.php:544
 msgid "tags"
 msgstr "Schlagwörter"
 
-#: src/Module/Admin/Site.php:542
+#: src/Module/Admin/Site.php:545
 msgid "Server tags"
 msgstr "Server-Schlagworte"
 
-#: src/Module/Admin/Site.php:542
+#: src/Module/Admin/Site.php:545
 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:543
+#: src/Module/Admin/Site.php:546
 msgid "Deny Server tags"
 msgstr "Server Tags ablehnen"
 
-#: src/Module/Admin/Site.php:543
+#: src/Module/Admin/Site.php:546
 msgid "Comma separated list of tags that are rejected."
 msgstr "Durch Kommas getrennte Liste der Tags, die abgelehnt werden"
 
-#: src/Module/Admin/Site.php:544
+#: src/Module/Admin/Site.php:547
 msgid "Allow user tags"
 msgstr "Verwende Schlagworte der Nutzer"
 
-#: src/Module/Admin/Site.php:544
+#: src/Module/Admin/Site.php:547
 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:547
+#: src/Module/Admin/Site.php:550
 msgid "Start Relocation"
 msgstr "Umsiedlung starten"
 
@@ -6155,12 +5015,12 @@ msgstr "Dieses Backend hat keine zusätzlichen Einstellungen"
 msgid "Database (legacy)"
 msgstr "Datenbank (legacy)"
 
-#: src/Module/Admin/Summary.php:55
+#: src/Module/Admin/Summary.php:56
 #, php-format
 msgid "Template engine (%s) error: %s"
 msgstr "Template engine (%s) Fehler: %s"
 
-#: src/Module/Admin/Summary.php:59
+#: src/Module/Admin/Summary.php:60
 #, php-format
 msgid ""
 "Your DB still runs with MyISAM tables. You should change the engine type to "
@@ -6171,7 +5031,7 @@ msgid ""
 " an automatic conversion.<br />"
 msgstr "Deine DB verwendet derzeit noch MyISAM Tabellen. Du solltest die Datenbank Engine auf InnoDB umstellen, da Friendica in Zukunft InnoDB-Features verwenden wird. Eine Anleitung zur Umstellung der Datenbank kannst du  <a href=\"%s\">hier</a>  finden. Du kannst außerdem mit dem Befehl <tt>php bin/console.php dbstructure toinnodb</tt> auf der Kommandozeile die Umstellung automatisch vornehmen lassen."
 
-#: src/Module/Admin/Summary.php:64
+#: src/Module/Admin/Summary.php:65
 #, php-format
 msgid ""
 "Your DB still runs with InnoDB tables in the Antelope file format. You "
@@ -6182,7 +5042,7 @@ msgid ""
 " installation for an automatic conversion.<br />"
 msgstr "Deine DB verwendet derzeit noch InnoDB Tabellen im Antelope Dateiformat. Du solltest diese auf das Barracuda Format ändern. Friendica verwendet einige Features, die nicht vom Antelope Format unterstützt werden. <a href=\"%s\">Hier</a> findest du eine Anleitung für die Umstellung. Alternativ kannst du auch den Befehl <tt>php bin/console.php dbstructure toinnodb</tt> In der Kommandozeile deiner Friendica Instanz verwenden um die Formate automatisch anzupassen.<br />"
 
-#: src/Module/Admin/Summary.php:74
+#: src/Module/Admin/Summary.php:75
 #, php-format
 msgid ""
 "Your table_definition_cache is too low (%d). This can lead to the database "
@@ -6190,39 +5050,39 @@ msgid ""
 " to %d. See <a href=\"%s\">here</a> for more information.<br />"
 msgstr "Der Wert table_definition_cache ist zu niedrig (%d). Dadurch können Datenbank Fehler \"Prepared statement needs to be re-prepared\" hervor gerufen werden. Bitte setze den Wert auf mindestens %d. Weiterführende Informationen <a href=\"%s\">findest du hier</a>."
 
-#: src/Module/Admin/Summary.php:84
+#: src/Module/Admin/Summary.php:85
 #, php-format
 msgid ""
 "There is a new version of Friendica available for download. Your current "
 "version is %1$s, upstream version is %2$s"
 msgstr "Es gibt eine neue Version von Friendica. Du verwendest derzeit die Version %1$s, die aktuelle Version ist %2$s."
 
-#: src/Module/Admin/Summary.php:93
+#: src/Module/Admin/Summary.php:94
 msgid ""
 "The database update failed. Please run \"php bin/console.php dbstructure "
 "update\" from the command line and have a look at the errors that might "
 "appear."
 msgstr "Das Update der Datenbank ist fehlgeschlagen. Bitte führe 'php bin/console.php dbstructure update' in der Kommandozeile aus und achte auf eventuell auftretende Fehlermeldungen."
 
-#: src/Module/Admin/Summary.php:97
+#: src/Module/Admin/Summary.php:98
 msgid ""
 "The last update failed. Please run \"php bin/console.php dbstructure "
 "update\" from the command line and have a look at the errors that might "
 "appear. (Some of the errors are possibly inside the logfile.)"
 msgstr "Das letzte Update ist fehlgeschlagen. Bitte führe \"php bin/console.php dbstructure update\" auf der Kommandozeile aus und werfe einen Blick auf eventuell auftretende Fehler. (Zusätzliche Informationen zu Fehlern könnten in den Logdateien stehen.)"
 
-#: src/Module/Admin/Summary.php:102
+#: src/Module/Admin/Summary.php:103
 msgid "The worker was never executed. Please check your database structure!"
 msgstr "Der Hintergrundprozess (worker) wurde noch nie gestartet. Bitte überprüfe deine Datenbankstruktur."
 
-#: src/Module/Admin/Summary.php:104
+#: src/Module/Admin/Summary.php:105
 #, php-format
 msgid ""
 "The last worker execution was on %s UTC. This is older than one hour. Please"
 " check your crontab settings."
 msgstr "Der Hintergrundprozess (worker) wurde zuletzt um %s UTC ausgeführt. Das war vor mehr als einer Stunde. Bitte überprüfe deine crontab-Einstellungen."
 
-#: src/Module/Admin/Summary.php:109
+#: src/Module/Admin/Summary.php:110
 #, php-format
 msgid ""
 "Friendica's configuration now is stored in config/local.config.php, please "
@@ -6231,7 +5091,7 @@ msgid ""
 "help with the transition."
 msgstr "Die Konfiguration von Friendica befindet sich ab jetzt in der 'config/local.config.php' Datei. Kopiere bitte die Datei  'config/local-sample.config.php' nach 'config/local.config.php' und setze die Konfigurationvariablen so wie in der alten <code>.htconfig.php</code>. Wie die Übertragung der Werte aussehen muss, kannst du der <a href=\"%s\">Konfiguration Hilfeseite</a> entnehmen."
 
-#: src/Module/Admin/Summary.php:113
+#: src/Module/Admin/Summary.php:114
 #, php-format
 msgid ""
 "Friendica's configuration now is stored in config/local.config.php, please "
@@ -6240,7 +5100,7 @@ msgid ""
 "page</a> for help with the transition."
 msgstr "Die Konfiguration von Friendica befindet sich ab jetzt in der 'config/local.config.php' Datei. Kopiere bitte die Datei  'config/local-sample.config.php' nach 'config/local.config.php' und setze die Konfigurationvariablen so wie in der alten <code>config/local.ini.php</code>. Wie die Übertragung der Werte aussehen muss, kannst du der <a href=\"%s\">Konfiguration Hilfeseite</a> entnehmen."
 
-#: src/Module/Admin/Summary.php:119
+#: src/Module/Admin/Summary.php:120
 #, php-format
 msgid ""
 "<a href=\"%s\">%s</a> is not reachable on your system. This is a severe "
@@ -6248,83 +5108,51 @@ msgid ""
 "href=\"%s\">the installation page</a> for help."
 msgstr "<a href=\"%s\">%s</a> konnte von deinem System nicht aufgerufen werden. Dies deutet auf ein schwerwiegendes Problem deiner Konfiguration hin. Bitte konsultiere <a href=\"%s\">die Installations-Dokumentation</a> zum Beheben des Problems."
 
-#: src/Module/Admin/Summary.php:137
+#: src/Module/Admin/Summary.php:138
 #, php-format
 msgid "The logfile '%s' is not usable. No logging possible (error: '%s')"
 msgstr "Die Logdatei '%s' ist nicht beschreibbar. Derzeit ist keine Aufzeichnung möglich (Fehler: '%s')"
 
-#: src/Module/Admin/Summary.php:151
+#: src/Module/Admin/Summary.php:152
 #, php-format
 msgid ""
 "The debug logfile '%s' is not usable. No logging possible (error: '%s')"
 msgstr "Die Logdatei '%s' ist nicht beschreibbar. Derzeit ist keine Aufzeichnung möglich (Fehler: '%s')"
 
-#: src/Module/Admin/Summary.php:167
+#: src/Module/Admin/Summary.php:168
 #, php-format
 msgid ""
 "Friendica's system.basepath was updated from '%s' to '%s'. Please remove the"
 " system.basepath from your db to avoid differences."
 msgstr "Friendica's system.basepath wurde aktualisiert '%s' von '%s'. Bitte entferne system.basepath aus der Datenbank um Unterschiede zu vermeiden."
 
-#: src/Module/Admin/Summary.php:175
+#: src/Module/Admin/Summary.php:176
 #, php-format
 msgid ""
 "Friendica's current system.basepath '%s' is wrong and the config file '%s' "
 "isn't used."
 msgstr "Friendica's aktueller system.basepath '%s' ist verkehrt und die config file '%s' wird nicht benutzt."
 
-#: src/Module/Admin/Summary.php:183
+#: src/Module/Admin/Summary.php:184
 #, php-format
 msgid ""
 "Friendica's current system.basepath '%s' is not equal to the config file "
 "'%s'. Please fix your configuration."
 msgstr "Friendica's aktueller system.basepath '%s' ist nicht gleich wie die config file '%s'. Bitte korrigiere deine Konfiguration."
 
-#: src/Module/Admin/Summary.php:190
-msgid "Normal Account"
-msgstr "Normales Konto"
-
-#: src/Module/Admin/Summary.php:191
-msgid "Automatic Follower Account"
-msgstr "Automatisch folgendes Konto (Marktschreier)"
-
-#: src/Module/Admin/Summary.php:192
-msgid "Public Forum Account"
-msgstr "Öffentliches Forum-Konto"
-
-#: src/Module/Admin/Summary.php:193
-msgid "Automatic Friend Account"
-msgstr "Automatische Freunde-Seite"
-
-#: src/Module/Admin/Summary.php:194
-msgid "Blog Account"
-msgstr "Blog-Konto"
-
 #: src/Module/Admin/Summary.php:195
-msgid "Private Forum Account"
-msgstr "Privates Forum-Konto"
-
-#: src/Module/Admin/Summary.php:215
 msgid "Message queues"
 msgstr "Nachrichten-Warteschlangen"
 
-#: src/Module/Admin/Summary.php:221
+#: src/Module/Admin/Summary.php:201
 msgid "Server Settings"
 msgstr "Servereinstellungen"
 
-#: src/Module/Admin/Summary.php:237
-msgid "Registered users"
-msgstr "Registrierte Personen"
-
-#: src/Module/Admin/Summary.php:239
-msgid "Pending registrations"
-msgstr "Anstehende Anmeldungen"
-
-#: src/Module/Admin/Summary.php:240
+#: src/Module/Admin/Summary.php:217
 msgid "Version"
 msgstr "Version"
 
-#: src/Module/Admin/Summary.php:244
+#: src/Module/Admin/Summary.php:221
 msgid "Active addons"
 msgstr "Aktivierte Addons"
 
@@ -6348,7 +5176,7 @@ msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
 #: src/Module/Admin/Themes/Details.php:91
-#: src/Module/Admin/Themes/Index.php:112 src/Module/BaseAdmin.php:94
+#: src/Module/Admin/Themes/Index.php:112 src/Module/BaseAdmin.php:93
 msgid "Themes"
 msgstr "Themen"
 
@@ -6413,195 +5241,6 @@ msgid ""
 "of sections should be [h2] and below."
 msgstr "Füge hier die Nutzungsbedingungen deines Knotens ein. Du kannst BBCode zur Formatierung verwenden. Überschriften sollten [h2] oder darunter sein."
 
-#: src/Module/Admin/Users/Active.php:45 src/Module/Admin/Users/Index.php:45
-#, php-format
-msgid "%s user blocked"
-msgid_plural "%s users blocked"
-msgstr[0] "%s Nutzer blockiert"
-msgstr[1] "%s Nutzer blockiert"
-
-#: src/Module/Admin/Users/Active.php:53 src/Module/Admin/Users/Active.php:88
-#: src/Module/Admin/Users/Blocked.php:54 src/Module/Admin/Users/Blocked.php:89
-#: src/Module/Admin/Users/Index.php:60 src/Module/Admin/Users/Index.php:95
-msgid "You can't remove yourself"
-msgstr "Du kannst dich nicht selbst löschen!"
-
-#: src/Module/Admin/Users/Active.php:57 src/Module/Admin/Users/Blocked.php:58
-#: src/Module/Admin/Users/Index.php:64
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] "%s Nutzer gelöscht"
-msgstr[1] "%s Nutzer gelöscht"
-
-#: src/Module/Admin/Users/Active.php:86 src/Module/Admin/Users/Blocked.php:87
-#: src/Module/Admin/Users/Index.php:93
-#, php-format
-msgid "User \"%s\" deleted"
-msgstr "Nutzer \"%s\" gelöscht"
-
-#: src/Module/Admin/Users/Active.php:96 src/Module/Admin/Users/Index.php:103
-#, php-format
-msgid "User \"%s\" blocked"
-msgstr "Nutzer \"%s\" blockiert"
-
-#: src/Module/Admin/Users/Active.php:129
-#: src/Module/Admin/Users/Blocked.php:130
-#: src/Module/Admin/Users/Deleted.php:88 src/Module/Admin/Users/Index.php:142
-#: src/Module/Admin/Users/Index.php:162
-msgid "Register date"
-msgstr "Anmeldedatum"
-
-#: src/Module/Admin/Users/Active.php:129
-#: src/Module/Admin/Users/Blocked.php:130
-#: src/Module/Admin/Users/Deleted.php:88 src/Module/Admin/Users/Index.php:142
-#: src/Module/Admin/Users/Index.php:162
-msgid "Last login"
-msgstr "Letzte Anmeldung"
-
-#: src/Module/Admin/Users/Active.php:129
-#: src/Module/Admin/Users/Blocked.php:130
-#: src/Module/Admin/Users/Deleted.php:88 src/Module/Admin/Users/Index.php:142
-#: src/Module/Admin/Users/Index.php:162
-msgid "Last public item"
-msgstr "Letzter öffentliche Beitrag"
-
-#: src/Module/Admin/Users/Active.php:137
-msgid "Active Accounts"
-msgstr "Aktive Benutzerkonten"
-
-#: src/Module/Admin/Users/Active.php:141
-#: src/Module/Admin/Users/Blocked.php:141 src/Module/Admin/Users/Index.php:155
-msgid "User blocked"
-msgstr "Nutzer blockiert."
-
-#: src/Module/Admin/Users/Active.php:142
-#: src/Module/Admin/Users/Blocked.php:143 src/Module/Admin/Users/Index.php:157
-msgid "Site admin"
-msgstr "Seitenadministrator"
-
-#: src/Module/Admin/Users/Active.php:143
-#: src/Module/Admin/Users/Blocked.php:144 src/Module/Admin/Users/Index.php:158
-msgid "Account expired"
-msgstr "Account ist abgelaufen"
-
-#: src/Module/Admin/Users/Active.php:144 src/Module/Admin/Users/Index.php:161
-msgid "Create a new user"
-msgstr "Neues Benutzerkonto anlegen"
-
-#: src/Module/Admin/Users/Active.php:150
-#: src/Module/Admin/Users/Blocked.php:150 src/Module/Admin/Users/Index.php:167
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist du sicher?"
-
-#: src/Module/Admin/Users/Active.php:151
-#: src/Module/Admin/Users/Blocked.php:151 src/Module/Admin/Users/Index.php:168
-msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist du sicher?"
-
-#: src/Module/Admin/Users/Blocked.php:46 src/Module/Admin/Users/Index.php:52
-#, php-format
-msgid "%s user unblocked"
-msgid_plural "%s users unblocked"
-msgstr[0] "%s Nutzer freigeschaltet"
-msgstr[1] "%s Nutzer freigeschaltet"
-
-#: src/Module/Admin/Users/Blocked.php:96 src/Module/Admin/Users/Index.php:109
-#, php-format
-msgid "User \"%s\" unblocked"
-msgstr "Nutzer \"%s\" frei geschaltet"
-
-#: src/Module/Admin/Users/Blocked.php:138
-msgid "Blocked Users"
-msgstr "Blockierte Benutzer"
-
-#: src/Module/Admin/Users/Create.php:62
-msgid "New User"
-msgstr "Neuer Nutzer"
-
-#: src/Module/Admin/Users/Create.php:63
-msgid "Add User"
-msgstr "Nutzer hinzufügen"
-
-#: src/Module/Admin/Users/Create.php:71
-msgid "Name of the new user."
-msgstr "Name des neuen Nutzers"
-
-#: src/Module/Admin/Users/Create.php:72
-msgid "Nickname"
-msgstr "Spitzname"
-
-#: src/Module/Admin/Users/Create.php:72
-msgid "Nickname of the new user."
-msgstr "Spitznamen für den neuen Nutzer"
-
-#: src/Module/Admin/Users/Create.php:73
-msgid "Email address of the new user."
-msgstr "Email Adresse des neuen Nutzers"
-
-#: src/Module/Admin/Users/Deleted.php:86
-msgid "Users awaiting permanent deletion"
-msgstr "Nutzer wartet auf permanente Löschung"
-
-#: src/Module/Admin/Users/Deleted.php:88 src/Module/Admin/Users/Index.php:162
-msgid "Permanent deletion"
-msgstr "Permanent löschen"
-
-#: src/Module/Admin/Users/Index.php:150 src/Module/Admin/Users/Index.php:160
-#: src/Module/BaseAdmin.php:92
-msgid "Users"
-msgstr "Nutzer"
-
-#: src/Module/Admin/Users/Index.php:152
-msgid "User waiting for permanent deletion"
-msgstr "Nutzer wartet auf permanente Löschung"
-
-#: src/Module/Admin/Users/Pending.php:48
-#, php-format
-msgid "%s user approved"
-msgid_plural "%s users approved"
-msgstr[0] "%sNutzer zugelassen"
-msgstr[1] "%sNutzer zugelassen"
-
-#: src/Module/Admin/Users/Pending.php:55
-#, php-format
-msgid "%s registration revoked"
-msgid_plural "%s registrations revoked"
-msgstr[0] "%sRegistration zurückgezogen"
-msgstr[1] "%sRegistrierungen zurückgezogen"
-
-#: src/Module/Admin/Users/Pending.php:81
-msgid "Account approved."
-msgstr "Konto freigegeben."
-
-#: src/Module/Admin/Users/Pending.php:87
-msgid "Registration revoked"
-msgstr "Registrierung zurückgezogen"
-
-#: src/Module/Admin/Users/Pending.php:102
-msgid "User registrations awaiting review"
-msgstr "Neuanmeldungen, die auf Deine Bestätigung warten"
-
-#: src/Module/Admin/Users/Pending.php:104
-msgid "Request date"
-msgstr "Anfragedatum"
-
-#: src/Module/Admin/Users/Pending.php:105
-msgid "No registrations."
-msgstr "Keine Neuanmeldungen."
-
-#: src/Module/Admin/Users/Pending.php:106
-msgid "Note from the user"
-msgstr "Hinweis vom Nutzer"
-
-#: src/Module/Admin/Users/Pending.php:108
-msgid "Deny"
-msgstr "Verwehren"
-
 #: src/Module/Api/ApiResponse.php:279
 #, php-format
 msgid "API endpoint %s %s is not implemented"
@@ -6659,88 +5298,77 @@ msgid "Item was not found."
 msgstr "Beitrag konnte nicht gefunden werden."
 
 #: src/Module/BaseAdmin.php:54 src/Module/BaseAdmin.php:58
+#: src/Module/BaseModeration.php:77 src/Module/BaseModeration.php:81
 msgid "Please login to continue."
 msgstr "Bitte melde dich an, um fortzufahren."
 
-#: src/Module/BaseAdmin.php:63
+#: src/Module/BaseAdmin.php:63 src/Module/BaseModeration.php:86
 msgid "You don't have access to administration pages."
 msgstr "Du hast keinen Zugriff auf die Administrationsseiten."
 
-#: src/Module/BaseAdmin.php:67
+#: src/Module/BaseAdmin.php:67 src/Module/BaseModeration.php:90
 msgid ""
 "Submanaged account can't access the administration pages. Please log back in"
 " as the main account."
 msgstr "Verwaltete Benutzerkonten haben keinen Zugriff auf die Administrationsseiten. Bitte wechsle wieder zurück auf das Administrator Konto."
 
-#: src/Module/BaseAdmin.php:86
+#: src/Module/BaseAdmin.php:86 src/Module/BaseModeration.php:109
 msgid "Overview"
 msgstr "Übersicht"
 
-#: src/Module/BaseAdmin.php:89
+#: src/Module/BaseAdmin.php:89 src/Module/BaseModeration.php:111
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: src/Module/BaseAdmin.php:95 src/Module/BaseSettings.php:63
+#: src/Module/BaseAdmin.php:94 src/Module/BaseSettings.php:112
 msgid "Additional features"
 msgstr "Zusätzliche Features"
 
-#: src/Module/BaseAdmin.php:98
+#: src/Module/BaseAdmin.php:97
 msgid "Database"
 msgstr "Datenbank"
 
-#: src/Module/BaseAdmin.php:99
+#: src/Module/BaseAdmin.php:98
 msgid "DB updates"
 msgstr "DB Updates"
 
-#: src/Module/BaseAdmin.php:100
+#: src/Module/BaseAdmin.php:99
 msgid "Inspect Deferred Workers"
 msgstr "Verzögerte Worker inspizieren"
 
-#: src/Module/BaseAdmin.php:101
+#: src/Module/BaseAdmin.php:100
 msgid "Inspect worker Queue"
 msgstr "Worker Warteschlange inspizieren"
 
-#: src/Module/BaseAdmin.php:103
-msgid "Tools"
-msgstr "Werkzeuge"
-
-#: src/Module/BaseAdmin.php:104
-msgid "Contact Blocklist"
-msgstr "Kontakt Blockliste"
-
-#: src/Module/BaseAdmin.php:105
-msgid "Server Blocklist"
-msgstr "Server Blockliste"
-
-#: src/Module/BaseAdmin.php:112
+#: src/Module/BaseAdmin.php:106 src/Module/BaseModeration.php:119
 msgid "Diagnostics"
 msgstr "Diagnostik"
 
-#: src/Module/BaseAdmin.php:113
+#: src/Module/BaseAdmin.php:107
 msgid "PHP Info"
 msgstr "PHP-Info"
 
-#: src/Module/BaseAdmin.php:114
+#: src/Module/BaseAdmin.php:108
 msgid "probe address"
 msgstr "Adresse untersuchen"
 
-#: src/Module/BaseAdmin.php:115
+#: src/Module/BaseAdmin.php:109
 msgid "check webfinger"
 msgstr "Webfinger überprüfen"
 
-#: src/Module/BaseAdmin.php:117
+#: src/Module/BaseAdmin.php:110
 msgid "Babel"
 msgstr "Babel"
 
-#: src/Module/BaseAdmin.php:118 src/Module/Debug/ActivityPubConversion.php:137
+#: src/Module/BaseAdmin.php:111 src/Module/Debug/ActivityPubConversion.php:137
 msgid "ActivityPub Conversion"
 msgstr "Umwandlung nach ActivityPub"
 
-#: src/Module/BaseAdmin.php:127
+#: src/Module/BaseAdmin.php:120
 msgid "Addon Features"
 msgstr "Addon Features"
 
-#: src/Module/BaseAdmin.php:128
+#: src/Module/BaseAdmin.php:121 src/Module/BaseModeration.php:128
 msgid "User registrations waiting for confirmation"
 msgstr "Nutzeranmeldungen, die auf Bestätigung warten"
 
@@ -6772,10 +5400,40 @@ msgid_plural ""
 msgstr[0] "Das monatliche Limit von %d Beitrag wurde erreicht. Der Beitrag wurde verworfen."
 msgstr[1] "Das monatliche Limit von %d Beiträgen wurde erreicht. Der Beitrag wurde verworfen."
 
+#: src/Module/BaseModeration.php:112 src/Module/Moderation/Users/Index.php:148
+#: src/Module/Moderation/Users/Index.php:158
+msgid "Users"
+msgstr "Nutzer"
+
+#: src/Module/BaseModeration.php:114
+msgid "Tools"
+msgstr "Werkzeuge"
+
+#: src/Module/BaseModeration.php:115
+msgid "Contact Blocklist"
+msgstr "Kontakt Blockliste"
+
+#: src/Module/BaseModeration.php:116
+msgid "Server Blocklist"
+msgstr "Server Blockliste"
+
+#: src/Module/BaseModeration.php:117 src/Module/Moderation/Item/Delete.php:62
+msgid "Delete Item"
+msgstr "Eintrag löschen"
+
+#: src/Module/BaseModeration.php:120 src/Module/Moderation/Item/Source.php:76
+msgid "Item Source"
+msgstr "Beitrags Quelle"
+
 #: src/Module/BaseProfile.php:51 src/Module/Contact.php:463
 msgid "Profile Details"
 msgstr "Profildetails"
 
+#: src/Module/BaseProfile.php:59 src/Module/Contact.php:447
+#: src/Module/Contact/Follow.php:190 src/Module/Contact/Unfollow.php:138
+msgid "Status Messages and Posts"
+msgstr "Statusnachrichten und Beiträge"
+
 #: src/Module/BaseProfile.php:109
 msgid "Only You Can See This"
 msgstr "Nur du kannst das sehen"
@@ -6802,32 +5460,40 @@ msgstr "Personensuche - %s"
 msgid "Forum Search - %s"
 msgstr "Forensuche - %s"
 
-#: src/Module/BaseSettings.php:41
+#: src/Module/BaseSearch.php:119 src/Module/Contact/MatchInterests.php:139
+msgid "No matches"
+msgstr "Keine Übereinstimmungen"
+
+#: src/Module/BaseSettings.php:80
 msgid "Account"
 msgstr "Nutzerkonto"
 
-#: src/Module/BaseSettings.php:48 src/Module/Security/TwoFactor/Verify.php:100
+#: src/Module/BaseSettings.php:87 src/Module/Security/TwoFactor/Verify.php:96
 #: src/Module/Settings/TwoFactor/Index.php:117
 msgid "Two-factor authentication"
 msgstr "Zwei-Faktor Authentifizierung"
 
-#: src/Module/BaseSettings.php:71
+#: src/Module/BaseSettings.php:120
 msgid "Display"
 msgstr "Anzeige"
 
-#: src/Module/BaseSettings.php:92 src/Module/Settings/Delegation.php:170
+#: src/Module/BaseSettings.php:127 src/Module/Settings/Connectors.php:203
+msgid "Social Networks"
+msgstr "Soziale Netzwerke"
+
+#: src/Module/BaseSettings.php:141 src/Module/Settings/Delegation.php:170
 msgid "Manage Accounts"
 msgstr "Accounts Verwalten"
 
-#: src/Module/BaseSettings.php:99
+#: src/Module/BaseSettings.php:148
 msgid "Connected apps"
 msgstr "Verbundene Programme"
 
-#: src/Module/BaseSettings.php:106 src/Module/Settings/UserExport.php:102
+#: src/Module/BaseSettings.php:155 src/Module/Settings/UserExport.php:98
 msgid "Export personal data"
 msgstr "Persönliche Daten exportieren"
 
-#: src/Module/BaseSettings.php:113
+#: src/Module/BaseSettings.php:162
 msgid "Remove account"
 msgstr "Konto löschen"
 
@@ -6839,6 +5505,115 @@ msgstr "Der Seite fehlt ein URL Parameter."
 msgid "The post was created"
 msgstr "Der Beitrag wurde angelegt"
 
+#: src/Module/Calendar/Event/API.php:100 src/Module/Calendar/Event/API.php:135
+#: src/Module/Calendar/Event/Form.php:80
+msgid "Invalid Request"
+msgstr "Ungültige Anfrage"
+
+#: src/Module/Calendar/Event/API.php:109
+msgid "Event id is missing."
+msgstr "Die Veranstaltung fehlt."
+
+#: src/Module/Calendar/Event/API.php:131
+msgid "Failed to remove event"
+msgstr "Entfernen der Veranstaltung fehlgeschlagen"
+
+#: src/Module/Calendar/Event/API.php:186 src/Module/Calendar/Event/API.php:188
+msgid "Event can not end before it has started."
+msgstr "Die Veranstaltung kann nicht enden, bevor sie beginnt."
+
+#: src/Module/Calendar/Event/API.php:195 src/Module/Calendar/Event/API.php:197
+msgid "Event title and start time are required."
+msgstr "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden."
+
+#: src/Module/Calendar/Event/Form.php:208
+msgid "Starting date and Title are required."
+msgstr "Anfangszeitpunkt und Titel werden benötigt"
+
+#: src/Module/Calendar/Event/Form.php:209
+#: src/Module/Calendar/Event/Form.php:214
+msgid "Event Starts:"
+msgstr "Veranstaltungsbeginn:"
+
+#: src/Module/Calendar/Event/Form.php:209
+#: src/Module/Calendar/Event/Form.php:241 src/Module/Debug/Probe.php:59
+#: src/Module/Install.php:207 src/Module/Install.php:240
+#: src/Module/Install.php:245 src/Module/Install.php:264
+#: src/Module/Install.php:275 src/Module/Install.php:280
+#: src/Module/Install.php:286 src/Module/Install.php:291
+#: src/Module/Install.php:305 src/Module/Install.php:320
+#: src/Module/Install.php:347
+#: src/Module/Moderation/Blocklist/Server/Add.php:134
+#: src/Module/Moderation/Blocklist/Server/Add.php:136
+#: src/Module/Moderation/Blocklist/Server/Import.php:126
+#: src/Module/Moderation/Blocklist/Server/Index.php:83
+#: src/Module/Moderation/Blocklist/Server/Index.php:84
+#: src/Module/Moderation/Blocklist/Server/Index.php:112
+#: src/Module/Moderation/Blocklist/Server/Index.php:113
+#: src/Module/Moderation/Item/Delete.php:67 src/Module/Register.php:148
+#: src/Module/Security/TwoFactor/Verify.php:101
+#: src/Module/Settings/TwoFactor/Index.php:140
+#: src/Module/Settings/TwoFactor/Verify.php:154
+msgid "Required"
+msgstr "Benötigt"
+
+#: src/Module/Calendar/Event/Form.php:223
+#: src/Module/Calendar/Event/Form.php:247
+msgid "Finish date/time is not known or not relevant"
+msgstr "Enddatum/-zeit ist nicht bekannt oder nicht relevant"
+
+#: src/Module/Calendar/Event/Form.php:225
+#: src/Module/Calendar/Event/Form.php:230
+msgid "Event Finishes:"
+msgstr "Veranstaltungsende:"
+
+#: src/Module/Calendar/Event/Form.php:237 src/Module/Profile/Profile.php:171
+#: src/Module/Settings/Profile/Index.php:247
+msgid "Description:"
+msgstr "Beschreibung"
+
+#: src/Module/Calendar/Event/Form.php:241
+#: src/Module/Calendar/Event/Form.php:243
+msgid "Title:"
+msgstr "Titel:"
+
+#: src/Module/Calendar/Event/Form.php:244
+#: src/Module/Calendar/Event/Form.php:245
+msgid "Share this event"
+msgstr "Veranstaltung teilen"
+
+#: src/Module/Calendar/Event/Form.php:251 src/Module/Profile/Profile.php:247
+msgid "Basic"
+msgstr "Allgemein"
+
+#: src/Module/Calendar/Export.php:77
+msgid "This calendar format is not supported"
+msgstr "Dieses Kalenderformat wird nicht unterstützt."
+
+#: src/Module/Calendar/Export.php:79
+msgid "No exportable data found"
+msgstr "Keine exportierbaren Daten gefunden"
+
+#: src/Module/Calendar/Export.php:96
+msgid "calendar"
+msgstr "Kalender"
+
+#: src/Module/Calendar/Show.php:121
+msgid "Events"
+msgstr "Veranstaltungen"
+
+#: src/Module/Calendar/Show.php:122
+msgid "View"
+msgstr "Ansehen"
+
+#: src/Module/Calendar/Show.php:123
+msgid "Create New Event"
+msgstr "Neue Veranstaltung erstellen"
+
+#: src/Module/Calendar/Show.php:129
+msgid "list"
+msgstr "Liste"
+
 #: src/Module/Contact.php:88
 #, php-format
 msgid "%d contact edited."
@@ -6850,10 +5625,20 @@ msgstr[1] "%d Kontakte bearbeitet."
 msgid "Show all contacts"
 msgstr "Alle Kontakte anzeigen"
 
+#: src/Module/Contact.php:317 src/Module/Contact.php:377
+#: src/Module/Moderation/BaseUsers.php:85
+msgid "Pending"
+msgstr "Ausstehend"
+
 #: src/Module/Contact.php:320
 msgid "Only show pending contacts"
 msgstr "Zeige nur noch ausstehende Kontakte."
 
+#: src/Module/Contact.php:325 src/Module/Contact.php:378
+#: src/Module/Moderation/BaseUsers.php:93
+msgid "Blocked"
+msgstr "Geblockt"
+
 #: src/Module/Contact.php:328
 msgid "Only show blocked contacts"
 msgstr "Nur blockierte Kontakte anzeigen"
@@ -6900,8 +5685,16 @@ msgstr "Ergebnisse für: %s"
 msgid "Update"
 msgstr "Aktualisierungen"
 
+#: src/Module/Contact.php:401 src/Module/Contact/Profile.php:349
+#: src/Module/Contact/Profile.php:468
+#: src/Module/Moderation/Blocklist/Contact.php:117
+#: src/Module/Moderation/Users/Blocked.php:138
+#: src/Module/Moderation/Users/Index.php:154
+msgid "Unblock"
+msgstr "Entsperren"
+
 #: src/Module/Contact.php:402 src/Module/Contact/Profile.php:350
-#: src/Module/Contact/Profile.php:458
+#: src/Module/Contact/Profile.php:476
 msgid "Unignore"
 msgstr "Ignorieren aufheben"
 
@@ -6954,6 +5747,19 @@ msgstr "Ausstehende eingehende Kontaktanfrage"
 msgid "Visit %s's profile [%s]"
 msgstr "Besuche %ss Profil [%s]"
 
+#: src/Module/Contact/Advanced.php:70 src/Module/Contact/Advanced.php:109
+#: src/Module/Contact/Contacts.php:53 src/Module/Contact/Conversations.php:84
+#: src/Module/Contact/Conversations.php:89
+#: src/Module/Contact/Conversations.php:94 src/Module/Contact/Media.php:43
+#: src/Module/Contact/Posts.php:78 src/Module/Contact/Posts.php:83
+#: src/Module/Contact/Posts.php:88 src/Module/Contact/Profile.php:142
+#: src/Module/Contact/Profile.php:147 src/Module/Contact/Profile.php:152
+#: src/Module/Contact/Redir.php:94 src/Module/Contact/Redir.php:140
+#: src/Module/FriendSuggest.php:71 src/Module/FriendSuggest.php:109
+#: src/Module/Group.php:97 src/Module/Group.php:106
+msgid "Contact not found."
+msgstr "Kontakt nicht gefunden."
+
 #: src/Module/Contact/Advanced.php:99
 msgid "Contact update failed."
 msgstr "Konnte den Kontakt nicht aktualisieren."
@@ -6962,6 +5768,18 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
 msgid "Return to contact editor"
 msgstr "Zurück zum Kontakteditor"
 
+#: src/Module/Contact/Advanced.php:134
+#: src/Module/Moderation/Blocklist/Contact.php:122
+#: src/Module/Moderation/Users/Active.php:126
+#: src/Module/Moderation/Users/Blocked.php:126
+#: src/Module/Moderation/Users/Create.php:71
+#: src/Module/Moderation/Users/Deleted.php:83
+#: src/Module/Moderation/Users/Index.php:140
+#: src/Module/Moderation/Users/Index.php:160
+#: src/Module/Moderation/Users/Pending.php:99 src/Module/Settings/OAuth.php:73
+msgid "Name"
+msgstr "Name"
+
 #: src/Module/Contact/Advanced.php:135
 msgid "Account Nickname"
 msgstr "Konto-Spitzname"
@@ -6978,7 +5796,7 @@ msgstr "Pull/Feed-URL"
 msgid "New photo from this URL"
 msgstr "Neues Foto von dieser URL"
 
-#: src/Module/Contact/Contacts.php:48 src/Module/Conversation/Network.php:186
+#: src/Module/Contact/Contacts.php:48 src/Module/Conversation/Network.php:188
 #: src/Module/Group.php:101
 msgid "Invalid contact."
 msgstr "Ungültiger Kontakt."
@@ -7038,6 +5856,88 @@ msgid_plural "Contacts (%s)"
 msgstr[0] "Kontakt (%s)"
 msgstr[1] "Kontakte (%s)"
 
+#: src/Module/Contact/Follow.php:69 src/Module/Contact/Redir.php:62
+#: src/Module/Contact/Redir.php:222 src/Module/Conversation/Community.php:193
+#: src/Module/Debug/ItemBody.php:38 src/Module/Diaspora/Receive.php:57
+#: src/Module/Item/Display.php:95 src/Module/Item/Feed.php:59
+#: src/Module/Item/Follow.php:41 src/Module/Item/Ignore.php:41
+#: src/Module/Item/Pin.php:41 src/Module/Item/Pin.php:56
+#: src/Module/Item/Star.php:42 src/Module/Update/Display.php:37
+msgid "Access denied."
+msgstr "Zugriff verweigert."
+
+#: src/Module/Contact/Follow.php:102 src/Module/Contact/Unfollow.php:125
+#: src/Module/Profile/RemoteFollow.php:133
+msgid "Submit Request"
+msgstr "Anfrage abschicken"
+
+#: src/Module/Contact/Follow.php:113
+msgid "You already added this contact."
+msgstr "Du hast den Kontakt bereits hinzugefügt."
+
+#: src/Module/Contact/Follow.php:128
+msgid "The network type couldn't be detected. Contact can't be added."
+msgstr "Der Netzwerktyp wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden."
+
+#: src/Module/Contact/Follow.php:136
+msgid "Diaspora support isn't enabled. Contact can't be added."
+msgstr "Diaspora-Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."
+
+#: src/Module/Contact/Follow.php:141
+msgid "OStatus support is disabled. Contact can't be added."
+msgstr "OStatus-Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."
+
+#: src/Module/Contact/Follow.php:166 src/Module/Profile/RemoteFollow.php:132
+msgid "Please answer the following:"
+msgstr "Bitte beantworte folgendes:"
+
+#: src/Module/Contact/Follow.php:167 src/Module/Contact/Unfollow.php:123
+msgid "Your Identity Address:"
+msgstr "Adresse Deines Profils:"
+
+#: src/Module/Contact/Follow.php:168 src/Module/Contact/Profile.php:366
+#: src/Module/Contact/Unfollow.php:129
+#: src/Module/Moderation/Blocklist/Contact.php:133
+#: src/Module/Notifications/Introductions.php:129
+#: src/Module/Notifications/Introductions.php:198
+msgid "Profile URL"
+msgstr "Profil URL"
+
+#: src/Module/Contact/Follow.php:169 src/Module/Contact/Profile.php:378
+#: src/Module/Notifications/Introductions.php:191
+#: src/Module/Profile/Profile.php:206
+msgid "Tags:"
+msgstr "Tags:"
+
+#: src/Module/Contact/Follow.php:180
+#, php-format
+msgid "%s knows you"
+msgstr "%skennt dich"
+
+#: src/Module/Contact/Follow.php:181
+msgid "Add a personal note:"
+msgstr "Eine persönliche Notiz beifügen:"
+
+#: src/Module/Contact/Follow.php:219
+msgid "The contact could not be added."
+msgstr "Der Kontakt konnte nicht hinzugefügt werden."
+
+#: src/Module/Contact/MatchInterests.php:94
+#: src/Module/Profile/Attachment/Upload.php:80
+#: src/Module/Profile/Attachment/Upload.php:102
+#: src/Module/Profile/Photos/Upload.php:113
+#: src/Module/Profile/Photos/Upload.php:162
+msgid "Invalid request."
+msgstr "Ungültige Anfrage"
+
+#: src/Module/Contact/MatchInterests.php:101
+msgid "No keywords to match. Please add keywords to your profile."
+msgstr "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu deinem Profil hinzu."
+
+#: src/Module/Contact/MatchInterests.php:144
+msgid "Profile Match"
+msgstr "Profilübereinstimmungen"
+
 #: src/Module/Contact/Profile.php:128
 msgid "Failed to update contact record."
 msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen."
@@ -7089,7 +5989,7 @@ msgstr "(Aktualisierung war nicht erfolgreich)"
 msgid "(Update was successful)"
 msgstr "(Aktualisierung war erfolgreich)"
 
-#: src/Module/Contact/Profile.php:255 src/Module/Contact/Profile.php:421
+#: src/Module/Contact/Profile.php:255 src/Module/Contact/Profile.php:439
 msgid "Suggest friends"
 msgstr "Kontakte vorschlagen"
 
@@ -7183,7 +6083,7 @@ msgstr "Letzte Aktualisierung: "
 msgid "Update public posts"
 msgstr "Öffentliche Beiträge aktualisieren"
 
-#: src/Module/Contact/Profile.php:347 src/Module/Contact/Profile.php:431
+#: src/Module/Contact/Profile.php:347 src/Module/Contact/Profile.php:449
 msgid "Update now"
 msgstr "Jetzt aktualisieren"
 
@@ -7246,26 +6146,30 @@ msgid ""
 "entries from this contact."
 msgstr "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica, alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden (spiegeln)."
 
-#: src/Module/Contact/Profile.php:441
+#: src/Module/Contact/Profile.php:459
 msgid "Refetch contact data"
 msgstr "Kontaktdaten neu laden"
 
-#: src/Module/Contact/Profile.php:452
+#: src/Module/Contact/Profile.php:470
 msgid "Toggle Blocked status"
 msgstr "Geblockt-Status ein-/ausschalten"
 
-#: src/Module/Contact/Profile.php:460
+#: src/Module/Contact/Profile.php:478
 msgid "Toggle Ignored status"
 msgstr "Ignoriert-Status ein-/ausschalten"
 
-#: src/Module/Contact/Profile.php:467 src/Module/Contact/Revoke.php:106
+#: src/Module/Contact/Profile.php:485 src/Module/Contact/Revoke.php:106
 msgid "Revoke Follow"
 msgstr "Folgen widerrufen"
 
-#: src/Module/Contact/Profile.php:469
+#: src/Module/Contact/Profile.php:487
 msgid "Revoke the follow from this contact"
 msgstr "Widerruft das Folgen dieses Kontaktes"
 
+#: src/Module/Contact/Redir.php:134 src/Module/Contact/Redir.php:186
+msgid "Bad Request."
+msgstr "Ungültige Anfrage."
+
 #: src/Module/Contact/Revoke.php:63
 msgid "Unknown contact."
 msgstr "Unbekannter Kontakt."
@@ -7295,6 +6199,32 @@ msgstr "Willst du das Folgen dieses Kontakt wirklich widerrufen? Dies kann nicht
 msgid "Yes"
 msgstr "Ja"
 
+#: src/Module/Contact/Suggestions.php:62
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."
+
+#: src/Module/Contact/Unfollow.php:98 src/Module/Contact/Unfollow.php:167
+msgid "You aren't following this contact."
+msgstr "Du folgst diesem Kontakt."
+
+#: src/Module/Contact/Unfollow.php:103
+msgid "Unfollowing is currently not supported by your network."
+msgstr "Bei diesem Netzwerk wird das Entfolgen derzeit nicht unterstützt."
+
+#: src/Module/Contact/Unfollow.php:121
+msgid "Disconnect/Unfollow"
+msgstr "Verbindung lösen/Nicht mehr folgen"
+
+#: src/Module/Contact/Unfollow.php:175
+msgid "Contact was successfully unfollowed"
+msgstr "Kontakt wurde erfolgreich entfolgt."
+
+#: src/Module/Contact/Unfollow.php:178
+msgid "Unable to unfollow this contact, please contact your administrator"
+msgstr "Konnte dem Kontakt nicht entfolgen. Bitte kontaktiere deinen Administrator."
+
 #: src/Module/Conversation/Community.php:73
 msgid ""
 "This community stream shows all public posts received by this node. They may"
@@ -7342,53 +6272,53 @@ msgstr "Optionen für die Gemeinschaftsseite nicht verfügbar."
 msgid "Not available."
 msgstr "Nicht verfügbar."
 
-#: src/Module/Conversation/Network.php:172
+#: src/Module/Conversation/Network.php:174
 msgid "No such group"
 msgstr "Es gibt keine solche Gruppe"
 
-#: src/Module/Conversation/Network.php:176
+#: src/Module/Conversation/Network.php:178
 #, php-format
 msgid "Group: %s"
 msgstr "Gruppe: %s"
 
-#: src/Module/Conversation/Network.php:254
+#: src/Module/Conversation/Network.php:256
 msgid "Latest Activity"
 msgstr "Neu - Aktivität"
 
-#: src/Module/Conversation/Network.php:257
+#: src/Module/Conversation/Network.php:259
 msgid "Sort by latest activity"
 msgstr "Sortiere nach neueste Aktivität"
 
-#: src/Module/Conversation/Network.php:262
+#: src/Module/Conversation/Network.php:264
 msgid "Latest Posts"
 msgstr "Neu - Empfangen"
 
-#: src/Module/Conversation/Network.php:265
+#: src/Module/Conversation/Network.php:267
 msgid "Sort by post received date"
 msgstr "Nach Empfangsdatum der Beiträge sortiert"
 
-#: src/Module/Conversation/Network.php:270
+#: src/Module/Conversation/Network.php:272
 msgid "Latest Creation"
 msgstr "Neu - Erstellung"
 
-#: src/Module/Conversation/Network.php:273
+#: src/Module/Conversation/Network.php:275
 msgid "Sort by post creation date"
 msgstr "Sortiert nach dem Erstellungsdatum"
 
-#: src/Module/Conversation/Network.php:278
-#: src/Module/Settings/Profile/Index.php:227
+#: src/Module/Conversation/Network.php:280
+#: src/Module/Settings/Profile/Index.php:236
 msgid "Personal"
 msgstr "Persönlich"
 
-#: src/Module/Conversation/Network.php:281
+#: src/Module/Conversation/Network.php:283
 msgid "Posts that mention or involve you"
 msgstr "Beiträge, in denen es um dich geht"
 
-#: src/Module/Conversation/Network.php:286 src/Object/Post.php:350
+#: src/Module/Conversation/Network.php:288 src/Object/Post.php:350
 msgid "Starred"
 msgstr "Markierte"
 
-#: src/Module/Conversation/Network.php:289
+#: src/Module/Conversation/Network.php:291
 msgid "Favourite Posts"
 msgstr "Favorisierte Beiträge"
 
@@ -7419,6 +6349,14 @@ msgstr "Objekt Daten"
 msgid "Result Item"
 msgstr "Resultierender Eintrag"
 
+#: src/Module/Debug/ActivityPubConversion.php:129
+#: src/Module/Debug/Babel.php:293 src/Module/Moderation/Item/Source.php:87
+#: src/Module/Security/TwoFactor/Verify.php:98
+msgid "Error"
+msgid_plural "Errors"
+msgstr[0] "Fehler"
+msgstr[1] "Fehler"
+
 #: src/Module/Debug/ActivityPubConversion.php:138
 msgid "Source activity"
 msgstr "Quelle der Aktivität"
@@ -7600,7 +6538,7 @@ msgid "Twitter Source / Tweet URL (requires API key)"
 msgstr "Twitter Quelle / Tweet URL (benötigt API Schlüssel)"
 
 #: src/Module/Debug/Feed.php:52 src/Module/Filer/SaveTag.php:47
-#: src/Module/Settings/Profile/Index.php:141
+#: src/Module/Settings/Profile/Index.php:144
 msgid "You must be logged in to use this module"
 msgstr "Du musst eingeloggt sein, um dieses Modul benutzen zu können."
 
@@ -7746,6 +6684,12 @@ msgstr "Erfahre mehr über die <a href=\"%1$s/tos\">Nutzungsbedingungen</a> dies
 msgid "On this server the following remote servers are blocked."
 msgstr "Auf diesem Server werden die folgenden, entfernten Server blockiert."
 
+#: src/Module/Friendica.php:83
+#: src/Module/Moderation/Blocklist/Server/Index.php:84
+#: src/Module/Moderation/Blocklist/Server/Index.php:108
+msgid "Reason for the block"
+msgstr "Begründung für die Blockierung"
+
 #: src/Module/Friendica.php:85
 msgid "Download this list in CSV format"
 msgstr "Liste im CSV-Format herunterladen"
@@ -7893,6 +6837,10 @@ msgstr "Optionale Anforderung ist nicht erfüllt"
 msgid "OK"
 msgstr "Ok"
 
+#: src/Module/Install.php:214
+msgid "Next"
+msgstr "Nächste"
+
 #: src/Module/Install.php:215
 msgid "Check again"
 msgstr "Noch einmal testen"
@@ -8173,6 +7121,15 @@ msgid ""
 "<a href=\"/settings/display\">Theme Customization settings</a>."
 msgstr "Wenn du magst, kannst du unter den <a href=\"/settings/display\">Benutzerdefinierte Theme-Einstellungen</a> einstellen, dass diese Seite immer geöffnet wird, wenn du den \"Neuer Beitrag\" Button verwendest."
 
+#: src/Module/Item/Display.php:135 src/Module/Item/Display.php:252
+#: src/Module/Update/Display.php:55
+msgid "The requested item doesn't exist or has been deleted."
+msgstr "Der angeforderte Beitrag existiert nicht oder wurde gelöscht."
+
+#: src/Module/Item/Feed.php:86
+msgid "The feed for this item is unavailable."
+msgstr "Der Feed für diesen Beitrag ist nicht verfügbar."
+
 #: src/Module/Item/Follow.php:51
 msgid "Unable to follow this item."
 msgstr "Konnte dem Beitrag nicht folgen."
@@ -8192,6 +7149,714 @@ msgstr "Diese Friendica Instanz befindet sich derzeit im Wartungsmodus, entweder
 msgid "A Decentralized Social Network"
 msgstr "Ein dezentrales Soziales Netzwerk"
 
+#: src/Module/Moderation/BaseUsers.php:72
+msgid "List of all users"
+msgstr "Liste aller Benutzerkonten"
+
+#: src/Module/Moderation/BaseUsers.php:77
+msgid "Active"
+msgstr "Aktive"
+
+#: src/Module/Moderation/BaseUsers.php:80
+msgid "List of active accounts"
+msgstr "Liste der aktiven Benutzerkonten"
+
+#: src/Module/Moderation/BaseUsers.php:88
+msgid "List of pending registrations"
+msgstr "Liste der anstehenden Benutzerkonten"
+
+#: src/Module/Moderation/BaseUsers.php:96
+msgid "List of blocked users"
+msgstr "Liste der geblockten Benutzer"
+
+#: src/Module/Moderation/BaseUsers.php:101
+msgid "Deleted"
+msgstr "Gelöscht"
+
+#: src/Module/Moderation/BaseUsers.php:104
+msgid "List of pending user deletions"
+msgstr "Liste der auf Löschung wartenden Benutzer"
+
+#: src/Module/Moderation/BaseUsers.php:119 src/Module/Settings/Account.php:491
+msgid "Normal Account Page"
+msgstr "Normales Konto"
+
+#: src/Module/Moderation/BaseUsers.php:120 src/Module/Settings/Account.php:498
+msgid "Soapbox Page"
+msgstr "Marktschreier-Konto"
+
+#: src/Module/Moderation/BaseUsers.php:121 src/Module/Settings/Account.php:505
+msgid "Public Forum"
+msgstr "Öffentliches Forum"
+
+#: src/Module/Moderation/BaseUsers.php:122 src/Module/Settings/Account.php:512
+msgid "Automatic Friend Page"
+msgstr "Automatische Freunde-Seite"
+
+#: src/Module/Moderation/BaseUsers.php:123
+msgid "Private Forum"
+msgstr "Privates Forum"
+
+#: src/Module/Moderation/BaseUsers.php:126 src/Module/Settings/Account.php:463
+msgid "Personal Page"
+msgstr "Persönliche Seite"
+
+#: src/Module/Moderation/BaseUsers.php:127 src/Module/Settings/Account.php:470
+msgid "Organisation Page"
+msgstr "Organisationsseite"
+
+#: src/Module/Moderation/BaseUsers.php:128 src/Module/Settings/Account.php:477
+msgid "News Page"
+msgstr "Nachrichtenseite"
+
+#: src/Module/Moderation/BaseUsers.php:129 src/Module/Settings/Account.php:484
+msgid "Community Forum"
+msgstr "Gemeinschaftsforum"
+
+#: src/Module/Moderation/BaseUsers.php:130
+msgid "Relay"
+msgstr "Relais"
+
+#: src/Module/Moderation/Blocklist/Contact.php:70
+msgid "You can't block a local contact, please block the user instead"
+msgstr "Lokale Kontakte können nicht geblockt werden. Bitte blocke den Nutzer stattdessen."
+
+#: src/Module/Moderation/Blocklist/Contact.php:89
+#, php-format
+msgid "%s contact unblocked"
+msgid_plural "%s contacts unblocked"
+msgstr[0] "%sKontakt wieder freigegeben"
+msgstr[1] "%sKontakte wieder freigegeben"
+
+#: src/Module/Moderation/Blocklist/Contact.php:111
+msgid "Remote Contact Blocklist"
+msgstr "Blockliste entfernter Kontakte"
+
+#: src/Module/Moderation/Blocklist/Contact.php:112
+msgid ""
+"This page allows you to prevent any message from a remote contact to reach "
+"your node."
+msgstr "Auf dieser Seite kannst du Accounts von anderen Knoten blockieren und damit verhindern, dass ihre Beiträge von deinem Knoten angenommen werden."
+
+#: src/Module/Moderation/Blocklist/Contact.php:113
+msgid "Block Remote Contact"
+msgstr "Blockiere entfernten Kontakt"
+
+#: src/Module/Moderation/Blocklist/Contact.php:114
+#: src/Module/Moderation/Users/Active.php:135
+#: src/Module/Moderation/Users/Blocked.php:135
+#: src/Module/Moderation/Users/Index.php:149
+#: src/Module/Moderation/Users/Pending.php:98
+msgid "select all"
+msgstr "Alle auswählen"
+
+#: src/Module/Moderation/Blocklist/Contact.php:115
+msgid "select none"
+msgstr "Auswahl aufheben"
+
+#: src/Module/Moderation/Blocklist/Contact.php:118
+msgid "No remote contact is blocked from this node."
+msgstr "Derzeit werden keine Kontakte auf diesem Knoten blockiert."
+
+#: src/Module/Moderation/Blocklist/Contact.php:120
+msgid "Blocked Remote Contacts"
+msgstr "Blockierte Kontakte von anderen Knoten"
+
+#: src/Module/Moderation/Blocklist/Contact.php:121
+msgid "Block New Remote Contact"
+msgstr "Blockieren von weiteren Kontakten"
+
+#: src/Module/Moderation/Blocklist/Contact.php:122
+msgid "Photo"
+msgstr "Foto:"
+
+#: src/Module/Moderation/Blocklist/Contact.php:122
+msgid "Reason"
+msgstr "Grund"
+
+#: src/Module/Moderation/Blocklist/Contact.php:130
+#, php-format
+msgid "%s total blocked contact"
+msgid_plural "%s total blocked contacts"
+msgstr[0] "Insgesamt %s blockierter Kontakt"
+msgstr[1] "Insgesamt %s blockierte Kontakte"
+
+#: src/Module/Moderation/Blocklist/Contact.php:133
+msgid "URL of the remote contact to block."
+msgstr "Die URL des entfernten Kontakts, der blockiert werden soll."
+
+#: src/Module/Moderation/Blocklist/Contact.php:134
+msgid "Also purge contact"
+msgstr "Kontakt auch löschen"
+
+#: src/Module/Moderation/Blocklist/Contact.php:134
+msgid ""
+"Removes all content related to this contact from the node. Keeps the contact"
+" record. This action cannot be undone."
+msgstr "Entfernt alle Inhalte von diesem Knoten, die in Verbindung zu dem Kontakt stehen. Der Kontakt-Eintrag bleibt erhalten. Dieser Vorgang kann nicht rückgängig gemacht werden."
+
+#: src/Module/Moderation/Blocklist/Contact.php:135
+#: src/Module/Moderation/Blocklist/Server/Import.php:121
+msgid "Block Reason"
+msgstr "Sperrgrund"
+
+#: src/Module/Moderation/Blocklist/Server/Add.php:78
+msgid "Server domain pattern added to the blocklist."
+msgstr "Server Domain Muster zur Blockliste hinzugefügt"
+
+#: src/Module/Moderation/Blocklist/Server/Add.php:86
+#, php-format
+msgid "%s server scheduled to be purged."
+msgid_plural "%s servers scheduled to be purged."
+msgstr[0] "%s Server für die Löschung eingeplant."
+msgstr[1] "%s Server für die Löschung eingeplant."
+
+#: src/Module/Moderation/Blocklist/Server/Add.php:118
+#: src/Module/Moderation/Blocklist/Server/Import.php:114
+msgid "← Return to the list"
+msgstr "← zurück zur Liste"
+
+#: src/Module/Moderation/Blocklist/Server/Add.php:120
+msgid "Block A New Server Domain Pattern"
+msgstr "Neues Domainmuster blockieren"
+
+#: src/Module/Moderation/Blocklist/Server/Add.php:121
+#: src/Module/Moderation/Blocklist/Server/Index.php:96
+msgid ""
+"<p>The server domain pattern syntax is case-insensitive shell wildcard, comprising the following special characters:</p>\n"
+"<ul>\n"
+"\t<li><code>*</code>: Any number of characters</li>\n"
+"\t<li><code>?</code>: Any single character</li>\n"
+"</ul>"
+msgstr "<p>Die Syntax für das Domainmuster ist unabhängig von der Groß-/Kleinschreibung. Shell Willdcards bestehen aus den folgenden Zeichen:</p>\n<ul>\n<li><code>*</code>: Eine beliebige Anzahl von Zeichen</li>\n<li><code>?</code>: Ein einzelnes Zeichen</li>\n</ul>"
+
+#: src/Module/Moderation/Blocklist/Server/Add.php:126
+#: src/Module/Moderation/Blocklist/Server/Index.php:104
+msgid "Check pattern"
+msgstr "Muster überprüfen"
+
+#: src/Module/Moderation/Blocklist/Server/Add.php:127
+msgid "Matching known servers"
+msgstr "Passende bekannte Server"
+
+#: src/Module/Moderation/Blocklist/Server/Add.php:128
+msgid "Server Name"
+msgstr "Server Name"
+
+#: src/Module/Moderation/Blocklist/Server/Add.php:129
+msgid "Server Domain"
+msgstr "Server Domain"
+
+#: src/Module/Moderation/Blocklist/Server/Add.php:130
+msgid "Known Contacts"
+msgstr "Bekannte Kontakte"
+
+#: src/Module/Moderation/Blocklist/Server/Add.php:131
+#, php-format
+msgid "%d known server"
+msgid_plural "%d known servers"
+msgstr[0] "%d bekannter Server"
+msgstr[1] "%d bekannte Server"
+
+#: src/Module/Moderation/Blocklist/Server/Add.php:132
+msgid "Add pattern to the blocklist"
+msgstr "Muster zur Blockliste hinzufügen"
+
+#: src/Module/Moderation/Blocklist/Server/Add.php:134
+#: src/Module/Moderation/Blocklist/Server/Index.php:113
+msgid "Server Domain Pattern"
+msgstr "Server Domain Muster"
+
+#: src/Module/Moderation/Blocklist/Server/Add.php:134
+#: src/Module/Moderation/Blocklist/Server/Index.php:113
+msgid ""
+"The domain pattern of the new server to add to the blocklist. Do not include"
+" the protocol."
+msgstr "Das Muster zur Erkennung der Domain, das zur Blockliste hinzugefügt werden soll. Das Protokoll nicht mir angeben."
+
+#: src/Module/Moderation/Blocklist/Server/Add.php:135
+msgid "Purge server"
+msgstr "Server entfernen"
+
+#: src/Module/Moderation/Blocklist/Server/Add.php:135
+msgid ""
+"Also purges all the locally stored content authored by the known contacts "
+"registered on that server. Keeps the contacts and the server records. This "
+"action cannot be undone."
+msgid_plural ""
+"Also purges all the locally stored content authored by the known contacts "
+"registered on these servers. Keeps the contacts and the servers records. "
+"This action cannot be undone."
+msgstr[0] "Sollen die Inhalte der bekannten Kontakte die auf diesem Server registriert sind, auch lokal gelöscht werden. Die Kontakt- und Server-Einträge verbleiben in der Datenbank deines Servers. Diese Aktion kann nicht rückgängig gemacht werden."
+msgstr[1] "Sollen die Inhalte der bekannten Kontakte die auf diesen Servern registriert sind, auch lokal gelöscht werden. Die Kontakt- und Server-Einträge verbleiben in der Datenbank deines Servers. Diese Aktion kann nicht rückgängig gemacht werden."
+
+#: src/Module/Moderation/Blocklist/Server/Add.php:136
+msgid "Block reason"
+msgstr "Begründung der Blockierung"
+
+#: src/Module/Moderation/Blocklist/Server/Add.php:136
+msgid ""
+"The reason why you blocked this server domain pattern. This reason will be "
+"shown publicly in the server information page."
+msgstr "Warum werden Server die diesem Domainmuster entsprechen geblockt? Die Begründung wird öffentlich auf der Server-Informationsseite sichtbar sein."
+
+#: src/Module/Moderation/Blocklist/Server/Import.php:73
+#: src/Module/Moderation/Blocklist/Server/Import.php:82
+msgid "Error importing pattern file"
+msgstr "Fehler beim Import der Muster Datei"
+
+#: src/Module/Moderation/Blocklist/Server/Import.php:88
+msgid "Local blocklist replaced with the provided file."
+msgstr "Lokale Blockliste wurde durch die bereitgestellte Datei ersetzt."
+
+#: src/Module/Moderation/Blocklist/Server/Import.php:92
+#, php-format
+msgid "%d pattern was added to the local blocklist."
+msgid_plural "%d patterns were added to the local blocklist."
+msgstr[0] "%d Muster wurde zur lokalen Blockliste hinzugefügt."
+msgstr[1] "%d Muster wurden zur lokalen Blockliste hinzugefügt."
+
+#: src/Module/Moderation/Blocklist/Server/Import.php:94
+msgid "No pattern was added to the local blocklist."
+msgstr "Kein Muster wurde zur lokalen Blockliste hinzugefügt."
+
+#: src/Module/Moderation/Blocklist/Server/Import.php:116
+msgid "Import a Server Domain Pattern Blocklist"
+msgstr "Server Domain Muster Blockliste importieren"
+
+#: src/Module/Moderation/Blocklist/Server/Import.php:117
+msgid ""
+"<p>This file can be downloaded from the <code>/friendica</code> path of any "
+"Friendica server.</p>"
+msgstr "<p>Diese Datei kann vom <code>/friendica</code> Pfad auf jedem  Friendica Server heruntergeladen werden.</p>"
+
+#: src/Module/Moderation/Blocklist/Server/Import.php:118
+#: src/Module/Moderation/Blocklist/Server/Index.php:103
+msgid "Upload file"
+msgstr "Datei hochladen"
+
+#: src/Module/Moderation/Blocklist/Server/Import.php:119
+msgid "Patterns to import"
+msgstr "Zu importierende Muster"
+
+#: src/Module/Moderation/Blocklist/Server/Import.php:120
+msgid "Domain Pattern"
+msgstr "Domain Muster"
+
+#: src/Module/Moderation/Blocklist/Server/Import.php:122
+msgid "Import Mode"
+msgstr "Importmodus"
+
+#: src/Module/Moderation/Blocklist/Server/Import.php:123
+msgid "Import Patterns"
+msgstr "Muster importieren"
+
+#: src/Module/Moderation/Blocklist/Server/Import.php:124
+#, php-format
+msgid "%d total pattern"
+msgid_plural "%d total patterns"
+msgstr[0] "%dMuster gesamt"
+msgstr[1] "%dMuster gesamt"
+
+#: src/Module/Moderation/Blocklist/Server/Import.php:126
+#: src/Module/Moderation/Blocklist/Server/Index.php:112
+msgid "Server domain pattern blocklist CSV file"
+msgstr "Server Domain Muster Blockliste CSV-Datei"
+
+#: src/Module/Moderation/Blocklist/Server/Import.php:127
+msgid "Append"
+msgstr "Anhängen"
+
+#: src/Module/Moderation/Blocklist/Server/Import.php:127
+msgid ""
+"Imports patterns from the file that weren't already existing in the current "
+"blocklist."
+msgstr "Importiert Muster aus der Datei, die nicht bereits in der aktuellen Blockliste vorhanden waren."
+
+#: src/Module/Moderation/Blocklist/Server/Import.php:128
+msgid "Replace"
+msgstr "Ersetzen"
+
+#: src/Module/Moderation/Blocklist/Server/Import.php:128
+msgid "Replaces the current blocklist by the imported patterns."
+msgstr "Ersetzt die aktuelle Blockliste durch die importierten Muster."
+
+#: src/Module/Moderation/Blocklist/Server/Index.php:83
+#: src/Module/Moderation/Blocklist/Server/Index.php:107
+msgid "Blocked server domain pattern"
+msgstr "Blockierte Server Domain Muster"
+
+#: src/Module/Moderation/Blocklist/Server/Index.php:85
+msgid "Delete server domain pattern"
+msgstr "Server Domain Muster löschen"
+
+#: src/Module/Moderation/Blocklist/Server/Index.php:85
+msgid "Check to delete this entry from the blocklist"
+msgstr "Markieren, um diesen Eintrag von der Blocklist zu entfernen"
+
+#: src/Module/Moderation/Blocklist/Server/Index.php:93
+msgid "Server Domain Pattern Blocklist"
+msgstr "Server Domain Muster Blockliste"
+
+#: src/Module/Moderation/Blocklist/Server/Index.php:94
+msgid ""
+"This page can be used to define a blocklist of server domain patterns from "
+"the federated network that are not allowed to interact with your node. For "
+"each domain pattern you should also provide the reason why you block it."
+msgstr "Auf dieser Seite kannst du Muster definieren mit denen Server Domains aus dem föderierten Netzwerk daran gehindert werden mit deiner Instanz zu interagieren. Es ist ratsam für jedes Muster anzugeben, warum du es zur Blockliste hinzugefügt hast."
+
+#: src/Module/Moderation/Blocklist/Server/Index.php:95
+msgid ""
+"The list of blocked server domain patterns will be made publically available"
+" on the <a href=\"/friendica\">/friendica</a> page so that your users and "
+"people investigating communication problems can find the reason easily."
+msgstr "Die Liste der blockierten Domain Muster wird auf der Seite <a href=\"/friendica\">/friendica</a> öffentlich einsehbar gemacht, damit deine Nutzer und Personen, die Kommunikationsprobleme erkunden, die Ursachen einfach finden können."
+
+#: src/Module/Moderation/Blocklist/Server/Index.php:101
+msgid "Import server domain pattern blocklist"
+msgstr "Server Domain Muster Blockliste importieren"
+
+#: src/Module/Moderation/Blocklist/Server/Index.php:102
+msgid "Add new entry to the blocklist"
+msgstr "Neuen Eintrag in die Blockliste"
+
+#: src/Module/Moderation/Blocklist/Server/Index.php:105
+msgid "Save changes to the blocklist"
+msgstr "Änderungen der Blockliste speichern"
+
+#: src/Module/Moderation/Blocklist/Server/Index.php:106
+msgid "Current Entries in the Blocklist"
+msgstr "Aktuelle Einträge der Blockliste"
+
+#: src/Module/Moderation/Blocklist/Server/Index.php:109
+msgid "Delete entry from the blocklist"
+msgstr "Eintrag von der Blockliste entfernen"
+
+#: src/Module/Moderation/Blocklist/Server/Index.php:110
+msgid "Delete entry from the blocklist?"
+msgstr "Eintrag von der Blockliste entfernen?"
+
+#: src/Module/Moderation/Item/Delete.php:50
+msgid "Item marked for deletion."
+msgstr "Eintrag wurden zur Löschung markiert"
+
+#: src/Module/Moderation/Item/Delete.php:63
+msgid "Delete this Item"
+msgstr "Diesen Eintrag löschen"
+
+#: src/Module/Moderation/Item/Delete.php:64
+msgid ""
+"On this page you can delete an item from your node. If the item is a top "
+"level posting, the entire thread will be deleted."
+msgstr "Auf dieser Seite kannst du Einträge von deinem Knoten löschen. Wenn der Eintrag der Anfang einer Diskussion ist, wird der gesamte Diskussionsverlauf gelöscht."
+
+#: src/Module/Moderation/Item/Delete.php:65
+msgid ""
+"You need to know the GUID of the item. You can find it e.g. by looking at "
+"the display URL. The last part of http://example.com/display/123456 is the "
+"GUID, here 123456."
+msgstr "Zur Löschung musst du die GUID des Eintrags kennen. Diese findest du z.B. durch die /display URL des Eintrags. Der letzte Teil der URL ist die GUID. Lautet die URL beispielsweise http://example.com/display/123456, ist die GUID 123456."
+
+#: src/Module/Moderation/Item/Delete.php:67
+msgid "GUID"
+msgstr "GUID"
+
+#: src/Module/Moderation/Item/Delete.php:67
+msgid "The GUID of the item you want to delete."
+msgstr "Die GUID des zu löschenden Eintrags"
+
+#: src/Module/Moderation/Item/Source.php:77
+msgid "Item Id"
+msgstr "Item Id"
+
+#: src/Module/Moderation/Item/Source.php:78
+msgid "Item URI"
+msgstr "Item URI"
+
+#: src/Module/Moderation/Item/Source.php:80
+msgid "Terms"
+msgstr "Terms"
+
+#: src/Module/Moderation/Item/Source.php:81
+msgid "Tag"
+msgstr "Tag"
+
+#: src/Module/Moderation/Item/Source.php:82
+#: src/Module/Moderation/Users/Active.php:126
+#: src/Module/Moderation/Users/Blocked.php:126
+#: src/Module/Moderation/Users/Index.php:140
+msgid "Type"
+msgstr "Typ"
+
+#: src/Module/Moderation/Item/Source.php:83
+msgid "Term"
+msgstr "Term"
+
+#: src/Module/Moderation/Item/Source.php:84
+msgid "URL"
+msgstr "URL"
+
+#: src/Module/Moderation/Item/Source.php:85
+msgid "Mention"
+msgstr "Mention"
+
+#: src/Module/Moderation/Item/Source.php:86
+msgid "Implicit Mention"
+msgstr "Implicit Mention"
+
+#: src/Module/Moderation/Item/Source.php:88
+msgid "Item not found"
+msgstr "Beitrag nicht gefunden"
+
+#: src/Module/Moderation/Item/Source.php:89
+msgid "No source recorded"
+msgstr "Keine Quelle aufgezeichnet"
+
+#: src/Module/Moderation/Item/Source.php:90
+msgid ""
+"Please make sure the <code>debug.store_source</code> config key is set in "
+"<code>config/local.config.php</code> for future items to have sources."
+msgstr "Bitte stelle sicher, dass der Config-Schlüssel <code>debug.store_source</code>  in der <code>config/local.config.php</code> gesetzt ist um in Zukunft Quellen zu haben."
+
+#: src/Module/Moderation/Item/Source.php:92
+msgid "Item Guid"
+msgstr "Beitrags-Guid"
+
+#: src/Module/Moderation/Summary.php:53
+msgid "Normal Account"
+msgstr "Normales Konto"
+
+#: src/Module/Moderation/Summary.php:54
+msgid "Automatic Follower Account"
+msgstr "Automatisch folgendes Konto (Marktschreier)"
+
+#: src/Module/Moderation/Summary.php:55
+msgid "Public Forum Account"
+msgstr "Öffentliches Forum-Konto"
+
+#: src/Module/Moderation/Summary.php:56
+msgid "Automatic Friend Account"
+msgstr "Automatische Freunde-Seite"
+
+#: src/Module/Moderation/Summary.php:57
+msgid "Blog Account"
+msgstr "Blog-Konto"
+
+#: src/Module/Moderation/Summary.php:58
+msgid "Private Forum Account"
+msgstr "Privates Forum-Konto"
+
+#: src/Module/Moderation/Summary.php:78
+msgid "Registered users"
+msgstr "Registrierte Personen"
+
+#: src/Module/Moderation/Summary.php:80
+msgid "Pending registrations"
+msgstr "Anstehende Anmeldungen"
+
+#: src/Module/Moderation/Users/Active.php:43
+#: src/Module/Moderation/Users/Index.php:43
+#, php-format
+msgid "%s user blocked"
+msgid_plural "%s users blocked"
+msgstr[0] "%s Nutzer blockiert"
+msgstr[1] "%s Nutzer blockiert"
+
+#: src/Module/Moderation/Users/Active.php:51
+#: src/Module/Moderation/Users/Active.php:85
+#: src/Module/Moderation/Users/Blocked.php:51
+#: src/Module/Moderation/Users/Blocked.php:85
+#: src/Module/Moderation/Users/Index.php:58
+#: src/Module/Moderation/Users/Index.php:92
+msgid "You can't remove yourself"
+msgstr "Du kannst dich nicht selbst löschen!"
+
+#: src/Module/Moderation/Users/Active.php:55
+#: src/Module/Moderation/Users/Blocked.php:55
+#: src/Module/Moderation/Users/Index.php:62
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] "%s Nutzer gelöscht"
+msgstr[1] "%s Nutzer gelöscht"
+
+#: src/Module/Moderation/Users/Active.php:83
+#: src/Module/Moderation/Users/Blocked.php:83
+#: src/Module/Moderation/Users/Index.php:90
+#, php-format
+msgid "User \"%s\" deleted"
+msgstr "Nutzer \"%s\" gelöscht"
+
+#: src/Module/Moderation/Users/Active.php:93
+#: src/Module/Moderation/Users/Index.php:100
+#, php-format
+msgid "User \"%s\" blocked"
+msgstr "Nutzer \"%s\" blockiert"
+
+#: src/Module/Moderation/Users/Active.php:126
+#: src/Module/Moderation/Users/Blocked.php:126
+#: src/Module/Moderation/Users/Deleted.php:83
+#: src/Module/Moderation/Users/Index.php:140
+#: src/Module/Moderation/Users/Index.php:160
+msgid "Register date"
+msgstr "Anmeldedatum"
+
+#: src/Module/Moderation/Users/Active.php:126
+#: src/Module/Moderation/Users/Blocked.php:126
+#: src/Module/Moderation/Users/Deleted.php:83
+#: src/Module/Moderation/Users/Index.php:140
+#: src/Module/Moderation/Users/Index.php:160
+msgid "Last login"
+msgstr "Letzte Anmeldung"
+
+#: src/Module/Moderation/Users/Active.php:126
+#: src/Module/Moderation/Users/Blocked.php:126
+#: src/Module/Moderation/Users/Deleted.php:83
+#: src/Module/Moderation/Users/Index.php:140
+#: src/Module/Moderation/Users/Index.php:160
+msgid "Last public item"
+msgstr "Letzter öffentliche Beitrag"
+
+#: src/Module/Moderation/Users/Active.php:134
+msgid "Active Accounts"
+msgstr "Aktive Benutzerkonten"
+
+#: src/Module/Moderation/Users/Active.php:138
+#: src/Module/Moderation/Users/Blocked.php:137
+#: src/Module/Moderation/Users/Index.php:153
+msgid "User blocked"
+msgstr "Nutzer blockiert."
+
+#: src/Module/Moderation/Users/Active.php:139
+#: src/Module/Moderation/Users/Blocked.php:139
+#: src/Module/Moderation/Users/Index.php:155
+msgid "Site admin"
+msgstr "Seitenadministrator"
+
+#: src/Module/Moderation/Users/Active.php:140
+#: src/Module/Moderation/Users/Blocked.php:140
+#: src/Module/Moderation/Users/Index.php:156
+msgid "Account expired"
+msgstr "Account ist abgelaufen"
+
+#: src/Module/Moderation/Users/Active.php:141
+#: src/Module/Moderation/Users/Index.php:159
+msgid "Create a new user"
+msgstr "Neues Benutzerkonto anlegen"
+
+#: src/Module/Moderation/Users/Active.php:147
+#: src/Module/Moderation/Users/Blocked.php:146
+#: src/Module/Moderation/Users/Index.php:165
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist du sicher?"
+
+#: src/Module/Moderation/Users/Active.php:148
+#: src/Module/Moderation/Users/Blocked.php:147
+#: src/Module/Moderation/Users/Index.php:166
+msgid ""
+"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
+"site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist du sicher?"
+
+#: src/Module/Moderation/Users/Blocked.php:43
+#: src/Module/Moderation/Users/Index.php:50
+#, php-format
+msgid "%s user unblocked"
+msgid_plural "%s users unblocked"
+msgstr[0] "%s Nutzer freigeschaltet"
+msgstr[1] "%s Nutzer freigeschaltet"
+
+#: src/Module/Moderation/Users/Blocked.php:92
+#: src/Module/Moderation/Users/Index.php:106
+#, php-format
+msgid "User \"%s\" unblocked"
+msgstr "Nutzer \"%s\" frei geschaltet"
+
+#: src/Module/Moderation/Users/Blocked.php:134
+msgid "Blocked Users"
+msgstr "Blockierte Benutzer"
+
+#: src/Module/Moderation/Users/Create.php:62
+msgid "New User"
+msgstr "Neuer Nutzer"
+
+#: src/Module/Moderation/Users/Create.php:63
+msgid "Add User"
+msgstr "Nutzer hinzufügen"
+
+#: src/Module/Moderation/Users/Create.php:71
+msgid "Name of the new user."
+msgstr "Name des neuen Nutzers"
+
+#: src/Module/Moderation/Users/Create.php:72
+msgid "Nickname"
+msgstr "Spitzname"
+
+#: src/Module/Moderation/Users/Create.php:72
+msgid "Nickname of the new user."
+msgstr "Spitznamen für den neuen Nutzer"
+
+#: src/Module/Moderation/Users/Create.php:73
+msgid "Email address of the new user."
+msgstr "Email Adresse des neuen Nutzers"
+
+#: src/Module/Moderation/Users/Deleted.php:81
+msgid "Users awaiting permanent deletion"
+msgstr "Nutzer wartet auf permanente Löschung"
+
+#: src/Module/Moderation/Users/Deleted.php:83
+#: src/Module/Moderation/Users/Index.php:160
+msgid "Permanent deletion"
+msgstr "Permanent löschen"
+
+#: src/Module/Moderation/Users/Index.php:150
+msgid "User waiting for permanent deletion"
+msgstr "Nutzer wartet auf permanente Löschung"
+
+#: src/Module/Moderation/Users/Pending.php:44
+#, php-format
+msgid "%s user approved"
+msgid_plural "%s users approved"
+msgstr[0] "%sNutzer zugelassen"
+msgstr[1] "%sNutzer zugelassen"
+
+#: src/Module/Moderation/Users/Pending.php:51
+#, php-format
+msgid "%s registration revoked"
+msgid_plural "%s registrations revoked"
+msgstr[0] "%sRegistration zurückgezogen"
+msgstr[1] "%sRegistrierungen zurückgezogen"
+
+#: src/Module/Moderation/Users/Pending.php:76
+msgid "Account approved."
+msgstr "Konto freigegeben."
+
+#: src/Module/Moderation/Users/Pending.php:82
+msgid "Registration revoked"
+msgstr "Registrierung zurückgezogen"
+
+#: src/Module/Moderation/Users/Pending.php:97
+msgid "User registrations awaiting review"
+msgstr "Neuanmeldungen, die auf Deine Bestätigung warten"
+
+#: src/Module/Moderation/Users/Pending.php:99
+msgid "Request date"
+msgstr "Anfragedatum"
+
+#: src/Module/Moderation/Users/Pending.php:100
+msgid "No registrations."
+msgstr "Keine Neuanmeldungen."
+
+#: src/Module/Moderation/Users/Pending.php:101
+msgid "Note from the user"
+msgstr "Hinweis vom Nutzer"
+
+#: src/Module/Moderation/Users/Pending.php:103
+msgid "Deny"
+msgstr "Verwehren"
+
 #: src/Module/Notifications/Introductions.php:99
 msgid "Show Ignored Requests"
 msgstr "Zeige ignorierte Anfragen"
@@ -8279,11 +7944,11 @@ msgstr "Pinnwandbenachrichtigungen"
 msgid "Show unread"
 msgstr "Ungelesene anzeigen"
 
-#: src/Module/Notifications/Ping.php:224
+#: src/Module/Notifications/Ping.php:240
 msgid "{0} requested registration"
 msgstr "{0} möchte sich registrieren"
 
-#: src/Module/Notifications/Ping.php:235
+#: src/Module/Notifications/Ping.php:249
 #, php-format
 msgid "{0} and %d others requested registration"
 msgstr "{0} und %d weitere möchten sich registrieren"
@@ -8317,6 +7982,66 @@ msgstr "Bitte kopiere den folgenden Authentifizierungscode in deine App und schl
 msgid "Unsupported or missing grant type"
 msgstr "Der Grant-Typ fehlt oder wird nicht unterstützt"
 
+#: src/Module/OStatus/Repair.php:83
+msgid "Resubscribing to OStatus contacts"
+msgstr "Erneuern der OStatus-Abonements"
+
+#: src/Module/OStatus/Repair.php:84 src/Module/OStatus/Subscribe.php:158
+msgid "Keep this window open until done."
+msgstr "Lasse dieses Fenster offen, bis der Vorgang abgeschlossen ist."
+
+#: src/Module/OStatus/Repair.php:85
+msgid "✔ Done"
+msgstr "✔ Erledigt"
+
+#: src/Module/OStatus/Repair.php:86
+msgid "No OStatus contacts to resubscribe to."
+msgstr "Keine OStatus Kontakte zum Neufolgen vorhanden."
+
+#: src/Module/OStatus/Subscribe.php:70
+msgid "Subscribing to contacts"
+msgstr "Kontakten folgen"
+
+#: src/Module/OStatus/Subscribe.php:79
+msgid "No contact provided."
+msgstr "Keine Kontakte gefunden."
+
+#: src/Module/OStatus/Subscribe.php:85
+msgid "Couldn't fetch information for contact."
+msgstr "Konnte die Kontaktinformationen nicht einholen."
+
+#: src/Module/OStatus/Subscribe.php:96
+msgid "Couldn't fetch friends for contact."
+msgstr "Konnte die Kontaktliste des Kontakts nicht abfragen."
+
+#: src/Module/OStatus/Subscribe.php:102 src/Module/OStatus/Subscribe.php:113
+msgid "Couldn't fetch following contacts."
+msgstr "Konnte Liste der gefolgten Kontakte nicht einholen."
+
+#: src/Module/OStatus/Subscribe.php:108
+msgid "Couldn't fetch remote profile."
+msgstr "Konnte das entfernte Profil nicht laden."
+
+#: src/Module/OStatus/Subscribe.php:118
+msgid "Unsupported network"
+msgstr "Netzwerk wird nicht unterstützt"
+
+#: src/Module/OStatus/Subscribe.php:134
+msgid "Done"
+msgstr "Erledigt"
+
+#: src/Module/OStatus/Subscribe.php:148
+msgid "success"
+msgstr "Erfolg"
+
+#: src/Module/OStatus/Subscribe.php:150
+msgid "failed"
+msgstr "Fehlgeschlagen"
+
+#: src/Module/OStatus/Subscribe.php:153
+msgid "ignored"
+msgstr "Ignoriert"
+
 #: src/Module/PermissionTooltip.php:49
 #, php-format
 msgid "Wrong type \"%s\", expected one of: %s"
@@ -8387,6 +8112,64 @@ msgstr "Ungültige externe Ressource mit der URL %s"
 msgid "Invalid photo with id %s."
 msgstr "Fehlerhaftes Foto mit der ID %s."
 
+#: src/Module/Post/Edit.php:82 src/Module/Post/Edit.php:94
+msgid "Post not found."
+msgstr "Beitrag nicht gefunden."
+
+#: src/Module/Post/Edit.php:101
+msgid "Edit post"
+msgstr "Beitrag bearbeiten"
+
+#: src/Module/Post/Edit.php:133
+msgid "web link"
+msgstr "Weblink"
+
+#: src/Module/Post/Edit.php:134
+msgid "Insert video link"
+msgstr "Video-Adresse einfügen"
+
+#: src/Module/Post/Edit.php:135
+msgid "video link"
+msgstr "Video-Link"
+
+#: src/Module/Post/Edit.php:136
+msgid "Insert audio link"
+msgstr "Audio-Adresse einfügen"
+
+#: src/Module/Post/Edit.php:137
+msgid "audio link"
+msgstr "Audio-Link"
+
+#: src/Module/Post/Tag/Remove.php:106
+msgid "Remove Item Tag"
+msgstr "Gegenstands-Tag entfernen"
+
+#: src/Module/Post/Tag/Remove.php:107
+msgid "Select a tag to remove: "
+msgstr "Wähle ein Tag zum Entfernen aus: "
+
+#: src/Module/Post/Tag/Remove.php:108 src/Module/Settings/Delegation.php:178
+#: src/Module/Settings/TwoFactor/Trusted.php:143
+msgid "Remove"
+msgstr "Entfernen"
+
+#: src/Module/Profile/Attachment/Upload.php:117
+msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
+msgstr "Entschuldige, die Datei scheint größer zu sein, als es die PHP-Konfiguration erlaubt."
+
+#: src/Module/Profile/Attachment/Upload.php:117
+msgid "Or - did you try to upload an empty file?"
+msgstr "Oder - hast du versucht, eine leere Datei hochzuladen?"
+
+#: src/Module/Profile/Attachment/Upload.php:124
+#, php-format
+msgid "File exceeds size limit of %s"
+msgstr "Die Datei ist größer als das erlaubte Limit von %s"
+
+#: src/Module/Profile/Attachment/Upload.php:134
+msgid "File upload failed."
+msgstr "Hochladen der Datei fehlgeschlagen."
+
 #: src/Module/Profile/Contacts.php:119
 msgid "No contacts."
 msgstr "Keine Kontakte."
@@ -8402,7 +8185,7 @@ msgid ""
 "class=\"btn btn-sm pull-right\">Cancel</a>"
 msgstr "Du betrachtest dein Profil gerade als <b>%s</b> <a href=\"%s\" class=\"btn btn-sm pull-right\">Abbrechen</a>"
 
-#: src/Module/Profile/Profile.php:143 src/Module/Settings/Account.php:579
+#: src/Module/Profile/Profile.php:143 src/Module/Settings/Account.php:576
 msgid "Full Name:"
 msgstr "Kompletter Name:"
 
@@ -8423,12 +8206,12 @@ msgid "Birthday:"
 msgstr "Geburtstag:"
 
 #: src/Module/Profile/Profile.php:166
-#: src/Module/Settings/Profile/Index.php:245 src/Util/Temporal.php:168
+#: src/Module/Settings/Profile/Index.php:254 src/Util/Temporal.php:168
 msgid "Age: "
 msgstr "Alter: "
 
 #: src/Module/Profile/Profile.php:166
-#: src/Module/Settings/Profile/Index.php:245 src/Util/Temporal.php:168
+#: src/Module/Settings/Profile/Index.php:254 src/Util/Temporal.php:168
 #, php-format
 msgid "%d year old"
 msgid_plural "%d years old"
@@ -8466,6 +8249,47 @@ msgstr "Beiträge von %s"
 msgid "%s's comments"
 msgstr "Kommentare von %s"
 
+#: src/Module/Profile/RemoteFollow.php:82
+msgid "Profile unavailable."
+msgstr "Profil nicht verfügbar."
+
+#: src/Module/Profile/RemoteFollow.php:88
+msgid "Invalid locator"
+msgstr "Ungültiger Locator"
+
+#: src/Module/Profile/RemoteFollow.php:95
+msgid "The provided profile link doesn't seem to be valid"
+msgstr "Der angegebene Profil-Link scheint nicht gültig zu sein."
+
+#: src/Module/Profile/RemoteFollow.php:100
+msgid ""
+"Remote subscription can't be done for your network. Please subscribe "
+"directly on your system."
+msgstr "Entferntes Abon­nie­ren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems.   "
+
+#: src/Module/Profile/RemoteFollow.php:128
+msgid "Friend/Connection Request"
+msgstr "Kontaktanfrage"
+
+#: src/Module/Profile/RemoteFollow.php:129
+#, php-format
+msgid ""
+"Enter your Webfinger address (user@domain.tld) or profile URL here. If this "
+"isn't supported by your system, you have to subscribe to <strong>%s</strong>"
+" or <strong>%s</strong> directly on your system."
+msgstr "Gib entweder deine Webfinger- (user@domain.tld) oder die Profil-Adresse an. Wenn dies von deinem System nicht unterstützt wird, folge bitte <strong>%s</strong> oder <strong>%s</strong> direkt von deinem System. "
+
+#: src/Module/Profile/RemoteFollow.php:130
+#, php-format
+msgid ""
+"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>."
+msgstr "Solltest du das freie Soziale Netzwerk noch nicht benutzen, kannst du <a href=\"%s\">diesem Link folgen</a> um eine öffentliche Friendica Instanz zu finden um noch heute dem Netzwerk beizutreten."
+
+#: src/Module/Profile/RemoteFollow.php:131
+msgid "Your Webfinger address or profile URL:"
+msgstr "Deine Webfinger Adresse oder Profil-URL"
+
 #: src/Module/Profile/Schedule.php:84
 msgid "Scheduled"
 msgstr "Zeitplan"
@@ -8478,10 +8302,52 @@ msgstr "Inhalt"
 msgid "Remove post"
 msgstr "Beitrag entfernen"
 
+#: src/Module/Profile/UnkMail.php:78
+msgid "Empty message body."
+msgstr "Leerer Nachrichtenkörper."
+
+#: src/Module/Profile/UnkMail.php:103
+msgid "Unable to check your home location."
+msgstr "Konnte Deinen Heimatort nicht bestimmen."
+
+#: src/Module/Profile/UnkMail.php:127
+msgid "Recipient not found."
+msgstr "Empfänger nicht gefunden."
+
+#: src/Module/Profile/UnkMail.php:138
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr "Maximale Anzahl der täglichen Pinnwand-Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen."
+
+#: src/Module/Profile/UnkMail.php:153
+#, php-format
+msgid ""
+"If you wish for %s to respond, please check that the privacy settings on "
+"your site allow private mail from unknown senders."
+msgstr "Wenn du möchtest, dass %s dir antworten kann, überprüfe deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern."
+
+#: src/Module/Profile/UnkMail.php:161
+msgid "To"
+msgstr "An"
+
+#: src/Module/Profile/UnkMail.php:162
+msgid "Subject"
+msgstr "Betreff"
+
+#: src/Module/Profile/UnkMail.php:163
+msgid "Your message"
+msgstr "Deine Nachricht"
+
 #: src/Module/Register.php:84
 msgid "Only parent users can create additional accounts."
 msgstr "Zusätzliche Nutzerkonten können nur von Verwaltern angelegt werden."
 
+#: src/Module/Register.php:99 src/Module/User/Import.php:111
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal."
+
 #: src/Module/Register.php:116
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
@@ -8533,7 +8399,7 @@ msgid "Please repeat your e-mail address:"
 msgstr "Bitte wiederhole deine E-Mail Adresse"
 
 #: src/Module/Register.php:162 src/Module/Security/PasswordTooLong.php:101
-#: src/Module/Settings/Account.php:570
+#: src/Module/Settings/Account.php:567
 msgid "New Password:"
 msgstr "Neues Passwort:"
 
@@ -8542,7 +8408,7 @@ msgid "Leave empty for an auto generated password."
 msgstr "Leer lassen, um das Passwort automatisch zu generieren."
 
 #: src/Module/Register.php:163 src/Module/Security/PasswordTooLong.php:102
-#: src/Module/Settings/Account.php:571
+#: src/Module/Settings/Account.php:568
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
@@ -8557,6 +8423,10 @@ msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstab
 msgid "Choose a nickname: "
 msgstr "Spitznamen wählen: "
 
+#: src/Module/Register.php:173 src/Module/User/Import.php:117
+msgid "Import"
+msgstr "Import"
+
 #: src/Module/Register.php:174
 msgid "Import your profile to this friendica instance"
 msgstr "Importiere dein Profil auf diese Friendica-Instanz"
@@ -8599,70 +8469,29 @@ msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet."
 
-#: src/Module/Register.php:339
+#: src/Module/Register.php:342
 #, php-format
 msgid ""
 "Failed to send email message. Here your accout details:<br> login: %s<br> "
 "password: %s<br><br>You can change your password after login."
 msgstr "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account-Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern."
 
-#: src/Module/Register.php:345
+#: src/Module/Register.php:348
 msgid "Registration successful."
 msgstr "Registrierung erfolgreich."
 
-#: src/Module/Register.php:350 src/Module/Register.php:357
+#: src/Module/Register.php:356 src/Module/Register.php:363
 msgid "Your registration can not be processed."
 msgstr "Deine Registrierung konnte nicht verarbeitet werden."
 
-#: src/Module/Register.php:356
+#: src/Module/Register.php:362
 msgid "You have to leave a request note for the admin."
 msgstr "Du musst eine Nachricht für den Administrator als Begründung deiner Anfrage hinterlegen."
 
-#: src/Module/Register.php:402
+#: src/Module/Register.php:387
 msgid "Your registration is pending approval by the site owner."
 msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."
 
-#: src/Module/RemoteFollow.php:72
-msgid "Profile unavailable."
-msgstr "Profil nicht verfügbar."
-
-#: src/Module/RemoteFollow.php:78
-msgid "Invalid locator"
-msgstr "Ungültiger Locator"
-
-#: src/Module/RemoteFollow.php:85
-msgid "The provided profile link doesn't seem to be valid"
-msgstr "Der angegebene Profil-Link scheint nicht gültig zu sein."
-
-#: src/Module/RemoteFollow.php:90
-msgid ""
-"Remote subscription can't be done for your network. Please subscribe "
-"directly on your system."
-msgstr "Entferntes Abon­nie­ren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems.   "
-
-#: src/Module/RemoteFollow.php:122
-msgid "Friend/Connection Request"
-msgstr "Kontaktanfrage"
-
-#: src/Module/RemoteFollow.php:123
-#, php-format
-msgid ""
-"Enter your Webfinger address (user@domain.tld) or profile URL here. If this "
-"isn't supported by your system, you have to subscribe to <strong>%s</strong>"
-" or <strong>%s</strong> directly on your system."
-msgstr "Gib entweder deine Webfinger- (user@domain.tld) oder die Profil-Adresse an. Wenn dies von deinem System nicht unterstützt wird, folge bitte <strong>%s</strong> oder <strong>%s</strong> direkt von deinem System. "
-
-#: src/Module/RemoteFollow.php:124
-#, php-format
-msgid ""
-"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>."
-msgstr "Solltest du das freie Soziale Netzwerk noch nicht benutzen, kannst du <a href=\"%s\">diesem Link folgen</a> um eine öffentliche Friendica Instanz zu finden um noch heute dem Netzwerk beizutreten."
-
-#: src/Module/RemoteFollow.php:125
-msgid "Your Webfinger address or profile URL:"
-msgstr "Deine Webfinger Adresse oder Profil-URL"
-
 #: src/Module/Search/Acl.php:55
 msgid "You must be logged in to use this module."
 msgstr "Du musst eingeloggt sein, um dieses Modul benutzen zu können."
@@ -8739,10 +8568,10 @@ msgid "privacy policy"
 msgstr "Datenschutzerklärung"
 
 #: src/Module/Security/Logout.php:84
-#: src/Module/Security/TwoFactor/SignOut.php:79
-#: src/Module/Security/TwoFactor/SignOut.php:87
-#: src/Module/Security/TwoFactor/SignOut.php:109
-#: src/Module/Security/TwoFactor/SignOut.php:116
+#: src/Module/Security/TwoFactor/SignOut.php:78
+#: src/Module/Security/TwoFactor/SignOut.php:86
+#: src/Module/Security/TwoFactor/SignOut.php:108
+#: src/Module/Security/TwoFactor/SignOut.php:115
 msgid "Logged out."
 msgstr "Abgemeldet."
 
@@ -8792,24 +8621,24 @@ msgid "Update Password"
 msgstr "Passwort aktualisieren"
 
 #: src/Module/Security/PasswordTooLong.php:100
-#: src/Module/Settings/Account.php:572
+#: src/Module/Settings/Account.php:569
 msgid "Current Password:"
 msgstr "Aktuelles Passwort:"
 
 #: src/Module/Security/PasswordTooLong.php:100
-#: src/Module/Settings/Account.php:572
+#: src/Module/Settings/Account.php:569
 msgid "Your current password to confirm the changes"
 msgstr "Dein aktuelles Passwort um die Änderungen zu bestätigen"
 
 #: src/Module/Security/PasswordTooLong.php:101
-#: src/Module/Settings/Account.php:555
+#: src/Module/Settings/Account.php:552
 msgid ""
 "Allowed characters are a-z, A-Z, 0-9 and special characters except white "
 "spaces, accentuated letters and colon (:)."
 msgstr "Erlaubte Zeichen sind a-z, A-Z, 0-9 und Sonderzeichen, abgesehen von Leerzeichen, Doppelpunkten (:) und akzentuierten Buchstaben."
 
 #: src/Module/Security/PasswordTooLong.php:101
-#: src/Module/Settings/Account.php:556
+#: src/Module/Settings/Account.php:553
 msgid "Password length is limited to 72 characters."
 msgstr "Die Länge des Passworts ist auf 72 Zeichen begrenzt."
 
@@ -8819,7 +8648,7 @@ msgid "Remaining recovery codes: %d"
 msgstr "Verbleibende Wiederherstellungscodes: %d"
 
 #: src/Module/Security/TwoFactor/Recovery.php:80
-#: src/Module/Security/TwoFactor/Verify.php:81
+#: src/Module/Security/TwoFactor/Verify.php:77
 #: src/Module/Settings/TwoFactor/Verify.php:94
 msgid "Invalid code, please retry."
 msgstr "Ungültiger Code, bitte erneut versuchen."
@@ -8847,21 +8676,21 @@ msgstr "Bitte gib einen Wiederherstellungscode ein"
 msgid "Submit recovery code and complete login"
 msgstr "Sende den Wiederherstellungscode und schließe die Anmeldung ab"
 
-#: src/Module/Security/TwoFactor/SignOut.php:123
+#: src/Module/Security/TwoFactor/SignOut.php:122
 msgid "Sign out of this browser?"
 msgstr "Von diesem Browser abmelden?"
 
-#: src/Module/Security/TwoFactor/SignOut.php:124
+#: src/Module/Security/TwoFactor/SignOut.php:123
 msgid ""
 "<p>If you trust this browser, you will not be asked for verification code "
 "the next time you sign in.</p>"
 msgstr "<p>Wenn du diesem Browser vertraust, wirst du bei zukünftigen Anmeldungen nicht nach dem Verifikationscode gefragt.</p>"
 
-#: src/Module/Security/TwoFactor/SignOut.php:125
+#: src/Module/Security/TwoFactor/SignOut.php:124
 msgid "Sign out"
 msgstr "Abmelden"
 
-#: src/Module/Security/TwoFactor/SignOut.php:127
+#: src/Module/Security/TwoFactor/SignOut.php:126
 msgid "Trust and sign out"
 msgstr "Vertrauen und Abmelden"
 
@@ -8891,25 +8720,25 @@ msgstr "Nicht vertrauen"
 msgid "Trust"
 msgstr "Vertrauen"
 
-#: src/Module/Security/TwoFactor/Verify.php:101
+#: src/Module/Security/TwoFactor/Verify.php:97
 msgid ""
 "<p>Open the two-factor authentication app on your device to get an "
 "authentication code and verify your identity.</p>"
 msgstr "<p>Öffne die Zwei-Faktor-Authentifizierungs-App auf deinem Gerät, um einen Authentifizierungscode abzurufen und deine Identität zu überprüfen.</p>"
 
-#: src/Module/Security/TwoFactor/Verify.php:104
+#: src/Module/Security/TwoFactor/Verify.php:100
 #, php-format
 msgid ""
 "If you do not have access to your authentication code you can use a <a "
 "href=\"%s\">two-factor recovery code</a>."
 msgstr "Wenn du keinen Zugriff auf deinen Authentifikationscode hast, kannst du einen <a href=\"%s\">Zwei-Faktor Wiederherstellungsschlüssel</a> verwenden."
 
-#: src/Module/Security/TwoFactor/Verify.php:105
+#: src/Module/Security/TwoFactor/Verify.php:101
 #: src/Module/Settings/TwoFactor/Verify.php:154
 msgid "Please enter a code from your authentication app"
 msgstr "Bitte gebe einen Code aus Ihrer Authentifizierungs-App ein"
 
-#: src/Module/Security/TwoFactor/Verify.php:106
+#: src/Module/Security/TwoFactor/Verify.php:102
 msgid "Verify code and complete login"
 msgstr "Code überprüfen und Anmeldung abschließen"
 
@@ -8929,103 +8758,103 @@ msgstr "Falsches Passwort"
 msgid "Invalid email."
 msgstr "Ungültige E-Mail-Adresse."
 
-#: src/Module/Settings/Account.php:119
+#: src/Module/Settings/Account.php:117
 msgid "Cannot change to that email."
 msgstr "Ändern der E-Mail nicht möglich. "
 
-#: src/Module/Settings/Account.php:149 src/Module/Settings/Account.php:201
-#: src/Module/Settings/Account.php:221 src/Module/Settings/Account.php:305
-#: src/Module/Settings/Account.php:354
+#: src/Module/Settings/Account.php:146 src/Module/Settings/Account.php:198
+#: src/Module/Settings/Account.php:218 src/Module/Settings/Account.php:302
+#: src/Module/Settings/Account.php:351
 msgid "Settings were not updated."
 msgstr "Einstellungen nicht aktualisiert"
 
-#: src/Module/Settings/Account.php:366
+#: src/Module/Settings/Account.php:363
 msgid "Contact CSV file upload error"
 msgstr "Fehler beim Hochladen der Kontakt CSV Datei"
 
-#: src/Module/Settings/Account.php:385
+#: src/Module/Settings/Account.php:382
 msgid "Importing Contacts done"
 msgstr "Kontakte wurden importiert."
 
-#: src/Module/Settings/Account.php:398
+#: src/Module/Settings/Account.php:395
 msgid "Relocate message has been send to your contacts"
 msgstr "Die Umzugsbenachrichtigung wurde an Deine Kontakte versendet."
 
-#: src/Module/Settings/Account.php:415
+#: src/Module/Settings/Account.php:412
 msgid "Unable to find your profile. Please contact your admin."
 msgstr "Konnte dein Profil nicht finden. Bitte kontaktiere den Admin."
 
-#: src/Module/Settings/Account.php:457
+#: src/Module/Settings/Account.php:454
 msgid "Personal Page Subtypes"
 msgstr "Unterarten der persönlichen Seite"
 
-#: src/Module/Settings/Account.php:458
+#: src/Module/Settings/Account.php:455
 msgid "Community Forum Subtypes"
 msgstr "Unterarten des Gemeinschaftsforums"
 
-#: src/Module/Settings/Account.php:468
+#: src/Module/Settings/Account.php:465
 msgid "Account for a personal profile."
 msgstr "Konto für ein persönliches Profil."
 
-#: src/Module/Settings/Account.php:475
+#: src/Module/Settings/Account.php:472
 msgid ""
 "Account for an organisation that automatically approves contact requests as "
 "\"Followers\"."
 msgstr "Konto für eine Organisation, das Kontaktanfragen automatisch als \"Follower\" annimmt."
 
-#: src/Module/Settings/Account.php:482
+#: src/Module/Settings/Account.php:479
 msgid ""
 "Account for a news reflector that automatically approves contact requests as"
 " \"Followers\"."
 msgstr "Konto für einen Feedspiegel, das Kontaktanfragen automatisch als \"Follower\" annimmt."
 
-#: src/Module/Settings/Account.php:489
+#: src/Module/Settings/Account.php:486
 msgid "Account for community discussions."
 msgstr "Konto für Diskussionsforen. "
 
-#: src/Module/Settings/Account.php:496
+#: src/Module/Settings/Account.php:493
 msgid ""
 "Account for a regular personal profile that requires manual approval of "
 "\"Friends\" and \"Followers\"."
 msgstr "Konto für ein normales, persönliches Profil. Kontaktanfragen müssen manuell als \"Friend\" oder \"Follower\" bestätigt werden."
 
-#: src/Module/Settings/Account.php:503
+#: src/Module/Settings/Account.php:500
 msgid ""
 "Account for a public profile that automatically approves contact requests as"
 " \"Followers\"."
 msgstr "Konto für ein öffentliches Profil, das Kontaktanfragen automatisch als \"Follower\" annimmt."
 
-#: src/Module/Settings/Account.php:510
+#: src/Module/Settings/Account.php:507
 msgid "Automatically approves all contact requests."
 msgstr "Bestätigt alle Kontaktanfragen automatisch."
 
-#: src/Module/Settings/Account.php:517
+#: src/Module/Settings/Account.php:514
 msgid ""
 "Account for a popular profile that automatically approves contact requests "
 "as \"Friends\"."
 msgstr "Konto für ein gefragtes Profil, das Kontaktanfragen automatisch als \"Friend\" annimmt."
 
-#: src/Module/Settings/Account.php:522
+#: src/Module/Settings/Account.php:519
 msgid "Private Forum [Experimental]"
 msgstr "Privates Forum [Versuchsstadium]"
 
-#: src/Module/Settings/Account.php:524
+#: src/Module/Settings/Account.php:521
 msgid "Requires manual approval of contact requests."
 msgstr "Kontaktanfragen müssen manuell bestätigt werden."
 
-#: src/Module/Settings/Account.php:533
+#: src/Module/Settings/Account.php:530
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: src/Module/Settings/Account.php:533
+#: src/Module/Settings/Account.php:530
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID."
 
-#: src/Module/Settings/Account.php:541
+#: src/Module/Settings/Account.php:538
 msgid "Publish your profile in your local site directory?"
 msgstr "Darf dein Profil im lokalen Verzeichnis dieses Servers veröffentlicht werden?"
 
-#: src/Module/Settings/Account.php:541
+#: src/Module/Settings/Account.php:538
 #, php-format
 msgid ""
 "Your profile will be published in this node's <a href=\"%s\">local "
@@ -9033,89 +8862,89 @@ msgid ""
 " system settings."
 msgstr "Dein Profil wird im <a href=\"%s\">lokalen Verzeichnis</a> dieses Knotens veröffentlicht. Je nach Systemeinstellungen kann es öffentlich auffindbar sein."
 
-#: src/Module/Settings/Account.php:547
+#: src/Module/Settings/Account.php:544
 #, php-format
 msgid ""
 "Your profile will also be published in the global friendica directories "
 "(e.g. <a href=\"%s\">%s</a>)."
 msgstr "Dein Profil wird auch in den globalen Friendica Verzeichnissen (z.B. <a href=\"%s\">%s</a>) veröffentlicht werden."
 
-#: src/Module/Settings/Account.php:560
+#: src/Module/Settings/Account.php:557
 msgid "Account Settings"
 msgstr "Kontoeinstellungen"
 
-#: src/Module/Settings/Account.php:561
+#: src/Module/Settings/Account.php:558
 #, php-format
 msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
 msgstr "Die Adresse deines Profils lautet <strong>'%s'</strong> oder '%s'."
 
-#: src/Module/Settings/Account.php:569
+#: src/Module/Settings/Account.php:566
 msgid "Password Settings"
 msgstr "Passwort-Einstellungen"
 
-#: src/Module/Settings/Account.php:571
+#: src/Module/Settings/Account.php:568
 msgid "Leave password fields blank unless changing"
 msgstr "Lass die Passwort-Felder leer, außer du willst das Passwort ändern"
 
-#: src/Module/Settings/Account.php:573
+#: src/Module/Settings/Account.php:570
 msgid "Password:"
 msgstr "Passwort:"
 
-#: src/Module/Settings/Account.php:573
+#: src/Module/Settings/Account.php:570
 msgid "Your current password to confirm the changes of the email address"
 msgstr "Dein aktuelles Passwort um die Änderungen deiner E-Mail Adresse zu bestätigen"
 
-#: src/Module/Settings/Account.php:576
+#: src/Module/Settings/Account.php:573
 msgid "Delete OpenID URL"
 msgstr "OpenID URL löschen"
 
-#: src/Module/Settings/Account.php:578
+#: src/Module/Settings/Account.php:575
 msgid "Basic Settings"
 msgstr "Grundeinstellungen"
 
-#: src/Module/Settings/Account.php:580
+#: src/Module/Settings/Account.php:577
 msgid "Email Address:"
 msgstr "E-Mail-Adresse:"
 
-#: src/Module/Settings/Account.php:581
+#: src/Module/Settings/Account.php:578
 msgid "Your Timezone:"
 msgstr "Deine Zeitzone:"
 
-#: src/Module/Settings/Account.php:582
+#: src/Module/Settings/Account.php:579
 msgid "Your Language:"
 msgstr "Deine Sprache:"
 
-#: src/Module/Settings/Account.php:582
+#: src/Module/Settings/Account.php:579
 msgid ""
 "Set the language we use to show you friendica interface and to send you "
 "emails"
 msgstr "Wähle die Sprache, in der wir dir die Friendica-Oberfläche präsentieren sollen und dir E-Mail schicken"
 
-#: src/Module/Settings/Account.php:583
+#: src/Module/Settings/Account.php:580
 msgid "Default Post Location:"
 msgstr "Standardstandort:"
 
-#: src/Module/Settings/Account.php:584
+#: src/Module/Settings/Account.php:581
 msgid "Use Browser Location:"
 msgstr "Standort des Browsers verwenden:"
 
-#: src/Module/Settings/Account.php:586
+#: src/Module/Settings/Account.php:583
 msgid "Security and Privacy Settings"
 msgstr "Sicherheits- und Privatsphäre-Einstellungen"
 
-#: src/Module/Settings/Account.php:588
+#: src/Module/Settings/Account.php:585
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximale Anzahl von Kontaktanfragen/Tag:"
 
-#: src/Module/Settings/Account.php:588 src/Module/Settings/Account.php:598
+#: src/Module/Settings/Account.php:585 src/Module/Settings/Account.php:595
 msgid "(to prevent spam abuse)"
 msgstr "(um SPAM zu vermeiden)"
 
-#: src/Module/Settings/Account.php:590
+#: src/Module/Settings/Account.php:587
 msgid "Allow your profile to be searchable globally?"
 msgstr "Darf dein Profil bei Suchanfragen gefunden werden?"
 
-#: src/Module/Settings/Account.php:590
+#: src/Module/Settings/Account.php:587
 msgid ""
 "Activate this setting if you want others to easily find and follow you. Your"
 " profile will be searchable on remote systems. This setting also determines "
@@ -9123,43 +8952,43 @@ msgid ""
 "indexed or not."
 msgstr "Aktiviere diese Einstellung, wenn du von anderen einfach gefunden und gefolgt werden möchtest. Dei Profil wird dann auf anderen Systemen leicht durchsuchbar. Außerdem regelt diese Einstellung ob Friendica Suchmaschinen mitteilen soll, ob dein Profil indiziert werden soll oder nicht."
 
-#: src/Module/Settings/Account.php:591
+#: src/Module/Settings/Account.php:588
 msgid "Hide your contact/friend list from viewers of your profile?"
 msgstr "Liste der Kontakte vor Betrachtern des Profil verbergen?"
 
-#: src/Module/Settings/Account.php:591
+#: src/Module/Settings/Account.php:588
 msgid ""
 "A list of your contacts is displayed on your profile page. Activate this "
 "option to disable the display of your contact list."
 msgstr "Auf deiner Profilseite wird eine Liste deiner Kontakte angezeigt. Aktiviere diese Option wenn du das nicht möchtest."
 
-#: src/Module/Settings/Account.php:592
+#: src/Module/Settings/Account.php:589
 msgid "Hide your profile details from anonymous viewers?"
 msgstr "Profil-Details vor unbekannten Betrachtern verbergen?"
 
-#: src/Module/Settings/Account.php:592
+#: src/Module/Settings/Account.php:589
 msgid ""
 "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."
 msgstr "Anonyme Besucher deines Profils werden ausschließlich dein Profilbild, deinen Namen sowie deinen Spitznamen sehen. Deine öffentlichen Beiträge und Kommentare werden weiterhin sichtbar sein."
 
-#: src/Module/Settings/Account.php:593
+#: src/Module/Settings/Account.php:590
 msgid "Make public posts unlisted"
 msgstr "Öffentliche Beiträge nicht listen"
 
-#: src/Module/Settings/Account.php:593
+#: src/Module/Settings/Account.php:590
 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 "Deine öffentlichen Beiträge werden nicht auf der Gemeinschaftsseite oder in den Suchergebnissen erscheinen, außerdem werden sie nicht an Relay-Server geschickt. Sie werden aber weiterhin in allen öffentlichen Feeds, auch auf entfernten Servern, erscheinen."
 
-#: src/Module/Settings/Account.php:594
+#: src/Module/Settings/Account.php:591
 msgid "Make all posted pictures accessible"
 msgstr "Alle geposteten Bilder zugreifbar machen"
 
-#: src/Module/Settings/Account.php:594
+#: src/Module/Settings/Account.php:591
 msgid ""
 "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 "
@@ -9167,236 +8996,420 @@ msgid ""
 "public on your photo albums though."
 msgstr "Diese Option macht jedes veröffentlichte Bild über den direkten Link zugänglich. Dies ist eine Problemumgehung für das Problem, dass die meisten anderen Netzwerke keine Berechtigungen für Bilder verarbeiten können. Nicht öffentliche Bilder sind in Ihren Fotoalben jedoch immer noch nicht für die Öffentlichkeit sichtbar."
 
-#: src/Module/Settings/Account.php:595
+#: src/Module/Settings/Account.php:592
 msgid "Allow friends to post to your profile page?"
 msgstr "Dürfen deine Kontakte auf deine Pinnwand schreiben?"
 
-#: src/Module/Settings/Account.php:595
+#: src/Module/Settings/Account.php:592
 msgid ""
 "Your contacts may write posts on your profile wall. These posts will be "
 "distributed to your contacts"
 msgstr "Deine Kontakte können Beiträge auf deiner Pinnwand hinterlassen. Diese werden an deine Kontakte verteilt."
 
-#: src/Module/Settings/Account.php:596
+#: src/Module/Settings/Account.php:593
 msgid "Allow friends to tag your posts?"
 msgstr "Dürfen deine Kontakte deine Beiträge mit Schlagwörtern versehen?"
 
-#: src/Module/Settings/Account.php:596
+#: src/Module/Settings/Account.php:593
 msgid "Your contacts can add additional tags to your posts."
 msgstr "Deine Kontakte dürfen deine Beiträge mit zusätzlichen Schlagworten versehen."
 
-#: src/Module/Settings/Account.php:597
+#: src/Module/Settings/Account.php:594
 msgid "Permit unknown people to send you private mail?"
 msgstr "Dürfen dir Unbekannte private Nachrichten schicken?"
 
-#: src/Module/Settings/Account.php:597
+#: src/Module/Settings/Account.php:594
 msgid ""
 "Friendica network users may send you private messages even if they are not "
 "in your contact list."
 msgstr "Nutzer des Friendica Netzwerks können dir private Nachrichten senden, selbst wenn sie nicht in deine Kontaktliste sind."
 
-#: src/Module/Settings/Account.php:598
+#: src/Module/Settings/Account.php:595
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:"
 
-#: src/Module/Settings/Account.php:600
+#: src/Module/Settings/Account.php:597
 msgid "Default Post Permissions"
 msgstr "Standard-Zugriffsrechte für Beiträge"
 
-#: src/Module/Settings/Account.php:604
+#: src/Module/Settings/Account.php:601
 msgid "Expiration settings"
 msgstr "Verfalls-Einstellungen"
 
-#: src/Module/Settings/Account.php:605
+#: src/Module/Settings/Account.php:602
 msgid "Automatically expire posts after this many days:"
 msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:"
 
-#: src/Module/Settings/Account.php:605
+#: src/Module/Settings/Account.php:602
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "Wenn leer, verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht."
 
-#: src/Module/Settings/Account.php:606
+#: src/Module/Settings/Account.php:603
 msgid "Expire posts"
 msgstr "Beiträge verfallen lassen"
 
-#: src/Module/Settings/Account.php:606
+#: src/Module/Settings/Account.php:603
 msgid "When activated, posts and comments will be expired."
 msgstr "Ist dies aktiviert, werden Beiträge und Kommentare verfallen."
 
-#: src/Module/Settings/Account.php:607
+#: src/Module/Settings/Account.php:604
 msgid "Expire personal notes"
 msgstr "Persönliche Notizen verfallen lassen"
 
-#: src/Module/Settings/Account.php:607
+#: src/Module/Settings/Account.php:604
 msgid ""
 "When activated, the personal notes on your profile page will be expired."
 msgstr "Ist dies aktiviert, werden persönliche Notizen auf deiner Pinnwand verfallen."
 
-#: src/Module/Settings/Account.php:608
+#: src/Module/Settings/Account.php:605
 msgid "Expire starred posts"
 msgstr "Markierte Beiträge verfallen lassen"
 
-#: src/Module/Settings/Account.php:608
+#: src/Module/Settings/Account.php:605
 msgid ""
 "Starring posts keeps them from being expired. That behaviour is overwritten "
 "by this setting."
 msgstr "Markierte Beiträge verfallen eigentlich nicht. Mit dieser Option kannst du sie verfallen lassen."
 
-#: src/Module/Settings/Account.php:609
+#: src/Module/Settings/Account.php:606
 msgid "Only expire posts by others"
 msgstr "Nur Beiträge anderer verfallen lassen."
 
-#: src/Module/Settings/Account.php:609
+#: src/Module/Settings/Account.php:606
 msgid ""
 "When activated, your own posts never expire. Then the settings above are "
 "only valid for posts you received."
 msgstr "Wenn aktiviert werden deine eigenen Beiträge niemals verfallen. Die obigen Einstellungen betreffen dann ausschließlich die Beiträge von anderen Accounts."
 
-#: src/Module/Settings/Account.php:612
+#: src/Module/Settings/Account.php:609
 msgid "Notification Settings"
 msgstr "Benachrichtigungseinstellungen"
 
-#: src/Module/Settings/Account.php:613
+#: src/Module/Settings/Account.php:610
 msgid "Send a notification email when:"
 msgstr "Benachrichtigungs-E-Mail senden, wenn:"
 
-#: src/Module/Settings/Account.php:614
+#: src/Module/Settings/Account.php:611
 msgid "You receive an introduction"
 msgstr "– du eine Kontaktanfrage erhältst"
 
-#: src/Module/Settings/Account.php:615
+#: src/Module/Settings/Account.php:612
 msgid "Your introductions are confirmed"
 msgstr "– eine Deiner Kontaktanfragen akzeptiert wurde"
 
-#: src/Module/Settings/Account.php:616
+#: src/Module/Settings/Account.php:613
 msgid "Someone writes on your profile wall"
 msgstr "– jemand etwas auf Deine Pinnwand schreibt"
 
-#: src/Module/Settings/Account.php:617
+#: src/Module/Settings/Account.php:614
 msgid "Someone writes a followup comment"
 msgstr "– jemand auch einen Kommentar verfasst"
 
-#: src/Module/Settings/Account.php:618
+#: src/Module/Settings/Account.php:615
 msgid "You receive a private message"
 msgstr "– du eine private Nachricht erhältst"
 
-#: src/Module/Settings/Account.php:619
+#: src/Module/Settings/Account.php:616
 msgid "You receive a friend suggestion"
 msgstr "– du eine Empfehlung erhältst"
 
-#: src/Module/Settings/Account.php:620
+#: src/Module/Settings/Account.php:617
 msgid "You are tagged in a post"
 msgstr "– du in einem Beitrag erwähnt wirst"
 
-#: src/Module/Settings/Account.php:622
+#: src/Module/Settings/Account.php:619
 msgid "Create a desktop notification when:"
 msgstr "Benachrichtigungen anzeigen wenn:"
 
-#: src/Module/Settings/Account.php:623
+#: src/Module/Settings/Account.php:620
 msgid "Someone tagged you"
 msgstr "Dich jemand erwähnt"
 
-#: src/Module/Settings/Account.php:624
+#: src/Module/Settings/Account.php:621
 msgid "Someone directly commented on your post"
 msgstr "Jemand einen Beitrag von dir kommentiert hat"
 
-#: src/Module/Settings/Account.php:625
+#: src/Module/Settings/Account.php:622
 msgid "Someone liked your content"
 msgstr "Einer deiner Beiträge gemocht wurde"
 
-#: src/Module/Settings/Account.php:625 src/Module/Settings/Account.php:626
+#: src/Module/Settings/Account.php:622 src/Module/Settings/Account.php:623
 msgid "Can only be enabled, when the direct comment notification is enabled."
 msgstr "Kann nur aktiviert werden, wenn die \"Jemand einen Beitrag von dir kommentiert hat  \" Option eingeschaltet ist."
 
-#: src/Module/Settings/Account.php:626
+#: src/Module/Settings/Account.php:623
 msgid "Someone shared your content"
 msgstr "Einer deiner Beiträge geteilt wurde"
 
-#: src/Module/Settings/Account.php:627
+#: src/Module/Settings/Account.php:624
 msgid "Someone commented in your thread"
 msgstr "Jemand hat in deiner Unterhaltung kommentiert"
 
-#: src/Module/Settings/Account.php:628
+#: src/Module/Settings/Account.php:625
 msgid "Someone commented in a thread where you commented"
 msgstr "Jemand in einer Unterhaltung kommentiert hat, in der du auch kommentiert hast"
 
-#: src/Module/Settings/Account.php:629
+#: src/Module/Settings/Account.php:626
 msgid "Someone commented in a thread where you interacted"
 msgstr "Jemand kommentierte in einer Unterhaltung mit der du interagiert hast"
 
-#: src/Module/Settings/Account.php:631
+#: src/Module/Settings/Account.php:628
 msgid "Activate desktop notifications"
 msgstr "Desktop-Benachrichtigungen einschalten"
 
-#: src/Module/Settings/Account.php:631
+#: src/Module/Settings/Account.php:628
 msgid "Show desktop popup on new notifications"
 msgstr "Desktop-Benachrichtigungen einschalten"
 
-#: src/Module/Settings/Account.php:635
+#: src/Module/Settings/Account.php:632
 msgid "Text-only notification emails"
 msgstr "Benachrichtigungs-E-Mail als Rein-Text."
 
-#: src/Module/Settings/Account.php:637
+#: src/Module/Settings/Account.php:634
 msgid "Send text only notification emails, without the html part"
 msgstr "Sende Benachrichtigungs-E-Mail als Rein-Text - ohne HTML-Teil"
 
-#: src/Module/Settings/Account.php:641
+#: src/Module/Settings/Account.php:638
 msgid "Show detailled notifications"
 msgstr "Detaillierte Benachrichtigungen anzeigen"
 
-#: src/Module/Settings/Account.php:643
+#: src/Module/Settings/Account.php:640
 msgid ""
 "Per default, notifications are condensed to a single notification per item. "
 "When enabled every notification is displayed."
 msgstr "Normalerweise werden alle Benachrichtigungen zu einem Thema in einer einzigen Benachrichtigung zusammengefasst. Wenn diese Option aktiviert ist, wird jede Benachrichtigung einzeln angezeigt."
 
-#: src/Module/Settings/Account.php:647
+#: src/Module/Settings/Account.php:644
 msgid "Show notifications of ignored contacts"
 msgstr "Zeige Benachrichtigungen von ignorierten Kontakten"
 
-#: src/Module/Settings/Account.php:649
+#: src/Module/Settings/Account.php:646
 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 "Beiträge von ignorierten Kontakten werden dir nicht angezeigt. Aber du siehst immer noch ihre Kommentare. Diese Einstellung legt fest, ob du dazu weiterhin Benachrichtigungen erhalten willst oder ob diese einfach verworfen werden sollen."
 
-#: src/Module/Settings/Account.php:652
+#: src/Module/Settings/Account.php:649
 msgid "Advanced Account/Page Type Settings"
 msgstr "Erweiterte Konto-/Seitentyp-Einstellungen"
 
-#: src/Module/Settings/Account.php:653
+#: src/Module/Settings/Account.php:650
 msgid "Change the behaviour of this account for special situations"
 msgstr "Verhalten dieses Kontos in bestimmten Situationen:"
 
-#: src/Module/Settings/Account.php:656
+#: src/Module/Settings/Account.php:653
 msgid "Import Contacts"
 msgstr "Kontakte Importieren"
 
-#: src/Module/Settings/Account.php:657
+#: src/Module/Settings/Account.php:654
 msgid ""
 "Upload a CSV file that contains the handle of your followed accounts in the "
 "first column you exported from the old account."
 msgstr "Lade eine CSV Datei hoch, die das Handle der Kontakte deines alten Nutzerkontos in der ersten Spalte enthält."
 
-#: src/Module/Settings/Account.php:658
+#: src/Module/Settings/Account.php:655
 msgid "Upload File"
 msgstr "Datei hochladen"
 
-#: src/Module/Settings/Account.php:661
+#: src/Module/Settings/Account.php:658
 msgid "Relocate"
 msgstr "Umziehen"
 
-#: src/Module/Settings/Account.php:662
+#: src/Module/Settings/Account.php:659
 msgid ""
 "If you have moved this profile from another server, and some of your "
 "contacts don't receive your updates, try pushing this button."
 msgstr "Wenn du dein Profil von einem anderen Server umgezogen hast und einige deiner Kontakte deine Beiträge nicht erhalten, verwende diesen Button."
 
-#: src/Module/Settings/Account.php:663
+#: src/Module/Settings/Account.php:660
 msgid "Resend relocate message to contacts"
 msgstr "Umzugsbenachrichtigung erneut an Kontakte senden"
 
+#: src/Module/Settings/Addons.php:89
+msgid "Addon Settings"
+msgstr "Addon Einstellungen"
+
+#: src/Module/Settings/Addons.php:90
+msgid "No Addon settings configured"
+msgstr "Keine Addon-Einstellungen konfiguriert"
+
+#: src/Module/Settings/Connectors.php:121
+msgid "Failed to connect with email account using the settings provided."
+msgstr "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich."
+
+#: src/Module/Settings/Connectors.php:165
+#: src/Module/Settings/Connectors.php:166
+msgid "Diaspora (Socialhome, Hubzilla)"
+msgstr "Diaspora (Socialhome, Hubzilla)"
+
+#: src/Module/Settings/Connectors.php:165
+#: src/Module/Settings/Connectors.php:169
+#, php-format
+msgid "Built-in support for %s connectivity is enabled"
+msgstr "Eingebaute Unterstützung für die Verbindung zu %s ist aktiviert."
+
+#: src/Module/Settings/Connectors.php:166
+#: src/Module/Settings/Connectors.php:168
+#, php-format
+msgid "Built-in support for %s connectivity is disabled"
+msgstr "Eingebaute Unterstützung für die Verbindung zu %s ist nicht aktiviert."
+
+#: src/Module/Settings/Connectors.php:168
+#: src/Module/Settings/Connectors.php:169
+msgid "OStatus (GNU Social)"
+msgstr "OStatus (GNU Social)"
+
+#: src/Module/Settings/Connectors.php:181
+msgid "Email access is disabled on this site."
+msgstr "Zugriff auf E-Mails für diese Seite deaktiviert."
+
+#: src/Module/Settings/Connectors.php:196
+#: src/Module/Settings/Connectors.php:242
+msgid "None"
+msgstr "Keine"
+
+#: src/Module/Settings/Connectors.php:208
+msgid "General Social Media Settings"
+msgstr "Allgemeine Einstellungen zu Sozialen Medien"
+
+#: src/Module/Settings/Connectors.php:211
+msgid "Followed content scope"
+msgstr "Umfang zu folgender Inhalte"
+
+#: src/Module/Settings/Connectors.php:213
+msgid ""
+"By default, conversations in which your follows participated but didn't "
+"start will be shown in your timeline. You can turn this behavior off, or "
+"expand it to the conversations in which your follows liked a post."
+msgstr "Normalerweise werden Unterhaltungen an denen deine Kontakte beteiligt sind, sie aber nicht begonnen haben, in deiner Timeline angezeigt. Mit dieser Einstellung kann dieses Vorgehen kontrolliert werden. Es kann entweder dahin erweitert werden, dass auch Unterhaltungen angezeigt werden in denen deine Kontakte einen Kommentar mögen, oder komplett ausgeschaltet werden, so dass nur noch die Unterhaltungen angezeigt werden, die von deinen Kontakten gestartet wurden."
+
+#: src/Module/Settings/Connectors.php:215
+msgid "Only conversations my follows started"
+msgstr "Nur Unterhaltungen, die meine Kontakte gestartet haben"
+
+#: src/Module/Settings/Connectors.php:216
+msgid "Conversations my follows started or commented on (default)"
+msgstr "Unterhaltungen an denen meine Kontakte beteiligt sind (Grundeinstellung)"
+
+#: src/Module/Settings/Connectors.php:217
+msgid "Any conversation my follows interacted with, including likes"
+msgstr "Unterhaltungen mit denen meine Kontakte interagiert haben, inklusive likes"
+
+#: src/Module/Settings/Connectors.php:220
+msgid "Enable Content Warning"
+msgstr "Inhaltswarnungen einschalten"
+
+#: src/Module/Settings/Connectors.php:220
+msgid ""
+"Users on networks like Mastodon or Pleroma are able to set a content warning"
+" field which collapse their post by default. This enables the automatic "
+"collapsing instead of setting the content warning as the post title. Doesn't"
+" affect any other content filtering you eventually set up."
+msgstr "Benutzer in Netzwerken wie Mastodon oder Pleroma können eine Warnung für sensitive Inhalte ihrer Beiträge erstellen. Mit dieser Option werden derart markierte Beiträge automatisch zusammengeklappt und die Inhaltswarnung wird als Titel des Beitrags angezeigt. Diese Option hat keinen Einfluss auf andere Inhaltsfilterungen, die du eventuell eingerichtet hast."
+
+#: src/Module/Settings/Connectors.php:221
+msgid "Enable intelligent shortening"
+msgstr "Intelligentes kürzen einschalten"
+
+#: src/Module/Settings/Connectors.php:221
+msgid ""
+"Normally the system tries to find the best link to add to shortened posts. "
+"If disabled, every shortened post will always point to the original "
+"friendica post."
+msgstr "Normalerweise versucht das System, den besten Link zu finden, um ihn zum gekürzten Postings hinzuzufügen. Wird diese Option ausgewählt, wird stets ein Link auf die originale Friendica-Nachricht beigefügt."
+
+#: src/Module/Settings/Connectors.php:222
+msgid "Enable simple text shortening"
+msgstr "Einfache Textkürzung aktivieren"
+
+#: src/Module/Settings/Connectors.php:222
+msgid ""
+"Normally the system shortens posts at the next line feed. If this option is "
+"enabled then the system will shorten the text at the maximum character "
+"limit."
+msgstr "Normalerweise kürzt das System Beiträge bei Zeilenumbrüchen. Ist diese Option aktiv, wird das System die Kürzung beim Erreichen der maximalen Zeichenzahl vornehmen."
+
+#: src/Module/Settings/Connectors.php:223
+msgid "Attach the link title"
+msgstr "Link Titel hinzufügen"
+
+#: src/Module/Settings/Connectors.php:223
+msgid ""
+"When activated, the title of the attached link will be added as a title on "
+"posts to Diaspora. This is mostly helpful with \"remote-self\" contacts that"
+" share feed content."
+msgstr "Ist dies aktiviert, wird der Titel von angehangenen Links bei Beiträgen nach Diaspora* angefügt. Dies ist vorallem bei Entfernten Konten nützlich die Beiträge von Feeds weiterleiten."
+
+#: src/Module/Settings/Connectors.php:224
+msgid "Your legacy ActivityPub/GNU Social account"
+msgstr "Dein alter ActivityPub/GNU Social-Account"
+
+#: src/Module/Settings/Connectors.php:224
+msgid ""
+"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."
+msgstr "Wenn du deinen alten ActivityPub oder GNU Social/Statusnet-Account-Namen hier angibst (Format name@domain.tld), werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden."
+
+#: src/Module/Settings/Connectors.php:227
+msgid "Repair OStatus subscriptions"
+msgstr "OStatus-Abonnements reparieren"
+
+#: src/Module/Settings/Connectors.php:231
+msgid "Email/Mailbox Setup"
+msgstr "E-Mail/Postfach-Einstellungen"
+
+#: src/Module/Settings/Connectors.php:232
+msgid ""
+"If you wish to communicate with email contacts using this service "
+"(optional), please specify how to connect to your mailbox."
+msgstr "Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an."
+
+#: src/Module/Settings/Connectors.php:233
+msgid "Last successful email check:"
+msgstr "Letzter erfolgreicher E-Mail-Check"
+
+#: src/Module/Settings/Connectors.php:235
+msgid "IMAP server name:"
+msgstr "IMAP-Server-Name:"
+
+#: src/Module/Settings/Connectors.php:236
+msgid "IMAP port:"
+msgstr "IMAP-Port:"
+
+#: src/Module/Settings/Connectors.php:237
+msgid "Security:"
+msgstr "Sicherheit:"
+
+#: src/Module/Settings/Connectors.php:238
+msgid "Email login name:"
+msgstr "E-Mail-Login-Name:"
+
+#: src/Module/Settings/Connectors.php:239
+msgid "Email password:"
+msgstr "E-Mail-Passwort:"
+
+#: src/Module/Settings/Connectors.php:240
+msgid "Reply-to address:"
+msgstr "Reply-to Adresse:"
+
+#: src/Module/Settings/Connectors.php:241
+msgid "Send public posts to all email contacts:"
+msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:"
+
+#: src/Module/Settings/Connectors.php:242
+msgid "Action after import:"
+msgstr "Aktion nach Import:"
+
+#: src/Module/Settings/Connectors.php:242
+msgid "Move to folder"
+msgstr "In einen Ordner verschieben"
+
+#: src/Module/Settings/Connectors.php:243
+msgid "Move to folder:"
+msgstr "In diesen Ordner verschieben:"
+
 #: src/Module/Settings/Delegation.php:52
 msgid "Delegation successfully granted."
 msgstr "Delegierung erfolgreich eingerichtet."
@@ -9506,10 +9519,6 @@ msgstr "Einstellungen zum Inhalt"
 msgid "Theme settings"
 msgstr "Theme-Einstellungen"
 
-#: src/Module/Settings/Display.php:205
-msgid "Calendar"
-msgstr "Kalender"
-
 #: src/Module/Settings/Display.php:211
 msgid "Display Theme:"
 msgstr "Theme:"
@@ -9602,134 +9611,159 @@ msgstr "Gehe nicht zu einem Remote-System, wenn einem Kontaktlink gefolgt wird"
 msgid "Beginning of week:"
 msgstr "Wochenbeginn:"
 
-#: src/Module/Settings/Profile/Index.php:83
+#: src/Module/Settings/Features.php:74
+msgid "Additional Features"
+msgstr "Zusätzliche Features"
+
+#: src/Module/Settings/OAuth.php:72
+msgid "Connected Apps"
+msgstr "Verbundene Programme"
+
+#: src/Module/Settings/OAuth.php:76
+msgid "Remove authorization"
+msgstr "Autorisierung entziehen"
+
+#: src/Module/Settings/Profile/Index.php:84
 msgid "Profile Name is required."
 msgstr "Profilname ist erforderlich."
 
-#: src/Module/Settings/Profile/Index.php:131
+#: src/Module/Settings/Profile/Index.php:134
 msgid "Profile couldn't be updated."
 msgstr "Das Profil konnte nicht aktualisiert werden."
 
-#: src/Module/Settings/Profile/Index.php:172
-#: src/Module/Settings/Profile/Index.php:192
+#: src/Module/Settings/Profile/Index.php:175
+#: src/Module/Settings/Profile/Index.php:195
 msgid "Label:"
 msgstr "Bezeichnung:"
 
-#: src/Module/Settings/Profile/Index.php:173
-#: src/Module/Settings/Profile/Index.php:193
+#: src/Module/Settings/Profile/Index.php:176
+#: src/Module/Settings/Profile/Index.php:196
 msgid "Value:"
 msgstr "Wert:"
 
-#: src/Module/Settings/Profile/Index.php:183
-#: src/Module/Settings/Profile/Index.php:203
+#: src/Module/Settings/Profile/Index.php:186
+#: src/Module/Settings/Profile/Index.php:206
 msgid "Field Permissions"
 msgstr "Berechtigungen des Felds"
 
-#: src/Module/Settings/Profile/Index.php:184
-#: src/Module/Settings/Profile/Index.php:204
+#: src/Module/Settings/Profile/Index.php:187
+#: src/Module/Settings/Profile/Index.php:207
 msgid "(click to open/close)"
 msgstr "(klicke zum Öffnen/Schließen)"
 
-#: src/Module/Settings/Profile/Index.php:190
+#: src/Module/Settings/Profile/Index.php:193
 msgid "Add a new profile field"
 msgstr "Neues Profilfeld hinzufügen"
 
-#: src/Module/Settings/Profile/Index.php:220
+#: src/Module/Settings/Profile/Index.php:217
+msgid ""
+"The homepage is verified. A rel=\"me\" link back to your Friendica profile "
+"page was found on the homepage."
+msgstr "Die Homepage ist verifiziert. Ein rel=\"me\" Link zurück auf dein Friendica Profil wurde gefunden."
+
+#: src/Module/Settings/Profile/Index.php:219
+#, php-format
+msgid ""
+"To verify your homepage, add a rel=\"me\" link to it, pointing to your "
+"profile URL (%s)."
+msgstr "Um deine Homepage zu verifizieren, füge einen rel=\"me\" Link auf der Seite hinzu, der auf dein Profil mit der URL (%s) verweist."
+
+#: src/Module/Settings/Profile/Index.php:229
 msgid "Profile Actions"
 msgstr "Profilaktionen"
 
-#: src/Module/Settings/Profile/Index.php:221
+#: src/Module/Settings/Profile/Index.php:230
 msgid "Edit Profile Details"
 msgstr "Profil bearbeiten"
 
-#: src/Module/Settings/Profile/Index.php:223
+#: src/Module/Settings/Profile/Index.php:232
 msgid "Change Profile Photo"
 msgstr "Profilbild ändern"
 
-#: src/Module/Settings/Profile/Index.php:228
+#: src/Module/Settings/Profile/Index.php:237
 msgid "Profile picture"
 msgstr "Profilbild"
 
-#: src/Module/Settings/Profile/Index.php:229
+#: src/Module/Settings/Profile/Index.php:238
 msgid "Location"
 msgstr "Wohnort"
 
-#: src/Module/Settings/Profile/Index.php:230 src/Util/Temporal.php:95
+#: src/Module/Settings/Profile/Index.php:239 src/Util/Temporal.php:95
 #: src/Util/Temporal.php:97
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: src/Module/Settings/Profile/Index.php:231
+#: src/Module/Settings/Profile/Index.php:240
 msgid "Custom Profile Fields"
 msgstr "Benutzerdefinierte Profilfelder"
 
-#: src/Module/Settings/Profile/Index.php:233 src/Module/Welcome.php:58
+#: src/Module/Settings/Profile/Index.php:242 src/Module/Welcome.php:58
 msgid "Upload Profile Photo"
 msgstr "Profilbild hochladen"
 
-#: src/Module/Settings/Profile/Index.php:237
+#: src/Module/Settings/Profile/Index.php:246
 msgid "Display name:"
 msgstr "Anzeigename:"
 
-#: src/Module/Settings/Profile/Index.php:240
+#: src/Module/Settings/Profile/Index.php:249
 msgid "Street Address:"
 msgstr "Adresse:"
 
-#: src/Module/Settings/Profile/Index.php:241
+#: src/Module/Settings/Profile/Index.php:250
 msgid "Locality/City:"
 msgstr "Wohnort:"
 
-#: src/Module/Settings/Profile/Index.php:242
+#: src/Module/Settings/Profile/Index.php:251
 msgid "Region/State:"
 msgstr "Region/Bundesstaat:"
 
-#: src/Module/Settings/Profile/Index.php:243
+#: src/Module/Settings/Profile/Index.php:252
 msgid "Postal/Zip Code:"
 msgstr "Postleitzahl:"
 
-#: src/Module/Settings/Profile/Index.php:244
+#: src/Module/Settings/Profile/Index.php:253
 msgid "Country:"
 msgstr "Land:"
 
-#: src/Module/Settings/Profile/Index.php:246
+#: src/Module/Settings/Profile/Index.php:255
 msgid "XMPP (Jabber) address:"
 msgstr "XMPP (Jabber) Adresse"
 
-#: src/Module/Settings/Profile/Index.php:246
+#: src/Module/Settings/Profile/Index.php:255
 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:247
+#: src/Module/Settings/Profile/Index.php:256
 msgid "Matrix (Element) address:"
 msgstr "Matrix (Element) Adresse:"
 
-#: src/Module/Settings/Profile/Index.php:247
+#: src/Module/Settings/Profile/Index.php:256
 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:248
+#: src/Module/Settings/Profile/Index.php:257
 msgid "Homepage URL:"
 msgstr "Adresse der Homepage:"
 
-#: src/Module/Settings/Profile/Index.php:249
+#: src/Module/Settings/Profile/Index.php:258
 msgid "Public Keywords:"
 msgstr "Öffentliche Schlüsselwörter:"
 
-#: src/Module/Settings/Profile/Index.php:249
+#: src/Module/Settings/Profile/Index.php:258
 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:250
+#: src/Module/Settings/Profile/Index.php:259
 msgid "Private Keywords:"
 msgstr "Private Schlüsselwörter:"
 
-#: src/Module/Settings/Profile/Index.php:250
+#: src/Module/Settings/Profile/Index.php:259
 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:251
+#: src/Module/Settings/Profile/Index.php:260
 #, php-format
 msgid ""
 "<p>Custom fields appear on <a href=\"%s\">your profile page</a>.</p>\n"
@@ -9810,6 +9844,45 @@ msgstr "diesen Schritt überspringen"
 msgid "select a photo from your photo albums"
 msgstr "wähle ein Foto aus deinen Fotoalben"
 
+#: src/Module/Settings/RemoveMe.php:94
+#: src/Navigation/Notifications/Repository/Notify.php:471
+#: src/Navigation/Notifications/Repository/Notify.php:492
+msgid "[Friendica System Notify]"
+msgstr "[Friendica-Systembenachrichtigung]"
+
+#: src/Module/Settings/RemoveMe.php:94
+msgid "User deleted their account"
+msgstr "Gelöschter Nutzeraccount"
+
+#: src/Module/Settings/RemoveMe.php:95
+msgid ""
+"On your Friendica node an user deleted their account. Please ensure that "
+"their data is removed from the backups."
+msgstr "Ein Nutzer deiner Friendica-Instanz hat seinen Account gelöscht. Bitte stelle sicher, dass dessen Daten aus deinen Backups entfernt werden."
+
+#: src/Module/Settings/RemoveMe.php:96
+#, php-format
+msgid "The user id is %d"
+msgstr "Die ID des Users lautet %d"
+
+#: src/Module/Settings/RemoveMe.php:108
+msgid "Your user account has been successfully removed. Bye bye!"
+msgstr "Dein Nutzeraccount wurde erfolgreich entfernt. Bye bye!"
+
+#: src/Module/Settings/RemoveMe.php:128
+msgid "Remove My Account"
+msgstr "Konto löschen"
+
+#: src/Module/Settings/RemoveMe.php:129
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
+msgstr "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen."
+
+#: src/Module/Settings/RemoveMe.php:131
+msgid "Please enter your password for verification:"
+msgstr "Bitte gib dein Passwort zur Verifikation ein:"
+
 #: src/Module/Settings/TwoFactor/AppSpecific.php:65
 #: src/Module/Settings/TwoFactor/Recovery.php:63
 #: src/Module/Settings/TwoFactor/Trusted.php:66
@@ -10100,32 +10173,32 @@ msgstr "<p>Oder du kannst die folgende URL in deinem Mobilgerät öffnen:</p><p>
 msgid "Verify code and enable two-factor authentication"
 msgstr "Überprüfe den Code und aktiviere die Zwei-Faktor-Authentifizierung"
 
-#: src/Module/Settings/UserExport.php:94
+#: src/Module/Settings/UserExport.php:90
 msgid "Export account"
 msgstr "Account exportieren"
 
-#: src/Module/Settings/UserExport.php:94
+#: src/Module/Settings/UserExport.php:90
 msgid ""
 "Export your account info and contacts. Use this to make a backup of your "
 "account and/or to move it to another server."
 msgstr "Exportiere Deine Account-Informationen und Kontakte. Verwende dies, um ein Backup Deines Accounts anzulegen und/oder damit auf einen anderen Server umzuziehen."
 
-#: src/Module/Settings/UserExport.php:95
+#: src/Module/Settings/UserExport.php:91
 msgid "Export all"
 msgstr "Alles exportieren"
 
-#: src/Module/Settings/UserExport.php:95
+#: src/Module/Settings/UserExport.php:91
 msgid ""
 "Export your account info, contacts and all your items as json. Could be a "
 "very big file, and could take a lot of time. Use this to make a full backup "
 "of your account (photos are not exported)"
 msgstr "Exportiere deine Account Informationen, Kontakte und alle Einträge als JSON Datei. Dies könnte eine sehr große Datei werden und dementsprechend viel Zeit benötigen. Verwende dies um ein komplettes Backup deines Accounts anzulegen (Photos werden nicht exportiert)."
 
-#: src/Module/Settings/UserExport.php:96
+#: src/Module/Settings/UserExport.php:92
 msgid "Export Contacts to CSV"
 msgstr "Kontakte nach CSV exportieren"
 
-#: src/Module/Settings/UserExport.php:96
+#: src/Module/Settings/UserExport.php:92
 msgid ""
 "Export the list of the accounts you are following as CSV file. Compatible to"
 " e.g. Mastodon."
@@ -10166,15 +10239,86 @@ msgid ""
 "At any point in time a logged in user can export their account data from the"
 " <a href=\"%1$s/settings/userexport\">account settings</a>. If the user "
 "wants to delete their account they can do so at <a "
-"href=\"%1$s/removeme\">%1$s/removeme</a>. The deletion of the account will "
-"be permanent. Deletion of the data will also be requested from the nodes of "
-"the communication partners."
-msgstr "Angemeldete Nutzer können ihre Nutzerdaten jederzeit von den <a href=\"%1$s/settings/userexport\">Kontoeinstellungen</a> aus exportieren. Wenn ein Nutzer wünscht das Nutzerkonto zu löschen, so ist dies jederzeit unter <a href=\"%1$s/removeme\">%1$s/removeme</a> möglich. Die Löschung des Nutzerkontos ist permanent. Die Löschung der Daten wird auch von den Knoten der Kommunikationspartner angefordert."
+"href=\"%1$s/settings/removeme\">%1$s/settings/removeme</a>. The deletion of "
+"the account will be permanent. Deletion of the data will also be requested "
+"from the nodes of the communication partners."
+msgstr "Angemeldete Nutzer können ihre Nutzerdaten jederzeit von den <a href=\"%1$s/settings/userexport\">Kontoeinstellungen</a> aus exportieren. Wenn ein Nutzer wünscht das Nutzerkonto zu löschen, so ist dies jederzeit unter <a href=\"%1$s/settings/removeme\">%1$s/settings/removeme</a> möglich. Die Löschung des Nutzerkontos ist permanent. Die Löschung der Daten wird auch von den Knoten der Kommunikationspartner angefordert."
 
 #: src/Module/Tos.php:62 src/Module/Tos.php:90
 msgid "Privacy Statement"
 msgstr "Datenschutzerklärung"
 
+#: src/Module/Update/Display.php:45
+msgid "Parameter uri_id is missing."
+msgstr "Der Parameter uri_id fehlt."
+
+#: src/Module/User/Import.php:103
+msgid "User imports on closed servers can only be done by an administrator."
+msgstr "Auf geschlossenen Servern können ausschließlich die Administratoren Benutzerkonten importieren."
+
+#: src/Module/User/Import.php:119
+msgid "Move account"
+msgstr "Account umziehen"
+
+#: src/Module/User/Import.php:120
+msgid "You can import an account from another Friendica server."
+msgstr "Du kannst einen Account von einem anderen Friendica Server importieren."
+
+#: src/Module/User/Import.php:121
+msgid ""
+"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."
+msgstr "Du musst deinen Account vom alten Server exportieren und hier hochladen. Wir stellen deinen alten Account mit all deinen Kontakten wieder her. Wir werden auch versuchen, deine Kontakte darüber zu informieren, dass du hierher umgezogen bist."
+
+#: src/Module/User/Import.php:122
+msgid ""
+"This feature is experimental. We can't import contacts from the OStatus "
+"network (GNU Social/Statusnet) or from Diaspora"
+msgstr "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus-Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren"
+
+#: src/Module/User/Import.php:123
+msgid "Account file"
+msgstr "Account-Datei"
+
+#: src/Module/User/Import.php:123
+msgid ""
+"To export your account, go to \"Settings->Export your personal data\" and "
+"select \"Export account\""
+msgstr "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\""
+
+#: src/Module/User/Import.php:217
+msgid "Error decoding account file"
+msgstr "Fehler beim Verarbeiten der Account-Datei"
+
+#: src/Module/User/Import.php:222
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica-Account-Datei?"
+
+#: src/Module/User/Import.php:230
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr "Nutzer '%s' existiert bereits auf diesem Server!"
+
+#: src/Module/User/Import.php:263
+msgid "User creation error"
+msgstr "Fehler beim Anlegen des Nutzer-Accounts aufgetreten"
+
+#: src/Module/User/Import.php:312
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] "%d Kontakt nicht importiert"
+msgstr[1] "%d Kontakte nicht importiert"
+
+#: src/Module/User/Import.php:361
+msgid "User profile creation error"
+msgstr "Fehler beim Anlegen des Nutzer-Profils"
+
+#: src/Module/User/Import.php:412
+msgid "Done. You can now login with your username and password"
+msgstr "Erledigt. Du kannst dich jetzt mit deinem Nutzernamen und Passwort anmelden"
+
 #: src/Module/Welcome.php:44
 msgid "Welcome to Friendica"
 msgstr "Willkommen bei Friendica"
@@ -10340,11 +10484,11 @@ 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/Factory/FormattedNavNotification.php:138
+#: src/Navigation/Notifications/Factory/FormattedNavNotification.php:151
 msgid "{0} wants to follow you"
 msgstr "{0} möchte dir folgen"
 
-#: src/Navigation/Notifications/Factory/FormattedNavNotification.php:140
+#: src/Navigation/Notifications/Factory/FormattedNavNotification.php:153
 msgid "{0} has started following you"
 msgstr "{0} folgt dir jetzt"
 
@@ -10389,15 +10533,15 @@ msgstr "%s hat %ss Beitrag kommentiert"
 msgid "%s created a new post"
 msgstr "%s hat einen neuen Beitrag erstellt"
 
-#: src/Navigation/Notifications/Factory/Introduction.php:137
+#: src/Navigation/Notifications/Factory/Introduction.php:133
 msgid "Friend Suggestion"
 msgstr "Kontaktvorschlag"
 
-#: src/Navigation/Notifications/Factory/Introduction.php:163
+#: src/Navigation/Notifications/Factory/Introduction.php:159
 msgid "Friend/Connect Request"
 msgstr "Kontakt-/Freundschaftsanfrage"
 
-#: src/Navigation/Notifications/Factory/Introduction.php:163
+#: src/Navigation/Notifications/Factory/Introduction.php:159
 msgid "New Follower"
 msgstr "Neuer Bewunderer"
 
@@ -10526,189 +10670,189 @@ msgid "%1$s commented on your thread %2$s"
 msgstr "%1$s hat in deiner Unterhaltung %2$s kommentiert"
 
 #: src/Navigation/Notifications/Repository/Notify.php:225
-#: src/Navigation/Notifications/Repository/Notify.php:721
+#: src/Navigation/Notifications/Repository/Notify.php:752
 msgid "[Friendica:Notify]"
 msgstr "[Friendica Meldung]"
 
-#: src/Navigation/Notifications/Repository/Notify.php:289
+#: src/Navigation/Notifications/Repository/Notify.php:293
 #, php-format
 msgid "%s New mail received at %s"
 msgstr "%sNeue Nachricht auf %s empfangen"
 
-#: src/Navigation/Notifications/Repository/Notify.php:291
+#: src/Navigation/Notifications/Repository/Notify.php:295
 #, 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:292
+#: src/Navigation/Notifications/Repository/Notify.php:296
 msgid "a private message"
 msgstr "eine private Nachricht"
 
-#: src/Navigation/Notifications/Repository/Notify.php:292
+#: src/Navigation/Notifications/Repository/Notify.php:296
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s schickte dir %2$s."
 
-#: src/Navigation/Notifications/Repository/Notify.php:294
+#: src/Navigation/Notifications/Repository/Notify.php:298
 #, 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:324
+#: src/Navigation/Notifications/Repository/Notify.php:328
 #, 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:329
+#: src/Navigation/Notifications/Repository/Notify.php:333
 #, 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:333
+#: src/Navigation/Notifications/Repository/Notify.php:337
 #, 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:337
-#: src/Navigation/Notifications/Repository/Notify.php:755
+#: src/Navigation/Notifications/Repository/Notify.php:341
+#: src/Navigation/Notifications/Repository/Notify.php:786
 #, 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:339
+#: src/Navigation/Notifications/Repository/Notify.php:343
 #, 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:343
-#: src/Navigation/Notifications/Repository/Notify.php:358
-#: src/Navigation/Notifications/Repository/Notify.php:770
+#: src/Navigation/Notifications/Repository/Notify.php:347
+#: src/Navigation/Notifications/Repository/Notify.php:362
+#: src/Navigation/Notifications/Repository/Notify.php:801
 #, 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:350
+#: src/Navigation/Notifications/Repository/Notify.php:354
 #, php-format
 msgid "%s %s posted to your profile wall"
 msgstr "%s%s hat auf deine Pinnwand gepostet"
 
-#: src/Navigation/Notifications/Repository/Notify.php:352
+#: src/Navigation/Notifications/Repository/Notify.php:356
 #, 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:353
+#: src/Navigation/Notifications/Repository/Notify.php:357
 #, 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:366
+#: src/Navigation/Notifications/Repository/Notify.php:370
 #, php-format
 msgid "%s Introduction received"
 msgstr "%sVorstellung erhalten"
 
-#: src/Navigation/Notifications/Repository/Notify.php:368
+#: src/Navigation/Notifications/Repository/Notify.php:372
 #, 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:369
+#: src/Navigation/Notifications/Repository/Notify.php:373
 #, 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:374
-#: src/Navigation/Notifications/Repository/Notify.php:420
+#: src/Navigation/Notifications/Repository/Notify.php:378
+#: src/Navigation/Notifications/Repository/Notify.php:424
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Hier kannst du das Profil betrachten: %s"
 
-#: src/Navigation/Notifications/Repository/Notify.php:376
+#: src/Navigation/Notifications/Repository/Notify.php:380
 #, 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:383
+#: src/Navigation/Notifications/Repository/Notify.php:387
 #, 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:385
-#: src/Navigation/Notifications/Repository/Notify.php:386
+#: src/Navigation/Notifications/Repository/Notify.php:389
+#: src/Navigation/Notifications/Repository/Notify.php:390
 #, 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:393
+#: src/Navigation/Notifications/Repository/Notify.php:397
 #, php-format
 msgid "%s You have a new follower"
 msgstr "%sDu hast einen neuen Kontakt"
 
-#: src/Navigation/Notifications/Repository/Notify.php:395
-#: src/Navigation/Notifications/Repository/Notify.php:396
+#: src/Navigation/Notifications/Repository/Notify.php:399
+#: src/Navigation/Notifications/Repository/Notify.php:400
 #, 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:409
+#: src/Navigation/Notifications/Repository/Notify.php:413
 #, php-format
 msgid "%s Friend suggestion received"
 msgstr "%sKontaktvorschlag erhalten"
 
-#: src/Navigation/Notifications/Repository/Notify.php:411
+#: src/Navigation/Notifications/Repository/Notify.php:415
 #, 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:412
+#: src/Navigation/Notifications/Repository/Notify.php:416
 #, 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:418
+#: src/Navigation/Notifications/Repository/Notify.php:422
 msgid "Name:"
 msgstr "Name:"
 
-#: src/Navigation/Notifications/Repository/Notify.php:419
+#: src/Navigation/Notifications/Repository/Notify.php:423
 msgid "Photo:"
 msgstr "Foto:"
 
-#: src/Navigation/Notifications/Repository/Notify.php:422
+#: src/Navigation/Notifications/Repository/Notify.php:426
 #, 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:430
-#: src/Navigation/Notifications/Repository/Notify.php:445
+#: src/Navigation/Notifications/Repository/Notify.php:434
+#: src/Navigation/Notifications/Repository/Notify.php:449
 #, php-format
 msgid "%s Connection accepted"
 msgstr "%sKontaktanfrage bestätigt"
 
-#: src/Navigation/Notifications/Repository/Notify.php:432
-#: src/Navigation/Notifications/Repository/Notify.php:447
+#: src/Navigation/Notifications/Repository/Notify.php:436
+#: src/Navigation/Notifications/Repository/Notify.php:451
 #, 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:433
-#: src/Navigation/Notifications/Repository/Notify.php:448
+#: src/Navigation/Notifications/Repository/Notify.php:437
+#: src/Navigation/Notifications/Repository/Notify.php:452
 #, 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:438
+#: src/Navigation/Notifications/Repository/Notify.php:442
 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:440
+#: 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:453
+#: src/Navigation/Notifications/Repository/Notify.php:457
 #, php-format
 msgid ""
 "'%1$s' has chosen to accept you a fan, which restricts some forms of "
@@ -10717,33 +10861,34 @@ msgid ""
 "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:455
+#: src/Navigation/Notifications/Repository/Notify.php:459
 #, 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:457
+#: src/Navigation/Notifications/Repository/Notify.php:461
 #, 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:467
+#: src/Navigation/Notifications/Repository/Notify.php:471
 msgid "registration request"
 msgstr "Registrierungsanfrage"
 
-#: src/Navigation/Notifications/Repository/Notify.php:469
+#: src/Navigation/Notifications/Repository/Notify.php:473
 #, 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:470
+#: src/Navigation/Notifications/Repository/Notify.php:474
 #, 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:475
+#: src/Navigation/Notifications/Repository/Notify.php:479
+#: src/Navigation/Notifications/Repository/Notify.php:500
 #, php-format
 msgid ""
 "Full Name:\t%s\n"
@@ -10751,17 +10896,36 @@ msgid ""
 "Login Name:\t%s (%s)"
 msgstr "Kompletter Name: %s\nURL der Seite: %s\nLogin Name: %s(%s)"
 
-#: src/Navigation/Notifications/Repository/Notify.php:481
+#: src/Navigation/Notifications/Repository/Notify.php:485
 #, 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:749
+#: src/Navigation/Notifications/Repository/Notify.php:492
+msgid "new registration"
+msgstr "Neue Registrierung"
+
+#: src/Navigation/Notifications/Repository/Notify.php:494
+#, php-format
+msgid "You've received a new registration from '%1$s' at %2$s"
+msgstr "Du hast eine neue Registrierung von %1$s auf %2$s erhalten."
+
+#: src/Navigation/Notifications/Repository/Notify.php:495
+#, php-format
+msgid "You've received a [url=%1$s]new registration[/url] from %2$s."
+msgstr "Du hast eine [url=%1$s]neue Registrierung[/url] von %2$s erhalten."
+
+#: src/Navigation/Notifications/Repository/Notify.php:506
+#, php-format
+msgid "Please visit %s to have a look at the new registration."
+msgstr "Bitte rufe %s auf, um dir die Registrierung zu sichten."
+
+#: src/Navigation/Notifications/Repository/Notify.php:780
 #, php-format
 msgid "%s %s tagged you"
 msgstr "%s %s hat dich erwähnt"
 
-#: src/Navigation/Notifications/Repository/Notify.php:752
+#: src/Navigation/Notifications/Repository/Notify.php:783
 #, php-format
 msgid "%s %s shared a new post"
 msgstr "%s%shat einen Beitrag geteilt"
@@ -11022,12 +11186,12 @@ msgstr "Anmeldung fehlgeschlagen."
 msgid "Login failed. Please check your credentials."
 msgstr "Anmeldung fehlgeschlagen. Bitte überprüfe deine Angaben."
 
-#: src/Security/Authentication.php:381
+#: src/Security/Authentication.php:382
 #, php-format
 msgid "Welcome %s"
 msgstr "Willkommen %s"
 
-#: src/Security/Authentication.php:382
+#: src/Security/Authentication.php:383
 msgid "Please upload a profile photo."
 msgstr "Bitte lade ein Profilbild hoch."
 
@@ -11125,7 +11289,7 @@ msgstr "in %1$d %2$s"
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s her"
 
-#: src/Worker/Delivery.php:527
+#: src/Worker/Delivery.php:534
 msgid "(no subject)"
 msgstr "(kein Betreff)"
 
diff --git a/view/lang/de/strings.php b/view/lang/de/strings.php
index 817cc0fc4d..bcc2427981 100644
--- a/view/lang/de/strings.php
+++ b/view/lang/de/strings.php
@@ -5,99 +5,12 @@ function string_plural_select_de($n){
 	$n = intval($n);
 	return intval($n != 1);
 }}
-$a->strings['Access denied.'] = 'Zugriff verweigert.';
-$a->strings['User not found.'] = 'Benutzer nicht gefunden.';
-$a->strings['Access to this profile has been restricted.'] = 'Der Zugriff zu diesem Profil wurde eingeschränkt.';
-$a->strings['Events'] = 'Veranstaltungen';
-$a->strings['View'] = 'Ansehen';
-$a->strings['Previous'] = 'Vorherige';
-$a->strings['Next'] = 'Nächste';
-$a->strings['today'] = 'Heute';
-$a->strings['month'] = 'Monat';
-$a->strings['week'] = 'Woche';
-$a->strings['day'] = 'Tag';
-$a->strings['list'] = 'Liste';
-$a->strings['User not found'] = 'Nutzer nicht gefunden';
-$a->strings['This calendar format is not supported'] = 'Dieses Kalenderformat wird nicht unterstützt.';
-$a->strings['No exportable data found'] = 'Keine exportierbaren Daten gefunden';
-$a->strings['calendar'] = 'Kalender';
-$a->strings['Public access denied.'] = 'Öffentlicher Zugriff verweigert.';
-$a->strings['The requested item doesn\'t exist or has been deleted.'] = 'Der angeforderte Beitrag existiert nicht oder wurde gelöscht.';
-$a->strings['The feed for this item is unavailable.'] = 'Der Feed für diesen Beitrag ist nicht verfügbar.';
-$a->strings['Permission denied.'] = 'Zugriff verweigert.';
-$a->strings['Item not found'] = 'Beitrag nicht gefunden';
-$a->strings['Edit post'] = 'Beitrag bearbeiten';
-$a->strings['Save'] = 'Speichern';
-$a->strings['Loading...'] = 'lädt...';
-$a->strings['Upload photo'] = 'Foto hochladen';
-$a->strings['upload photo'] = 'Bild hochladen';
-$a->strings['Attach file'] = 'Datei anhängen';
-$a->strings['attach file'] = 'Datei anhängen';
-$a->strings['Insert web link'] = 'Einen Link einfügen';
-$a->strings['web link'] = 'Weblink';
-$a->strings['Insert video link'] = 'Video-Adresse einfügen';
-$a->strings['video link'] = 'Video-Link';
-$a->strings['Insert audio link'] = 'Audio-Adresse einfügen';
-$a->strings['audio link'] = 'Audio-Link';
-$a->strings['Set your location'] = 'Deinen Standort festlegen';
-$a->strings['set location'] = 'Ort setzen';
-$a->strings['Clear browser location'] = 'Browser-Standort leeren';
-$a->strings['clear location'] = 'Ort löschen';
-$a->strings['Please wait'] = 'Bitte warten';
-$a->strings['Permission settings'] = 'Berechtigungseinstellungen';
-$a->strings['CC: email addresses'] = 'Cc: E-Mail-Addressen';
-$a->strings['Public post'] = 'Öffentlicher Beitrag';
-$a->strings['Set title'] = 'Titel setzen';
-$a->strings['Categories (comma-separated list)'] = 'Kategorien (kommasepariert)';
-$a->strings['Example: bob@example.com, mary@example.com'] = 'Z.B.: bob@example.com, mary@example.com';
-$a->strings['Preview'] = 'Vorschau';
-$a->strings['Cancel'] = 'Abbrechen';
-$a->strings['Bold'] = 'Fett';
-$a->strings['Italic'] = 'Kursiv';
-$a->strings['Underline'] = 'Unterstrichen';
-$a->strings['Quote'] = 'Zitat';
-$a->strings['Code'] = 'Code';
-$a->strings['Link'] = 'Link';
-$a->strings['Link or Media'] = 'Link oder Mediendatei';
-$a->strings['Message'] = 'Nachricht';
-$a->strings['Browser'] = 'Browser';
-$a->strings['Permissions'] = 'Berechtigungen';
-$a->strings['Open Compose page'] = 'Composer Seite öffnen';
-$a->strings['Event can not end before it has started.'] = 'Die Veranstaltung kann nicht enden, bevor sie beginnt.';
-$a->strings['Event title and start time are required.'] = 'Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden.';
-$a->strings['Create New Event'] = 'Neue Veranstaltung erstellen';
-$a->strings['Event details'] = 'Veranstaltungsdetails';
-$a->strings['Starting date and Title are required.'] = 'Anfangszeitpunkt und Titel werden benötigt';
-$a->strings['Event Starts:'] = 'Veranstaltungsbeginn:';
-$a->strings['Required'] = 'Benötigt';
-$a->strings['Finish date/time is not known or not relevant'] = 'Enddatum/-zeit ist nicht bekannt oder nicht relevant';
-$a->strings['Event Finishes:'] = 'Veranstaltungsende:';
-$a->strings['Description:'] = 'Beschreibung';
-$a->strings['Location:'] = 'Ort:';
-$a->strings['Title:'] = 'Titel:';
-$a->strings['Share this event'] = 'Veranstaltung teilen';
-$a->strings['Submit'] = 'Senden';
-$a->strings['Basic'] = 'Allgemein';
-$a->strings['Advanced'] = 'Erweitert';
-$a->strings['Failed to remove event'] = 'Entfernen der Veranstaltung fehlgeschlagen';
 $a->strings['Photos'] = 'Bilder';
+$a->strings['Cancel'] = 'Abbrechen';
 $a->strings['Upload'] = 'Hochladen';
 $a->strings['Files'] = 'Dateien';
-$a->strings['Submit Request'] = 'Anfrage abschicken';
-$a->strings['You already added this contact.'] = 'Du hast den Kontakt bereits hinzugefügt.';
-$a->strings['The network type couldn\'t be detected. Contact can\'t be added.'] = 'Der Netzwerktyp wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden.';
-$a->strings['Diaspora support isn\'t enabled. Contact can\'t be added.'] = 'Diaspora-Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden.';
-$a->strings['OStatus support is disabled. Contact can\'t be added.'] = 'OStatus-Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden.';
-$a->strings['Connect/Follow'] = 'Verbinden/Folgen';
-$a->strings['Please answer the following:'] = 'Bitte beantworte folgendes:';
-$a->strings['Your Identity Address:'] = 'Adresse Deines Profils:';
-$a->strings['Profile URL'] = 'Profil URL';
-$a->strings['Tags:'] = 'Tags:';
-$a->strings['%s knows you'] = '%skennt dich';
-$a->strings['Add a personal note:'] = 'Eine persönliche Notiz beifügen:';
-$a->strings['Status Messages and Posts'] = 'Statusnachrichten und Beiträge';
-$a->strings['The contact could not be added.'] = 'Der Kontakt konnte nicht hinzugefügt werden.';
 $a->strings['Unable to locate original post.'] = 'Konnte den Originalbeitrag nicht finden.';
+$a->strings['Permission denied.'] = 'Zugriff verweigert.';
 $a->strings['Empty post discarded.'] = 'Leerer Beitrag wurde verworfen.';
 $a->strings['Post updated.'] = 'Beitrag aktualisiert.';
 $a->strings['Item wasn\'t stored.'] = 'Eintrag wurde nicht gespeichert';
@@ -190,9 +103,6 @@ Passwort: %3$s
 
 Das Passwort kann und sollte in den Kontoeinstellungen nach der Anmeldung geändert werden.';
 $a->strings['Your password has been changed at %s'] = 'Auf %s wurde dein Passwort geändert';
-$a->strings['No keywords to match. Please add keywords to your profile.'] = 'Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu deinem Profil hinzu.';
-$a->strings['No matches'] = 'Keine Übereinstimmungen';
-$a->strings['Profile Match'] = 'Profilübereinstimmungen';
 $a->strings['New Message'] = 'Neue Nachricht';
 $a->strings['No recipient selected.'] = 'Kein Empfänger gewählt.';
 $a->strings['Unable to locate contact information.'] = 'Konnte die Kontaktinformationen nicht finden.';
@@ -208,6 +118,10 @@ $a->strings['Send Private Message'] = 'Private Nachricht senden';
 $a->strings['To:'] = 'An:';
 $a->strings['Subject:'] = 'Betreff:';
 $a->strings['Your message:'] = 'Deine Nachricht:';
+$a->strings['Upload photo'] = 'Foto hochladen';
+$a->strings['Insert web link'] = 'Einen Link einfügen';
+$a->strings['Please wait'] = 'Bitte warten';
+$a->strings['Submit'] = 'Senden';
 $a->strings['No messages.'] = 'Keine Nachrichten.';
 $a->strings['Message not available.'] = 'Nachricht nicht verfügbar.';
 $a->strings['Delete message'] = 'Nachricht löschen';
@@ -224,18 +138,8 @@ $a->strings['%d message'] = [
 ];
 $a->strings['Personal Notes'] = 'Persönliche Notizen';
 $a->strings['Personal notes are visible only by yourself.'] = 'Persönliche Notizen sind nur für dich sichtbar.';
-$a->strings['Subscribing to contacts'] = 'Kontakten folgen';
-$a->strings['No contact provided.'] = 'Keine Kontakte gefunden.';
-$a->strings['Couldn\'t fetch information for contact.'] = 'Konnte die Kontaktinformationen nicht einholen.';
-$a->strings['Couldn\'t fetch friends for contact.'] = 'Konnte die Kontaktliste des Kontakts nicht abfragen.';
-$a->strings['Couldn\'t fetch following contacts.'] = 'Konnte Liste der gefolgten Kontakte nicht einholen.';
-$a->strings['Couldn\'t fetch remote profile.'] = 'Konnte das entfernte Profil nicht laden.';
-$a->strings['Unsupported network'] = 'Netzwerk wird nicht unterstützt';
-$a->strings['Done'] = 'Erledigt';
-$a->strings['success'] = 'Erfolg';
-$a->strings['failed'] = 'Fehlgeschlagen';
-$a->strings['ignored'] = 'Ignoriert';
-$a->strings['Keep this window open until done.'] = 'Lasse dieses Fenster offen, bis der Vorgang abgeschlossen ist.';
+$a->strings['Save'] = 'Speichern';
+$a->strings['User not found.'] = 'Benutzer nicht gefunden.';
 $a->strings['Photo Albums'] = 'Fotoalben';
 $a->strings['Recent Photos'] = 'Neueste Fotos';
 $a->strings['Upload New Photos'] = 'Neue Fotos hochladen';
@@ -254,12 +158,14 @@ $a->strings['Server can\'t accept new file upload at this time, please contact y
 $a->strings['Image file is empty.'] = 'Bilddatei ist leer.';
 $a->strings['Unable to process image.'] = 'Konnte das Bild nicht bearbeiten.';
 $a->strings['Image upload failed.'] = 'Hochladen des Bildes gescheitert.';
+$a->strings['Public access denied.'] = 'Öffentlicher Zugriff verweigert.';
 $a->strings['No photos selected'] = 'Keine Bilder ausgewählt';
 $a->strings['Access to this item is restricted.'] = 'Zugriff zu diesem Eintrag wurde eingeschränkt.';
 $a->strings['Upload Photos'] = 'Bilder hochladen';
 $a->strings['New album name: '] = 'Name des neuen Albums: ';
 $a->strings['or select existing album:'] = 'oder wähle ein bestehendes Album:';
 $a->strings['Do not show a status post for this upload'] = 'Keine Status-Mitteilung für diesen Beitrag anzeigen';
+$a->strings['Permissions'] = 'Berechtigungen';
 $a->strings['Do you really want to delete this photo album and all its photos?'] = 'Möchtest du wirklich dieses Foto-Album und all seine Foto löschen?';
 $a->strings['Delete Album'] = 'Album löschen';
 $a->strings['Edit Album'] = 'Album bearbeiten';
@@ -288,6 +194,8 @@ $a->strings['Rotate CW (right)'] = 'Drehen US (rechts)';
 $a->strings['Rotate CCW (left)'] = 'Drehen EUS (links)';
 $a->strings['This is you'] = 'Das bist du';
 $a->strings['Comment'] = 'Kommentar';
+$a->strings['Preview'] = 'Vorschau';
+$a->strings['Loading...'] = 'lädt...';
 $a->strings['Select'] = 'Auswählen';
 $a->strings['Delete'] = 'Löschen';
 $a->strings['Like'] = 'Mag ich';
@@ -296,101 +204,6 @@ $a->strings['Dislike'] = 'Mag ich nicht';
 $a->strings['I don\'t like this (toggle)'] = 'Ich mag das nicht (toggle)';
 $a->strings['Map'] = 'Karte';
 $a->strings['View Album'] = 'Album betrachten';
-$a->strings['Bad Request.'] = 'Ungültige Anfrage.';
-$a->strings['Contact not found.'] = 'Kontakt nicht gefunden.';
-$a->strings['[Friendica System Notify]'] = '[Friendica-Systembenachrichtigung]';
-$a->strings['User deleted their account'] = 'Gelöschter Nutzeraccount';
-$a->strings['On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups.'] = 'Ein Nutzer deiner Friendica-Instanz hat seinen Account gelöscht. Bitte stelle sicher, dass dessen Daten aus deinen Backups entfernt werden.';
-$a->strings['The user id is %d'] = 'Die ID des Users lautet %d';
-$a->strings['Remove My Account'] = 'Konto löschen';
-$a->strings['This will completely remove your account. Once this has been done it is not recoverable.'] = 'Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen.';
-$a->strings['Please enter your password for verification:'] = 'Bitte gib dein Passwort zur Verifikation ein:';
-$a->strings['Resubscribing to OStatus contacts'] = 'Erneuern der OStatus-Abonements';
-$a->strings['Error'] = [
-	0 => 'Fehler',
-	1 => 'Fehler',
-];
-$a->strings['Failed to connect with email account using the settings provided.'] = 'Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich.';
-$a->strings['Connected Apps'] = 'Verbundene Programme';
-$a->strings['Name'] = 'Name';
-$a->strings['Home Page'] = 'Homepage';
-$a->strings['Created'] = 'Erstellt';
-$a->strings['Remove authorization'] = 'Autorisierung entziehen';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
-$a->strings['Addon Settings'] = 'Addon Einstellungen';
-$a->strings['No Addon settings configured'] = 'Keine Addon-Einstellungen konfiguriert';
-$a->strings['Additional Features'] = 'Zusätzliche Features';
-$a->strings['Diaspora (Socialhome, Hubzilla)'] = 'Diaspora (Socialhome, Hubzilla)';
-$a->strings['enabled'] = 'eingeschaltet';
-$a->strings['disabled'] = 'ausgeschaltet';
-$a->strings['Built-in support for %s connectivity is %s'] = 'Eingebaute Unterstützung für Verbindungen zu %s ist %s';
-$a->strings['OStatus (GNU Social)'] = 'OStatus (GNU Social)';
-$a->strings['Email access is disabled on this site.'] = 'Zugriff auf E-Mails für diese Seite deaktiviert.';
-$a->strings['None'] = 'Keine';
-$a->strings['Social Networks'] = 'Soziale Netzwerke';
-$a->strings['General Social Media Settings'] = 'Allgemeine Einstellungen zu Sozialen Medien';
-$a->strings['Followed content scope'] = 'Umfang zu folgender Inhalte';
-$a->strings['By default, conversations in which your follows participated but didn\'t start will be shown in your timeline. You can turn this behavior off, or expand it to the conversations in which your follows liked a post.'] = 'Normalerweise werden Unterhaltungen an denen deine Kontakte beteiligt sind, sie aber nicht begonnen haben, in deiner Timeline angezeigt. Mit dieser Einstellung kann dieses Vorgehen kontrolliert werden. Es kann entweder dahin erweitert werden, dass auch Unterhaltungen angezeigt werden in denen deine Kontakte einen Kommentar mögen, oder komplett ausgeschaltet werden, so dass nur noch die Unterhaltungen angezeigt werden, die von deinen Kontakten gestartet wurden.';
-$a->strings['Only conversations my follows started'] = 'Nur Unterhaltungen, die meine Kontakte gestartet haben';
-$a->strings['Conversations my follows started or commented on (default)'] = 'Unterhaltungen an denen meine Kontakte beteiligt sind (Grundeinstellung)';
-$a->strings['Any conversation my follows interacted with, including likes'] = 'Unterhaltungen mit denen meine Kontakte interagiert haben, inklusive likes';
-$a->strings['Enable Content Warning'] = 'Inhaltswarnungen einschalten';
-$a->strings['Users on networks like Mastodon or Pleroma are able to set a content warning field which collapse their post by default. This enables the automatic collapsing instead of setting the content warning as the post title. Doesn\'t affect any other content filtering you eventually set up.'] = 'Benutzer in Netzwerken wie Mastodon oder Pleroma können eine Warnung für sensitive Inhalte ihrer Beiträge erstellen. Mit dieser Option werden derart markierte Beiträge automatisch zusammengeklappt und die Inhaltswarnung wird als Titel des Beitrags angezeigt. Diese Option hat keinen Einfluss auf andere Inhaltsfilterungen, die du eventuell eingerichtet hast.';
-$a->strings['Enable intelligent shortening'] = 'Intelligentes kürzen einschalten';
-$a->strings['Normally the system tries to find the best link to add to shortened posts. If disabled, every shortened post will always point to the original friendica post.'] = 'Normalerweise versucht das System, den besten Link zu finden, um ihn zum gekürzten Postings hinzuzufügen. Wird diese Option ausgewählt, wird stets ein Link auf die originale Friendica-Nachricht beigefügt.';
-$a->strings['Enable simple text shortening'] = 'Einfache Textkürzung aktivieren';
-$a->strings['Normally the system shortens posts at the next line feed. If this option is enabled then the system will shorten the text at the maximum character limit.'] = 'Normalerweise kürzt das System Beiträge bei Zeilenumbrüchen. Ist diese Option aktiv, wird das System die Kürzung beim Erreichen der maximalen Zeichenzahl vornehmen.';
-$a->strings['Attach the link title'] = 'Link Titel hinzufügen';
-$a->strings['When activated, the title of the attached link will be added as a title on posts to Diaspora. This is mostly helpful with "remote-self" contacts that share feed content.'] = 'Ist dies aktiviert, wird der Titel von angehangenen Links bei Beiträgen nach Diaspora* angefügt. Dies ist vorallem bei Entfernten Konten nützlich die Beiträge von Feeds weiterleiten.';
-$a->strings['Your legacy ActivityPub/GNU Social account'] = 'Dein alter ActivityPub/GNU Social-Account';
-$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.'] = 'Wenn du deinen alten ActivityPub oder GNU Social/Statusnet-Account-Namen hier angibst (Format name@domain.tld), werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden.';
-$a->strings['Repair OStatus subscriptions'] = 'OStatus-Abonnements reparieren';
-$a->strings['Email/Mailbox Setup'] = 'E-Mail/Postfach-Einstellungen';
-$a->strings['If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox.'] = 'Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an.';
-$a->strings['Last successful email check:'] = 'Letzter erfolgreicher E-Mail-Check';
-$a->strings['IMAP server name:'] = 'IMAP-Server-Name:';
-$a->strings['IMAP port:'] = 'IMAP-Port:';
-$a->strings['Security:'] = 'Sicherheit:';
-$a->strings['Email login name:'] = 'E-Mail-Login-Name:';
-$a->strings['Email password:'] = 'E-Mail-Passwort:';
-$a->strings['Reply-to address:'] = 'Reply-to Adresse:';
-$a->strings['Send public posts to all email contacts:'] = 'Sende öffentliche Beiträge an alle E-Mail-Kontakte:';
-$a->strings['Action after import:'] = 'Aktion nach Import:';
-$a->strings['Mark as seen'] = 'Als gelesen markieren';
-$a->strings['Move to folder'] = 'In einen Ordner verschieben';
-$a->strings['Move to folder:'] = 'In diesen Ordner verschieben:';
-$a->strings['No suggestions available. If this is a new site, please try again in 24 hours.'] = 'Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal.';
-$a->strings['Friend Suggestions'] = 'Kontaktvorschläge';
-$a->strings['photo'] = 'Foto';
-$a->strings['status'] = 'Status';
-$a->strings['%1$s tagged %2$s\'s %3$s with %4$s'] = '%1$s hat %2$ss %3$s mit %4$s getaggt';
-$a->strings['Remove Item Tag'] = 'Gegenstands-Tag entfernen';
-$a->strings['Select a tag to remove: '] = 'Wähle ein Tag zum Entfernen aus: ';
-$a->strings['Remove'] = 'Entfernen';
-$a->strings['User imports on closed servers can only be done by an administrator.'] = 'Auf geschlossenen Servern können ausschließlich die Administratoren Benutzerkonten importieren.';
-$a->strings['This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.'] = 'Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal.';
-$a->strings['Import'] = 'Import';
-$a->strings['Move account'] = 'Account umziehen';
-$a->strings['You can import an account from another Friendica server.'] = 'Du kannst einen Account von einem anderen Friendica Server importieren.';
-$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.'] = 'Du musst deinen Account vom alten Server exportieren und hier hochladen. Wir stellen deinen alten Account mit all deinen Kontakten wieder her. Wir werden auch versuchen, deine Kontakte darüber zu informieren, dass du hierher umgezogen bist.';
-$a->strings['This feature is experimental. We can\'t import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora'] = 'Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus-Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren';
-$a->strings['Account file'] = 'Account-Datei';
-$a->strings['To export your account, go to "Settings->Export your personal data" and select "Export account"'] = 'Um Deinen Account zu exportieren, rufe "Einstellungen -> Persönliche Daten exportieren" auf und wähle "Account exportieren"';
-$a->strings['You aren\'t following this contact.'] = 'Du folgst diesem Kontakt.';
-$a->strings['Unfollowing is currently not supported by your network.'] = 'Bei diesem Netzwerk wird das Entfolgen derzeit nicht unterstützt.';
-$a->strings['Disconnect/Unfollow'] = 'Verbindung lösen/Nicht mehr folgen';
-$a->strings['Contact was successfully unfollowed'] = 'Kontakt wurde erfolgreich entfolgt.';
-$a->strings['Unable to unfollow this contact, please contact your administrator'] = 'Konnte dem Kontakt nicht entfolgen. Bitte kontaktiere deinen Administrator.';
-$a->strings['Invalid request.'] = 'Ungültige Anfrage';
-$a->strings['Sorry, maybe your upload is bigger than the PHP configuration allows'] = 'Entschuldige, die Datei scheint größer zu sein, als es die PHP-Konfiguration erlaubt.';
-$a->strings['Or - did you try to upload an empty file?'] = 'Oder - hast du versucht, eine leere Datei hochzuladen?';
-$a->strings['File exceeds size limit of %s'] = 'Die Datei ist größer als das erlaubte Limit von %s';
-$a->strings['File upload failed.'] = 'Hochladen der Datei fehlgeschlagen.';
-$a->strings['Wall Photos'] = 'Pinnwand-Bilder';
-$a->strings['Number of daily wall messages for %s exceeded. Message failed.'] = 'Maximale Anzahl der täglichen Pinnwand-Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen.';
-$a->strings['Unable to check your home location.'] = 'Konnte Deinen Heimatort nicht bestimmen.';
-$a->strings['No recipient.'] = 'Kein Empfänger.';
-$a->strings['If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders.'] = 'Wenn du möchtest, dass %s dir antworten kann, überprüfe deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern.';
 $a->strings['No system theme config value set.'] = 'Es wurde kein Konfigurationswert für das systemweite Theme gesetzt.';
 $a->strings['Apologies but the website is unavailable at the moment.'] = 'Entschuldigung, aber die Webseite ist derzeit nicht erreichbar.';
 $a->strings['Delete this item?'] = 'Diesen Beitrag löschen?';
@@ -437,6 +250,7 @@ $a->strings['Done.'] = 'Erledigt.';
 $a->strings['Execute pending post updates.'] = 'Ausstehende Post-Updates ausführen';
 $a->strings['All pending post updates are done.'] = 'Alle ausstehenden Post-Updates wurden ausgeführt.';
 $a->strings['Enter user nickname: '] = 'Spitzname angeben:';
+$a->strings['User not found'] = 'Nutzer nicht gefunden';
 $a->strings['Enter new password: '] = 'Neues Passwort eingeben:';
 $a->strings['Password update failed. Please try again.'] = 'Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal.';
 $a->strings['Password changed.'] = 'Passwort geändert.';
@@ -504,9 +318,30 @@ $a->strings['Delete item(s)?'] = 'Einträge löschen?';
 $a->strings['Created at'] = 'Erstellt am';
 $a->strings['New Post'] = 'Neuer Beitrag';
 $a->strings['Share'] = 'Teilen';
+$a->strings['upload photo'] = 'Bild hochladen';
+$a->strings['Attach file'] = 'Datei anhängen';
+$a->strings['attach file'] = 'Datei anhängen';
+$a->strings['Bold'] = 'Fett';
+$a->strings['Italic'] = 'Kursiv';
+$a->strings['Underline'] = 'Unterstrichen';
+$a->strings['Quote'] = 'Zitat';
+$a->strings['Code'] = 'Code';
 $a->strings['Image'] = 'Bild';
+$a->strings['Link'] = 'Link';
+$a->strings['Link or Media'] = 'Link oder Mediendatei';
 $a->strings['Video'] = 'Video';
+$a->strings['Set your location'] = 'Deinen Standort festlegen';
+$a->strings['set location'] = 'Ort setzen';
+$a->strings['Clear browser location'] = 'Browser-Standort leeren';
+$a->strings['clear location'] = 'Ort löschen';
+$a->strings['Set title'] = 'Titel setzen';
+$a->strings['Categories (comma-separated list)'] = 'Kategorien (kommasepariert)';
 $a->strings['Scheduled at'] = 'Geplant für';
+$a->strings['Permission settings'] = 'Berechtigungseinstellungen';
+$a->strings['Public post'] = 'Öffentlicher Beitrag';
+$a->strings['Message'] = 'Nachricht';
+$a->strings['Browser'] = 'Browser';
+$a->strings['Open Compose page'] = 'Composer Seite öffnen';
 $a->strings['Pinned item'] = 'Angehefteter Beitrag';
 $a->strings['View %s\'s profile @ %s'] = 'Das Profil von %s auf %s betrachten.';
 $a->strings['Categories:'] = 'Kategorien:';
@@ -559,6 +394,9 @@ $a->strings['External link to forum'] = 'Externer Link zum Forum';
 $a->strings['show less'] = 'weniger anzeigen';
 $a->strings['show more'] = 'mehr anzeigen';
 $a->strings['event'] = 'Veranstaltung';
+$a->strings['status'] = 'Status';
+$a->strings['photo'] = 'Foto';
+$a->strings['%1$s tagged %2$s\'s %3$s with %4$s'] = '%1$s hat %2$ss %3$s mit %4$s getaggt';
 $a->strings['Follow Thread'] = 'Folge der Unterhaltung';
 $a->strings['View Status'] = 'Status anschauen';
 $a->strings['View Profile'] = 'Profil anschauen';
@@ -569,6 +407,7 @@ $a->strings['Send PM'] = 'Private Nachricht senden';
 $a->strings['Block'] = 'Sperren';
 $a->strings['Ignore'] = 'Ignorieren';
 $a->strings['Languages'] = 'Sprachen';
+$a->strings['Connect/Follow'] = 'Verbinden/Folgen';
 $a->strings['Nothing new here'] = 'Keine Neuigkeiten';
 $a->strings['Go back'] = 'Geh zurück';
 $a->strings['Clear notifications'] = 'Bereinige Benachrichtigungen';
@@ -584,10 +423,12 @@ $a->strings['Your profile page'] = 'Deine Profilseite';
 $a->strings['Your photos'] = 'Deine Fotos';
 $a->strings['Media'] = 'Medien';
 $a->strings['Your postings with media'] = 'Deine Beiträge die Medien beinhalten';
-$a->strings['Your events'] = 'Deine Ereignisse';
+$a->strings['Calendar'] = 'Kalender';
+$a->strings['Your calendar'] = 'Dein Kalender';
 $a->strings['Personal notes'] = 'Persönliche Notizen';
 $a->strings['Your personal notes'] = 'Deine persönlichen Notizen';
 $a->strings['Home'] = 'Pinnwand';
+$a->strings['Home Page'] = 'Homepage';
 $a->strings['Register'] = 'Registrieren';
 $a->strings['Create an account'] = 'Nutzerkonto erstellen';
 $a->strings['Help'] = 'Hilfe';
@@ -601,7 +442,6 @@ $a->strings['Tags'] = 'Tags';
 $a->strings['Contacts'] = 'Kontakte';
 $a->strings['Community'] = 'Gemeinschaft';
 $a->strings['Conversations on this and other servers'] = 'Unterhaltungen auf diesem und anderen Servern';
-$a->strings['Events and Calendar'] = 'Ereignisse und Kalender';
 $a->strings['Directory'] = 'Verzeichnis';
 $a->strings['People directory'] = 'Nutzerverzeichnis';
 $a->strings['Information'] = 'Information';
@@ -614,6 +454,7 @@ $a->strings['Introductions'] = 'Kontaktanfragen';
 $a->strings['Friend Requests'] = 'Kontaktanfragen';
 $a->strings['Notifications'] = 'Benachrichtigungen';
 $a->strings['See all notifications'] = 'Alle Benachrichtigungen anzeigen';
+$a->strings['Mark as seen'] = 'Als gelesen markieren';
 $a->strings['Mark all system notifications as seen'] = 'Markiere alle Systembenachrichtigungen als gelesen';
 $a->strings['Private mail'] = 'Private E-Mail';
 $a->strings['Inbox'] = 'Eingang';
@@ -625,6 +466,8 @@ $a->strings['Account settings'] = 'Kontoeinstellungen';
 $a->strings['Manage/edit friends and contacts'] = 'Freunde und Kontakte verwalten/bearbeiten';
 $a->strings['Admin'] = 'Administration';
 $a->strings['Site setup and configuration'] = 'Einstellungen der Seite und Konfiguration';
+$a->strings['Moderation'] = 'Moderation';
+$a->strings['Content and user moderation'] = 'Moderation von Nutzern und Inhalten';
 $a->strings['Navigation'] = 'Navigation';
 $a->strings['Site map'] = 'Sitemap';
 $a->strings['Embedding disabled'] = 'Einbettungen deaktiviert';
@@ -656,6 +499,7 @@ $a->strings['Find People'] = 'Leute finden';
 $a->strings['Enter name or interest'] = 'Name oder Interessen eingeben';
 $a->strings['Examples: Robert Morgenstein, Fishing'] = 'Beispiel: Robert Morgenstein, Angeln';
 $a->strings['Find'] = 'Finde';
+$a->strings['Friend Suggestions'] = 'Kontaktvorschläge';
 $a->strings['Similar Interests'] = 'Ähnliche Interessen';
 $a->strings['Random Profile'] = 'Zufälliges Profil';
 $a->strings['Invite Friends'] = 'Freunde einladen';
@@ -698,6 +542,7 @@ $a->strings['Trending Tags (last %d hour)'] = [
 $a->strings['More Trending Tags'] = 'mehr Trending Tags';
 $a->strings['XMPP:'] = 'XMPP:';
 $a->strings['Matrix:'] = 'Matrix:';
+$a->strings['Location:'] = 'Ort:';
 $a->strings['Network:'] = 'Netzwerk:';
 $a->strings['Unfollow'] = 'Entfolgen';
 $a->strings['Yourself'] = 'Du selbst';
@@ -709,6 +554,8 @@ $a->strings['Limited/Private'] = 'Begrenzt/Privat';
 $a->strings['This content will be shown only to the people in the first box, to the exception of the people mentioned in the second box. It won\'t appear anywhere public.'] = 'Dieser Inhalt wird außschließlich den Kontakten gezeigt, die du in der ersten Box ausgewählt hast, mit den Ausnahmen derer die du in der zweiten Box auflistest. Er wird nicht öffentlich zugänglich sein.';
 $a->strings['Show to:'] = 'Sichtbar für:';
 $a->strings['Except to:'] = 'Ausgenommen:';
+$a->strings['CC: email addresses'] = 'Cc: E-Mail-Addressen';
+$a->strings['Example: bob@example.com, mary@example.com'] = 'Z.B.: bob@example.com, mary@example.com';
 $a->strings['Connectors'] = 'Connectoren';
 $a->strings['The database configuration file "config/local.config.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'] = 'Die Datenbankkonfigurationsdatei "config/local.config.php" konnte nicht erstellt werden. Um eine Konfigurationsdatei in Ihrem Webserver-Verzeichnis zu erstellen, gehe wie folgt vor.';
 $a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'Möglicherweise musst du die Datei "database.sql" manuell mit phpmyadmin oder mysql importieren.';
@@ -837,18 +684,8 @@ Das Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es n
 $a->strings['The error message is\n[pre]%s[/pre]'] = 'Die Fehlermeldung lautet [pre]%s[/pre]';
 $a->strings['[Friendica Notify] Database update'] = '[Friendica-Benachrichtigung]: Datenbank Update';
 $a->strings['
-					The friendica database was successfully updated from %s to %s.'] = '
- 					Die Friendica Datenbank wurde erfolgreich von %s auf %s aktualisiert.';
-$a->strings['Error decoding account file'] = 'Fehler beim Verarbeiten der Account-Datei';
-$a->strings['Error! No version data in file! This is not a Friendica account file?'] = 'Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica-Account-Datei?';
-$a->strings['User \'%s\' already exists on this server!'] = 'Nutzer \'%s\' existiert bereits auf diesem Server!';
-$a->strings['User creation error'] = 'Fehler beim Anlegen des Nutzer-Accounts aufgetreten';
-$a->strings['%d contact not imported'] = [
-	0 => '%d Kontakt nicht importiert',
-	1 => '%d Kontakte nicht importiert',
-];
-$a->strings['User profile creation error'] = 'Fehler beim Anlegen des Nutzer-Profils';
-$a->strings['Done. You can now login with your username and password'] = 'Erledigt. Du kannst dich jetzt mit deinem Nutzernamen und Passwort anmelden';
+				The friendica database was successfully updated from %s to %s.'] = '
+				Die Friendica Datenbank wurde erfolgreich von %s auf %s aktualisiert.';
 $a->strings['The database version had been set to %s.'] = 'Die Datenbank Version wurde auf %s gesetzt.';
 $a->strings['The post update is at version %d, it has to be at %d to safely drop the tables.'] = 'Das post-update ist auf der Version %d. Damit die Tabellen sicher entfernt werden können muss es die Version %d haben.';
 $a->strings['No unused tables found.'] = 'Keine Tabellen gefunden die nicht verwendet werden.';
@@ -871,7 +708,6 @@ $a->strings['Unauthorized'] = 'Nicht autorisiert';
 $a->strings['Token is not authorized with a valid user or is missing a required scope'] = 'Token ist nicht durch einen gültigen Benutzer autorisiert oder es fehlt ein erforderlicher Geltungsbereich';
 $a->strings['Internal Server Error'] = 'Interner Serverfehler';
 $a->strings['Legacy module file not found: %s'] = 'Legacy-Moduldatei nicht gefunden: %s';
-$a->strings['UnFollow'] = 'Entfolgen';
 $a->strings['Approve'] = 'Genehmigen';
 $a->strings['Organisation'] = 'Organisation';
 $a->strings['Forum'] = 'Forum';
@@ -893,7 +729,13 @@ $a->strings['Starts:'] = 'Beginnt:';
 $a->strings['Finishes:'] = 'Endet:';
 $a->strings['all-day'] = 'ganztägig';
 $a->strings['Sept'] = 'Sep';
+$a->strings['today'] = 'Heute';
+$a->strings['month'] = 'Monat';
+$a->strings['week'] = 'Woche';
+$a->strings['day'] = 'Tag';
 $a->strings['No events to display'] = 'Keine Veranstaltung zum Anzeigen';
+$a->strings['Access to this profile has been restricted.'] = 'Der Zugriff zu diesem Profil wurde eingeschränkt.';
+$a->strings['Event not found.'] = 'Veranstaltung nicht gefunden.';
 $a->strings['l, F j'] = 'l, F j';
 $a->strings['Edit event'] = 'Veranstaltung bearbeiten';
 $a->strings['Duplicate event'] = 'Veranstaltung kopieren';
@@ -940,11 +782,13 @@ $a->strings['%d voter.'] = [
 $a->strings['Poll end: %s'] = 'Abstimmung endet: %s';
 $a->strings['View on separate page'] = 'Auf separater Seite ansehen';
 $a->strings['[no subject]'] = '[kein Betreff]';
+$a->strings['Wall Photos'] = 'Pinnwand-Bilder';
 $a->strings['Edit profile'] = 'Profil bearbeiten';
 $a->strings['Change profile photo'] = 'Profilbild ändern';
 $a->strings['Homepage:'] = 'Homepage:';
 $a->strings['About:'] = 'Über:';
 $a->strings['Atom feed'] = 'Atom-Feed';
+$a->strings['This website has been verified to belong to the same person.'] = 'Die Webseite wurde verifiziert und gehört der gleichen Person.';
 $a->strings['F d'] = 'd. F';
 $a->strings['[today]'] = '[heute]';
 $a->strings['Birthday Reminders'] = 'Geburtstagserinnerungen';
@@ -1040,7 +884,7 @@ $a->strings['
 		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
+		If you ever want to delete your account, you can do so at %1$s/settings/removeme
 
 		Thank you and welcome to %4$s.'] = '
 Nachfolgend die Anmeldedetails:
@@ -1051,7 +895,7 @@ Passwort: %3$s
 
 Du kannst dein Passwort unter "Einstellungen" ändern, sobald du dich angemeldet hast.Bitte nimm dir ein paar Minuten, um die anderen Einstellungen auf dieser Seite zu kontrollieren.Eventuell magst du ja auch einige Informationen über dich in deinem Profil veröffentlichen, damit andere Leute dich einfacher finden können.Bearbeite hierfür einfach dein Standard-Profil (über die Profil-Seite).Wir empfehlen dir, deinen kompletten Namen anzugeben und ein zu dir passendes Profilbild zu wählen, damit dich alte Bekannte wiederfinden.Außerdem ist es nützlich, wenn du auf deinem Profil Schlüsselwörter angibst. Das erleichtert es, Leute zu finden, die deine Interessen teilen.Wir respektieren deine Privatsphäre - keine dieser Angaben ist nötig.Wenn du neu im Netzwerk bist und noch niemanden kennst, dann können sie allerdings dabei helfen, neue und interessante Kontakte zu knüpfen.
 
-Du kannst dein Nutzerkonto  jederzeit unter %1$s/removeme wieder löschen.
+Du kannst dein Nutzerkonto  jederzeit unter %1$s/settings/removeme wieder löschen.
 
 Danke und willkommen auf %4$s.';
 $a->strings['Registration details for %s'] = 'Details der Registration von %s';
@@ -1106,7 +950,7 @@ $a->strings['
 			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
+			If you ever want to delete your account, you can do so at %3$s/settings/removeme
 
 			Thank you and welcome to %2$s.'] = '
 Die Anmelde-Details sind die folgenden:
@@ -1133,19 +977,9 @@ Wir respektieren deine Privatsphäre - keine dieser Angaben ist nötig.
 Wenn du neu im Netzwerk bist und noch niemanden kennst, dann können sie
 allerdings dabei helfen, neue und interessante Kontakte zu knüpfen.
 
-Solltest du dein Nutzerkonto löschen wollen, kannst du dies unter %3$s/removeme jederzeit tun.
+Solltest du dein Nutzerkonto löschen wollen, kannst du dies unter %3$s/settings/removeme jederzeit tun.
 
 Danke für deine Aufmerksamkeit und willkommen auf %2$s.';
-$a->strings['[%s] Notice of remote server domain pattern block list update'] = '[%s] Die Liste der blockierten Domain Muster wurde aktualisiert';
-$a->strings['Dear %s,
-
-You are receiving this email because the Friendica node at %s where you are registered as a user updated their remote server domain pattern block list.
-
-Please review the updated list at %s at your earliest convenience.'] = 'Hallo %s,
-
-du erhällst diese EMail, da du auf dem Friendica Knoten %s einen Account besitzt. Die Blockliste für gesperrte Knoten wurde aktualisiert.
-
-Die Änderungen an der Blockliste kannst du unter %s einsehen.';
 $a->strings['Addon not found.'] = 'Addon nicht gefunden.';
 $a->strings['Addon %s disabled.'] = 'Addon %s ausgeschaltet.';
 $a->strings['Addon %s enabled.'] = 'Addon %s eingeschaltet.';
@@ -1158,122 +992,9 @@ $a->strings['Author: '] = 'Autor:';
 $a->strings['Maintainer: '] = 'Betreuer:';
 $a->strings['Addons reloaded'] = 'Addons neu geladen';
 $a->strings['Addon %s failed to install.'] = 'Addon %s konnte nicht installiert werden';
+$a->strings['Save Settings'] = 'Einstellungen speichern';
 $a->strings['Reload active addons'] = 'Aktivierte Addons neu laden';
 $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'] = 'Es sind derzeit keine Addons auf diesem Knoten verfügbar. Du findest das offizielle Addon-Repository unter %1$s und weitere eventuell interessante Addons im offenen Addon-Verzeichnis auf %2$s.';
-$a->strings['List of all users'] = 'Liste aller Benutzerkonten';
-$a->strings['Active'] = 'Aktive';
-$a->strings['List of active accounts'] = 'Liste der aktiven Benutzerkonten';
-$a->strings['Pending'] = 'Ausstehend';
-$a->strings['List of pending registrations'] = 'Liste der anstehenden Benutzerkonten';
-$a->strings['Blocked'] = 'Geblockt';
-$a->strings['List of blocked users'] = 'Liste der geblockten Benutzer';
-$a->strings['Deleted'] = 'Gelöscht';
-$a->strings['List of pending user deletions'] = 'Liste der auf Löschung wartenden Benutzer';
-$a->strings['Normal Account Page'] = 'Normales Konto';
-$a->strings['Soapbox Page'] = 'Marktschreier-Konto';
-$a->strings['Public Forum'] = 'Öffentliches Forum';
-$a->strings['Automatic Friend Page'] = 'Automatische Freunde-Seite';
-$a->strings['Private Forum'] = 'Privates Forum';
-$a->strings['Personal Page'] = 'Persönliche Seite';
-$a->strings['Organisation Page'] = 'Organisationsseite';
-$a->strings['News Page'] = 'Nachrichtenseite';
-$a->strings['Community Forum'] = 'Gemeinschaftsforum';
-$a->strings['Relay'] = 'Relais';
-$a->strings['You can\'t block a local contact, please block the user instead'] = 'Lokale Kontakte können nicht geblockt werden. Bitte blocke den Nutzer stattdessen.';
-$a->strings['%s contact unblocked'] = [
-	0 => '%sKontakt wieder freigegeben',
-	1 => '%sKontakte wieder freigegeben',
-];
-$a->strings['Remote Contact Blocklist'] = 'Blockliste entfernter Kontakte';
-$a->strings['This page allows you to prevent any message from a remote contact to reach your node.'] = 'Auf dieser Seite kannst du Accounts von anderen Knoten blockieren und damit verhindern, dass ihre Beiträge von deinem Knoten angenommen werden.';
-$a->strings['Block Remote Contact'] = 'Blockiere entfernten Kontakt';
-$a->strings['select all'] = 'Alle auswählen';
-$a->strings['select none'] = 'Auswahl aufheben';
-$a->strings['Unblock'] = 'Entsperren';
-$a->strings['No remote contact is blocked from this node.'] = 'Derzeit werden keine Kontakte auf diesem Knoten blockiert.';
-$a->strings['Blocked Remote Contacts'] = 'Blockierte Kontakte von anderen Knoten';
-$a->strings['Block New Remote Contact'] = 'Blockieren von weiteren Kontakten';
-$a->strings['Photo'] = 'Foto:';
-$a->strings['Reason'] = 'Grund';
-$a->strings['%s total blocked contact'] = [
-	0 => 'Insgesamt %s blockierter Kontakt',
-	1 => 'Insgesamt %s blockierte Kontakte',
-];
-$a->strings['URL of the remote contact to block.'] = 'Die URL des entfernten Kontakts, der blockiert werden soll.';
-$a->strings['Also purge contact'] = 'Kontakt auch löschen';
-$a->strings['Removes all content related to this contact from the node. Keeps the contact record. This action cannot be undone.'] = 'Entfernt alle Inhalte von diesem Knoten, die in Verbindung zu dem Kontakt stehen. Der Kontakt-Eintrag bleibt erhalten. Dieser Vorgang kann nicht rückgängig gemacht werden.';
-$a->strings['Block Reason'] = 'Sperrgrund';
-$a->strings['Server domain pattern added to the blocklist.'] = 'Server Domain Muster zur Blockliste hinzugefügt';
-$a->strings['%s server scheduled to be purged.'] = [
-	0 => '%s Server für die Löschung eingeplant.',
-	1 => '%s Server für die Löschung eingeplant.',
-];
-$a->strings['← Return to the list'] = '← zurück zur Liste';
-$a->strings['Block A New Server Domain Pattern'] = 'Neues Domainmuster blockieren';
-$a->strings['<p>The server domain pattern syntax is case-insensitive shell wildcard, comprising the following special characters:</p>
-<ul>
-	<li><code>*</code>: Any number of characters</li>
-	<li><code>?</code>: Any single character</li>
-</ul>'] = '<p>Die Syntax für das Domainmuster ist unabhängig von der Groß-/Kleinschreibung. Shell Willdcards bestehen aus den folgenden Zeichen:</p>
-<ul>
-<li><code>*</code>: Eine beliebige Anzahl von Zeichen</li>
-<li><code>?</code>: Ein einzelnes Zeichen</li>
-</ul>';
-$a->strings['Check pattern'] = 'Muster überprüfen';
-$a->strings['Matching known servers'] = 'Passende bekannte Server';
-$a->strings['Server Name'] = 'Server Name';
-$a->strings['Server Domain'] = 'Server Domain';
-$a->strings['Known Contacts'] = 'Bekannte Kontakte';
-$a->strings['%d known server'] = [
-	0 => '%d bekannter Server',
-	1 => '%d bekannte Server',
-];
-$a->strings['Add pattern to the blocklist'] = 'Muster zur Blockliste hinzufügen';
-$a->strings['Server Domain Pattern'] = 'Server Domain Muster';
-$a->strings['The domain pattern of the new server to add to the blocklist. Do not include the protocol.'] = 'Das Muster zur Erkennung der Domain, das zur Blockliste hinzugefügt werden soll. Das Protokoll nicht mir angeben.';
-$a->strings['Purge server'] = 'Server entfernen';
-$a->strings['Also purges all the locally stored content authored by the known contacts registered on that server. Keeps the contacts and the server records. This action cannot be undone.'] = [
-	0 => 'Sollen die Inhalte der bekannten Kontakte die auf diesem Server registriert sind, auch lokal gelöscht werden. Die Kontakt- und Server-Einträge verbleiben in der Datenbank deines Servers. Diese Aktion kann nicht rückgängig gemacht werden.',
-	1 => 'Sollen die Inhalte der bekannten Kontakte die auf diesen Servern registriert sind, auch lokal gelöscht werden. Die Kontakt- und Server-Einträge verbleiben in der Datenbank deines Servers. Diese Aktion kann nicht rückgängig gemacht werden.',
-];
-$a->strings['Block reason'] = 'Begründung der Blockierung';
-$a->strings['The reason why you blocked this server domain pattern. This reason will be shown publicly in the server information page.'] = 'Warum werden Server die diesem Domainmuster entsprechen geblockt? Die Begründung wird öffentlich auf der Server-Informationsseite sichtbar sein.';
-$a->strings['Error importing pattern file'] = 'Fehler beim Import der Muster Datei';
-$a->strings['Local blocklist replaced with the provided file.'] = 'Lokale Blockliste wurde durch die bereitgestellte Datei ersetzt.';
-$a->strings['%d pattern was added to the local blocklist.'] = [
-	0 => '%d Muster wurde zur lokalen Blockliste hinzugefügt.',
-	1 => '%d Muster wurden zur lokalen Blockliste hinzugefügt.',
-];
-$a->strings['No pattern was added to the local blocklist.'] = 'Kein Muster wurde zur lokalen Blockliste hinzugefügt.';
-$a->strings['Import a Server Domain Pattern Blocklist'] = 'Server Domain Muster Blockliste importieren';
-$a->strings['<p>This file can be downloaded from the <code>/friendica</code> path of any Friendica server.</p>'] = '<p>Diese Datei kann vom <code>/friendica</code> Pfad auf jedem  Friendica Server heruntergeladen werden.</p>';
-$a->strings['Upload file'] = 'Datei hochladen';
-$a->strings['Patterns to import'] = 'Zu importierende Muster';
-$a->strings['Domain Pattern'] = 'Domain Muster';
-$a->strings['Import Mode'] = 'Importmodus';
-$a->strings['Import Patterns'] = 'Muster importieren';
-$a->strings['%d total pattern'] = [
-	0 => '%dMuster gesamt',
-	1 => '%dMuster gesamt',
-];
-$a->strings['Server domain pattern blocklist CSV file'] = 'Server Domain Muster Blockliste CSV-Datei';
-$a->strings['Append'] = 'Anhängen';
-$a->strings['Imports patterns from the file that weren\'t already existing in the current blocklist.'] = 'Importiert Muster aus der Datei, die nicht bereits in der aktuellen Blockliste vorhanden waren.';
-$a->strings['Replace'] = 'Ersetzen';
-$a->strings['Replaces the current blocklist by the imported patterns.'] = 'Ersetzt die aktuelle Blockliste durch die importierten Muster.';
-$a->strings['Blocked server domain pattern'] = 'Blockierte Server Domain Muster';
-$a->strings['Reason for the block'] = 'Begründung für die Blockierung';
-$a->strings['Delete server domain pattern'] = 'Server Domain Muster löschen';
-$a->strings['Check to delete this entry from the blocklist'] = 'Markieren, um diesen Eintrag von der Blocklist zu entfernen';
-$a->strings['Server Domain Pattern Blocklist'] = 'Server Domain Muster Blockliste';
-$a->strings['This page can be used to define a blocklist of server domain patterns from the federated network that are not allowed to interact with your node. For each domain pattern you should also provide the reason why you block it.'] = 'Auf dieser Seite kannst du Muster definieren mit denen Server Domains aus dem föderierten Netzwerk daran gehindert werden mit deiner Instanz zu interagieren. Es ist ratsam für jedes Muster anzugeben, warum du es zur Blockliste hinzugefügt hast.';
-$a->strings['The list of blocked server domain patterns will be made publically available on the <a href="/friendica">/friendica</a> page so that your users and people investigating communication problems can find the reason easily.'] = 'Die Liste der blockierten Domain Muster wird auf der Seite <a href="/friendica">/friendica</a> öffentlich einsehbar gemacht, damit deine Nutzer und Personen, die Kommunikationsprobleme erkunden, die Ursachen einfach finden können.';
-$a->strings['Import server domain pattern blocklist'] = 'Server Domain Muster Blockliste importieren';
-$a->strings['Add new entry to the blocklist'] = 'Neuen Eintrag in die Blockliste';
-$a->strings['Save changes to the blocklist'] = 'Änderungen der Blockliste speichern';
-$a->strings['Current Entries in the Blocklist'] = 'Aktuelle Einträge der Blockliste';
-$a->strings['Delete entry from the blocklist'] = 'Eintrag von der Blockliste entfernen';
-$a->strings['Delete entry from the blocklist?'] = 'Eintrag von der Blockliste entfernen?';
 $a->strings['Update has been marked successful'] = 'Update wurde als erfolgreich markiert';
 $a->strings['Database structure update %s was successfully applied.'] = 'Das Update %s der Struktur der Datenbank wurde erfolgreich angewandt.';
 $a->strings['Executing of database structure update %s failed with error: %s'] = 'Das Update %s der Struktur der Datenbank schlug mit folgender Fehlermeldung fehl: %s';
@@ -1325,24 +1046,6 @@ $a->strings['Currently this node is aware of %2$s node (%3$s active users last m
 	0 => 'Derzeit kennt dieser Knoten %2$s andere Knoten (mit %3$s aktiven Nutzern im letzten Monat, %4$s aktiven Nutzern im letzten halben Jahr, %5$s registrierten Nutzern insgesamt) von den folgenden Plattformen:',
 	1 => 'Derzeit kennt dieser Knoten %2$s andere Knoten (mit %3$s aktiven Nutzern im letzten Monat, %4$s aktiven Nutzern im letzten halben Jahr, %5$s registrierten Nutzern insgesamt) von den folgenden Plattformen:',
 ];
-$a->strings['Item marked for deletion.'] = 'Eintrag wurden zur Löschung markiert';
-$a->strings['Delete Item'] = 'Eintrag löschen';
-$a->strings['Delete this Item'] = 'Diesen Eintrag löschen';
-$a->strings['On this page you can delete an item from your node. If the item is a top level posting, the entire thread will be deleted.'] = 'Auf dieser Seite kannst du Einträge von deinem Knoten löschen. Wenn der Eintrag der Anfang einer Diskussion ist, wird der gesamte Diskussionsverlauf gelöscht.';
-$a->strings['You need to know the GUID of the item. You can find it e.g. by looking at the display URL. The last part of http://example.com/display/123456 is the GUID, here 123456.'] = 'Zur Löschung musst du die GUID des Eintrags kennen. Diese findest du z.B. durch die /display URL des Eintrags. Der letzte Teil der URL ist die GUID. Lautet die URL beispielsweise http://example.com/display/123456, ist die GUID 123456.';
-$a->strings['GUID'] = 'GUID';
-$a->strings['The GUID of the item you want to delete.'] = 'Die GUID des zu löschenden Eintrags';
-$a->strings['Item Source'] = 'Beitrags Quelle';
-$a->strings['Item Guid'] = 'Beitrags-Guid';
-$a->strings['Item Id'] = 'Item Id';
-$a->strings['Item URI'] = 'Item URI';
-$a->strings['Terms'] = 'Terms';
-$a->strings['Tag'] = 'Tag';
-$a->strings['Type'] = 'Typ';
-$a->strings['Term'] = 'Term';
-$a->strings['URL'] = 'URL';
-$a->strings['Mention'] = 'Mention';
-$a->strings['Implicit Mention'] = 'Implicit Mention';
 $a->strings['The logfile \'%s\' is not writable. No logging possible'] = 'Die Logdatei \'%s\' ist nicht beschreibbar. Derzeit ist keine Aufzeichnung möglich.';
 $a->strings['PHP log currently enabled.'] = 'PHP Protokollierung ist derzeit aktiviert.';
 $a->strings['PHP log currently disabled.'] = 'PHP Protokollierung ist derzeit nicht aktiviert.';
@@ -1365,6 +1068,7 @@ $a->strings['Context'] = 'Zusammenhang';
 $a->strings['ALL'] = 'ALLE';
 $a->strings['View details'] = 'Details anzeigen';
 $a->strings['Click to view details'] = 'Anklicken zum Anzeigen der Details';
+$a->strings['Event details'] = 'Veranstaltungsdetails';
 $a->strings['Data'] = 'Daten';
 $a->strings['Source'] = 'Quelle';
 $a->strings['File'] = 'Datei';
@@ -1380,6 +1084,7 @@ $a->strings['This page lists the currently queued worker jobs. These jobs are ha
 $a->strings['ID'] = 'ID';
 $a->strings['Command'] = 'Befehl';
 $a->strings['Job Parameters'] = 'Parameter der Aufgabe';
+$a->strings['Created'] = 'Erstellt';
 $a->strings['Priority'] = 'Priorität';
 $a->strings['No special theme for mobile devices'] = 'Kein spezielles Theme für mobile Geräte verwenden.';
 $a->strings['%s - (Experimental)'] = '%s - (Experimentell)';
@@ -1407,6 +1112,7 @@ $a->strings['Republish users to directory'] = 'Nutzer erneut im globalen Verzeic
 $a->strings['Registration'] = 'Registrierung';
 $a->strings['File upload'] = 'Datei hochladen';
 $a->strings['Policies'] = 'Regeln';
+$a->strings['Advanced'] = 'Erweitert';
 $a->strings['Auto Discovered Contact Directory'] = 'Automatisch ein Kontaktverzeichnis erstellen';
 $a->strings['Performance'] = 'Performance';
 $a->strings['Worker'] = 'Worker';
@@ -1495,6 +1201,8 @@ $a->strings['Enable OpenID'] = 'OpenID aktivieren';
 $a->strings['Enable OpenID support for registration and logins.'] = 'OpenID Unterstützung bei der Registrierung und dem Login aktivieren.';
 $a->strings['Enable Fullname check'] = 'Namen auf Vollständigkeit überprüfen';
 $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.'] = 'Erlaubt Nutzern Konten nur dann zu registrieren, bei denen im Namensfeld ein Leerzeichen zur Trennung von Vor- und Nachnamen verwendet wird.';
+$a->strings['Email administrators on new registration'] = 'Email den Administratoren bei neuen Registrierungen';
+$a->strings['If enabled and the system is set to an open registration, an email for each new registration is sent to the administrators.'] = 'Wenn diese Option aktiviert ist und die Registrierung auf offen eingestellt ist, wird den Administratoren bei jeder neuen Registierung eine Email geschickt.';
 $a->strings['Community pages for visitors'] = 'Für Besucher verfügbare Gemeinschaftsseite';
 $a->strings['Which community pages should be available for visitors. Local users always see both pages.'] = 'Welche Gemeinschaftsseiten sollen für Besucher dieses Knotens verfügbar sein? Lokale Nutzer können grundsätzlich beide Seiten verwenden.';
 $a->strings['Posts per user on community page'] = 'Anzahl der Beiträge pro Benutzer auf der Gemeinschaftsseite';
@@ -1604,16 +1312,8 @@ $a->strings['The debug logfile \'%s\' is not usable. No logging possible (error:
 $a->strings['Friendica\'s system.basepath was updated from \'%s\' to \'%s\'. Please remove the system.basepath from your db to avoid differences.'] = 'Friendica\'s system.basepath wurde aktualisiert \'%s\' von \'%s\'. Bitte entferne system.basepath aus der Datenbank um Unterschiede zu vermeiden.';
 $a->strings['Friendica\'s current system.basepath \'%s\' is wrong and the config file \'%s\' isn\'t used.'] = 'Friendica\'s aktueller system.basepath \'%s\' ist verkehrt und die config file \'%s\' wird nicht benutzt.';
 $a->strings['Friendica\'s current system.basepath \'%s\' is not equal to the config file \'%s\'. Please fix your configuration.'] = 'Friendica\'s aktueller system.basepath \'%s\' ist nicht gleich wie die config file \'%s\'. Bitte korrigiere deine Konfiguration.';
-$a->strings['Normal Account'] = 'Normales Konto';
-$a->strings['Automatic Follower Account'] = 'Automatisch folgendes Konto (Marktschreier)';
-$a->strings['Public Forum Account'] = 'Öffentliches Forum-Konto';
-$a->strings['Automatic Friend Account'] = 'Automatische Freunde-Seite';
-$a->strings['Blog Account'] = 'Blog-Konto';
-$a->strings['Private Forum Account'] = 'Privates Forum-Konto';
 $a->strings['Message queues'] = 'Nachrichten-Warteschlangen';
 $a->strings['Server Settings'] = 'Servereinstellungen';
-$a->strings['Registered users'] = 'Registrierte Personen';
-$a->strings['Pending registrations'] = 'Anstehende Anmeldungen';
 $a->strings['Version'] = 'Version';
 $a->strings['Active addons'] = 'Aktivierte Addons';
 $a->strings['Theme %s disabled.'] = 'Theme %s deaktiviert.';
@@ -1634,58 +1334,6 @@ $a->strings['Show some informations regarding the needed information to operate
 $a->strings['Privacy Statement Preview'] = 'Vorschau: Datenschutzerklärung';
 $a->strings['The Terms of Service'] = 'Die Nutzungsbedingungen';
 $a->strings['Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below.'] = 'Füge hier die Nutzungsbedingungen deines Knotens ein. Du kannst BBCode zur Formatierung verwenden. Überschriften sollten [h2] oder darunter sein.';
-$a->strings['%s user blocked'] = [
-	0 => '%s Nutzer blockiert',
-	1 => '%s Nutzer blockiert',
-];
-$a->strings['You can\'t remove yourself'] = 'Du kannst dich nicht selbst löschen!';
-$a->strings['%s user deleted'] = [
-	0 => '%s Nutzer gelöscht',
-	1 => '%s Nutzer gelöscht',
-];
-$a->strings['User "%s" deleted'] = 'Nutzer "%s" gelöscht';
-$a->strings['User "%s" blocked'] = 'Nutzer "%s" blockiert';
-$a->strings['Register date'] = 'Anmeldedatum';
-$a->strings['Last login'] = 'Letzte Anmeldung';
-$a->strings['Last public item'] = 'Letzter öffentliche Beitrag';
-$a->strings['Active Accounts'] = 'Aktive Benutzerkonten';
-$a->strings['User blocked'] = 'Nutzer blockiert.';
-$a->strings['Site admin'] = 'Seitenadministrator';
-$a->strings['Account expired'] = 'Account ist abgelaufen';
-$a->strings['Create a new user'] = 'Neues Benutzerkonto anlegen';
-$a->strings['Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'] = 'Die markierten Nutzer werden gelöscht!\n\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\n\nBist du sicher?';
-$a->strings['The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'] = 'Der Nutzer {0} wird gelöscht!\n\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\n\nBist du sicher?';
-$a->strings['%s user unblocked'] = [
-	0 => '%s Nutzer freigeschaltet',
-	1 => '%s Nutzer freigeschaltet',
-];
-$a->strings['User "%s" unblocked'] = 'Nutzer "%s" frei geschaltet';
-$a->strings['Blocked Users'] = 'Blockierte Benutzer';
-$a->strings['New User'] = 'Neuer Nutzer';
-$a->strings['Add User'] = 'Nutzer hinzufügen';
-$a->strings['Name of the new user.'] = 'Name des neuen Nutzers';
-$a->strings['Nickname'] = 'Spitzname';
-$a->strings['Nickname of the new user.'] = 'Spitznamen für den neuen Nutzer';
-$a->strings['Email address of the new user.'] = 'Email Adresse des neuen Nutzers';
-$a->strings['Users awaiting permanent deletion'] = 'Nutzer wartet auf permanente Löschung';
-$a->strings['Permanent deletion'] = 'Permanent löschen';
-$a->strings['Users'] = 'Nutzer';
-$a->strings['User waiting for permanent deletion'] = 'Nutzer wartet auf permanente Löschung';
-$a->strings['%s user approved'] = [
-	0 => '%sNutzer zugelassen',
-	1 => '%sNutzer zugelassen',
-];
-$a->strings['%s registration revoked'] = [
-	0 => '%sRegistration zurückgezogen',
-	1 => '%sRegistrierungen zurückgezogen',
-];
-$a->strings['Account approved.'] = 'Konto freigegeben.';
-$a->strings['Registration revoked'] = 'Registrierung zurückgezogen';
-$a->strings['User registrations awaiting review'] = 'Neuanmeldungen, die auf Deine Bestätigung warten';
-$a->strings['Request date'] = 'Anfragedatum';
-$a->strings['No registrations.'] = 'Keine Neuanmeldungen.';
-$a->strings['Note from the user'] = 'Hinweis vom Nutzer';
-$a->strings['Deny'] = 'Verwehren';
 $a->strings['API endpoint %s %s is not implemented'] = 'API Endpunkt %s %s ist nicht implementiert';
 $a->strings['The API endpoint is currently not implemented but might be in the future.'] = 'The API endpoint is currently not implemented but might be in the future.';
 $a->strings['Missing parameters'] = 'Fehlende Parameter';
@@ -1709,9 +1357,6 @@ $a->strings['Database'] = 'Datenbank';
 $a->strings['DB updates'] = 'DB Updates';
 $a->strings['Inspect Deferred Workers'] = 'Verzögerte Worker inspizieren';
 $a->strings['Inspect worker Queue'] = 'Worker Warteschlange inspizieren';
-$a->strings['Tools'] = 'Werkzeuge';
-$a->strings['Contact Blocklist'] = 'Kontakt Blockliste';
-$a->strings['Server Blocklist'] = 'Server Blockliste';
 $a->strings['Diagnostics'] = 'Diagnostik';
 $a->strings['PHP Info'] = 'PHP-Info';
 $a->strings['probe address'] = 'Adresse untersuchen';
@@ -1733,28 +1378,60 @@ $a->strings['Monthly posting limit of %d post reached. The post was rejected.']
 	0 => 'Das monatliche Limit von %d Beitrag wurde erreicht. Der Beitrag wurde verworfen.',
 	1 => 'Das monatliche Limit von %d Beiträgen wurde erreicht. Der Beitrag wurde verworfen.',
 ];
+$a->strings['Users'] = 'Nutzer';
+$a->strings['Tools'] = 'Werkzeuge';
+$a->strings['Contact Blocklist'] = 'Kontakt Blockliste';
+$a->strings['Server Blocklist'] = 'Server Blockliste';
+$a->strings['Delete Item'] = 'Eintrag löschen';
+$a->strings['Item Source'] = 'Beitrags Quelle';
 $a->strings['Profile Details'] = 'Profildetails';
+$a->strings['Status Messages and Posts'] = 'Statusnachrichten und Beiträge';
 $a->strings['Only You Can See This'] = 'Nur du kannst das sehen';
 $a->strings['Scheduled Posts'] = 'Geplante Beiträge';
 $a->strings['Posts that are scheduled for publishing'] = 'Beiträge die für einen späteren Zeitpunkt für die Veröffentlichung geplant sind';
 $a->strings['Tips for New Members'] = 'Tipps für neue Nutzer';
 $a->strings['People Search - %s'] = 'Personensuche - %s';
 $a->strings['Forum Search - %s'] = 'Forensuche - %s';
+$a->strings['No matches'] = 'Keine Übereinstimmungen';
 $a->strings['Account'] = 'Nutzerkonto';
 $a->strings['Two-factor authentication'] = 'Zwei-Faktor Authentifizierung';
 $a->strings['Display'] = 'Anzeige';
+$a->strings['Social Networks'] = 'Soziale Netzwerke';
 $a->strings['Manage Accounts'] = 'Accounts Verwalten';
 $a->strings['Connected apps'] = 'Verbundene Programme';
 $a->strings['Export personal data'] = 'Persönliche Daten exportieren';
 $a->strings['Remove account'] = 'Konto löschen';
 $a->strings['This page is missing a url parameter.'] = 'Der Seite fehlt ein URL Parameter.';
 $a->strings['The post was created'] = 'Der Beitrag wurde angelegt';
+$a->strings['Invalid Request'] = 'Ungültige Anfrage';
+$a->strings['Event id is missing.'] = 'Die Veranstaltung fehlt.';
+$a->strings['Failed to remove event'] = 'Entfernen der Veranstaltung fehlgeschlagen';
+$a->strings['Event can not end before it has started.'] = 'Die Veranstaltung kann nicht enden, bevor sie beginnt.';
+$a->strings['Event title and start time are required.'] = 'Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden.';
+$a->strings['Starting date and Title are required.'] = 'Anfangszeitpunkt und Titel werden benötigt';
+$a->strings['Event Starts:'] = 'Veranstaltungsbeginn:';
+$a->strings['Required'] = 'Benötigt';
+$a->strings['Finish date/time is not known or not relevant'] = 'Enddatum/-zeit ist nicht bekannt oder nicht relevant';
+$a->strings['Event Finishes:'] = 'Veranstaltungsende:';
+$a->strings['Description:'] = 'Beschreibung';
+$a->strings['Title:'] = 'Titel:';
+$a->strings['Share this event'] = 'Veranstaltung teilen';
+$a->strings['Basic'] = 'Allgemein';
+$a->strings['This calendar format is not supported'] = 'Dieses Kalenderformat wird nicht unterstützt.';
+$a->strings['No exportable data found'] = 'Keine exportierbaren Daten gefunden';
+$a->strings['calendar'] = 'Kalender';
+$a->strings['Events'] = 'Veranstaltungen';
+$a->strings['View'] = 'Ansehen';
+$a->strings['Create New Event'] = 'Neue Veranstaltung erstellen';
+$a->strings['list'] = 'Liste';
 $a->strings['%d contact edited.'] = [
 	0 => '%d Kontakt bearbeitet.',
 	1 => '%d Kontakte bearbeitet.',
 ];
 $a->strings['Show all contacts'] = 'Alle Kontakte anzeigen';
+$a->strings['Pending'] = 'Ausstehend';
 $a->strings['Only show pending contacts'] = 'Zeige nur noch ausstehende Kontakte.';
+$a->strings['Blocked'] = 'Geblockt';
 $a->strings['Only show blocked contacts'] = 'Nur blockierte Kontakte anzeigen';
 $a->strings['Ignored'] = 'Ignoriert';
 $a->strings['Only show ignored contacts'] = 'Nur ignorierte Kontakte anzeigen';
@@ -1766,6 +1443,7 @@ $a->strings['Organize your contact groups'] = 'Verwalte deine Kontaktgruppen';
 $a->strings['Search your contacts'] = 'Suche in deinen Kontakten';
 $a->strings['Results for: %s'] = 'Ergebnisse für: %s';
 $a->strings['Update'] = 'Aktualisierungen';
+$a->strings['Unblock'] = 'Entsperren';
 $a->strings['Unignore'] = 'Ignorieren aufheben';
 $a->strings['Batch Actions'] = 'Stapelverarbeitung';
 $a->strings['Conversations started by this contact'] = 'Unterhaltungen, die von diesem Kontakt begonnen wurden';
@@ -1779,8 +1457,10 @@ $a->strings['you are a fan of'] = 'Du bist Fan von';
 $a->strings['Pending outgoing contact request'] = 'Ausstehende ausgehende Kontaktanfrage';
 $a->strings['Pending incoming contact request'] = 'Ausstehende eingehende Kontaktanfrage';
 $a->strings['Visit %s\'s profile [%s]'] = 'Besuche %ss Profil [%s]';
+$a->strings['Contact not found.'] = 'Kontakt nicht gefunden.';
 $a->strings['Contact update failed.'] = 'Konnte den Kontakt nicht aktualisieren.';
 $a->strings['Return to contact editor'] = 'Zurück zum Kontakteditor';
+$a->strings['Name'] = 'Name';
 $a->strings['Account Nickname'] = 'Konto-Spitzname';
 $a->strings['Account URL'] = 'Konto-URL';
 $a->strings['Poll/Feed URL'] = 'Pull/Feed-URL';
@@ -1810,6 +1490,22 @@ $a->strings['Contact (%s)'] = [
 	0 => 'Kontakt (%s)',
 	1 => 'Kontakte (%s)',
 ];
+$a->strings['Access denied.'] = 'Zugriff verweigert.';
+$a->strings['Submit Request'] = 'Anfrage abschicken';
+$a->strings['You already added this contact.'] = 'Du hast den Kontakt bereits hinzugefügt.';
+$a->strings['The network type couldn\'t be detected. Contact can\'t be added.'] = 'Der Netzwerktyp wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden.';
+$a->strings['Diaspora support isn\'t enabled. Contact can\'t be added.'] = 'Diaspora-Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden.';
+$a->strings['OStatus support is disabled. Contact can\'t be added.'] = 'OStatus-Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden.';
+$a->strings['Please answer the following:'] = 'Bitte beantworte folgendes:';
+$a->strings['Your Identity Address:'] = 'Adresse Deines Profils:';
+$a->strings['Profile URL'] = 'Profil URL';
+$a->strings['Tags:'] = 'Tags:';
+$a->strings['%s knows you'] = '%skennt dich';
+$a->strings['Add a personal note:'] = 'Eine persönliche Notiz beifügen:';
+$a->strings['The contact could not be added.'] = 'Der Kontakt konnte nicht hinzugefügt werden.';
+$a->strings['Invalid request.'] = 'Ungültige Anfrage';
+$a->strings['No keywords to match. Please add keywords to your profile.'] = 'Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu deinem Profil hinzu.';
+$a->strings['Profile Match'] = 'Profilübereinstimmungen';
 $a->strings['Failed to update contact record.'] = 'Aktualisierung der Kontaktdaten fehlgeschlagen.';
 $a->strings['Contact has been unblocked'] = 'Kontakt wurde wieder freigegeben';
 $a->strings['Contact has been blocked'] = 'Kontakt wurde blockiert';
@@ -1863,12 +1559,19 @@ $a->strings['Toggle Blocked status'] = 'Geblockt-Status ein-/ausschalten';
 $a->strings['Toggle Ignored status'] = 'Ignoriert-Status ein-/ausschalten';
 $a->strings['Revoke Follow'] = 'Folgen widerrufen';
 $a->strings['Revoke the follow from this contact'] = 'Widerruft das Folgen dieses Kontaktes';
+$a->strings['Bad Request.'] = 'Ungültige Anfrage.';
 $a->strings['Unknown contact.'] = 'Unbekannter Kontakt.';
 $a->strings['Contact is deleted.'] = 'Kontakt wurde gelöscht';
 $a->strings['Contact is being deleted.'] = 'Kontakt wurde gelöscht.';
 $a->strings['Follow was successfully revoked.'] = 'Folgen wurde erfolgreich widerrufen.';
 $a->strings['Do you really want to revoke this contact\'s follow? This cannot be undone and they will have to manually follow you back again.'] = 'Willst du das Folgen dieses Kontakt wirklich widerrufen? Dies kann nicht rückgängig gemacht werden und der Kontakt muss Ihnen manuell wieder folgen.';
 $a->strings['Yes'] = 'Ja';
+$a->strings['No suggestions available. If this is a new site, please try again in 24 hours.'] = 'Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal.';
+$a->strings['You aren\'t following this contact.'] = 'Du folgst diesem Kontakt.';
+$a->strings['Unfollowing is currently not supported by your network.'] = 'Bei diesem Netzwerk wird das Entfolgen derzeit nicht unterstützt.';
+$a->strings['Disconnect/Unfollow'] = 'Verbindung lösen/Nicht mehr folgen';
+$a->strings['Contact was successfully unfollowed'] = 'Kontakt wurde erfolgreich entfolgt.';
+$a->strings['Unable to unfollow this contact, please contact your administrator'] = 'Konnte dem Kontakt nicht entfolgen. Bitte kontaktiere deinen Administrator.';
 $a->strings['This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users.'] = 'Diese Gemeinschaftsseite zeigt alle öffentlichen Beiträge, die auf diesem Knoten eingegangen sind. Der Inhalt entspricht nicht zwingend der Meinung der Nutzer dieses Servers.';
 $a->strings['Local Community'] = 'Lokale Gemeinschaft';
 $a->strings['Posts from local users on this server'] = 'Beiträge von Nutzern dieses Servers';
@@ -1898,6 +1601,10 @@ $a->strings['Formatted'] = 'Formatiert';
 $a->strings['Activity'] = 'Aktivität';
 $a->strings['Object data'] = 'Objekt Daten';
 $a->strings['Result Item'] = 'Resultierender Eintrag';
+$a->strings['Error'] = [
+	0 => 'Fehler',
+	1 => 'Fehler',
+];
 $a->strings['Source activity'] = 'Quelle der Aktivität';
 $a->strings['Source input'] = 'Originaltext:';
 $a->strings['BBCode::toPlaintext'] = 'BBCode::toPlaintext';
@@ -1977,6 +1684,7 @@ $a->strings['Installed addons/apps:'] = 'Installierte Apps und Addons';
 $a->strings['No installed addons/apps'] = 'Es sind keine Addons oder Apps installiert';
 $a->strings['Read about the <a href="%1$s/tos">Terms of Service</a> of this node.'] = 'Erfahre mehr über die <a href="%1$s/tos">Nutzungsbedingungen</a> dieses Knotens.';
 $a->strings['On this server the following remote servers are blocked.'] = 'Auf diesem Server werden die folgenden, entfernten Server blockiert.';
+$a->strings['Reason for the block'] = 'Begründung für die Blockierung';
 $a->strings['Download this list in CSV format'] = 'Liste im CSV-Format herunterladen';
 $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.'] = 'Diese Friendica-Instanz verwendet die Version %s, sie ist unter der folgenden Adresse im Web zu finden %s. Die Datenbankversion ist %s und die Post-Update-Version %s.';
 $a->strings['Please visit <a href="https://friendi.ca">Friendi.ca</a> to learn more about the Friendica project.'] = 'Bitte besuche <a href="https://friendi.ca">Friendi.ca</a>, um mehr über das Friendica-Projekt zu erfahren.';
@@ -2012,6 +1720,7 @@ $a->strings['System check'] = 'Systemtest';
 $a->strings['Requirement not satisfied'] = 'Anforderung ist nicht erfüllt';
 $a->strings['Optional requirement not satisfied'] = 'Optionale Anforderung ist nicht erfüllt';
 $a->strings['OK'] = 'Ok';
+$a->strings['Next'] = 'Nächste';
 $a->strings['Check again'] = 'Noch einmal testen';
 $a->strings['Base settings'] = 'Grundeinstellungen';
 $a->strings['Host name'] = 'Host Name';
@@ -2071,10 +1780,200 @@ $a->strings['Clear the location'] = 'Ort löschen';
 $a->strings['Location services are unavailable on your device'] = 'Ortungsdienste sind auf Ihrem Gerät nicht verfügbar';
 $a->strings['Location services are disabled. Please check the website\'s permissions on your device'] = 'Ortungsdienste sind deaktiviert. Bitte überprüfe die Berechtigungen der Website auf deinem Gerät';
 $a->strings['You can make this page always open when you use the New Post button in the <a href="/settings/display">Theme Customization settings</a>.'] = 'Wenn du magst, kannst du unter den <a href="/settings/display">Benutzerdefinierte Theme-Einstellungen</a> einstellen, dass diese Seite immer geöffnet wird, wenn du den "Neuer Beitrag" Button verwendest.';
+$a->strings['The requested item doesn\'t exist or has been deleted.'] = 'Der angeforderte Beitrag existiert nicht oder wurde gelöscht.';
+$a->strings['The feed for this item is unavailable.'] = 'Der Feed für diesen Beitrag ist nicht verfügbar.';
 $a->strings['Unable to follow this item.'] = 'Konnte dem Beitrag nicht folgen.';
 $a->strings['System down for maintenance'] = 'System zur Wartung abgeschaltet';
 $a->strings['This Friendica node is currently in maintenance mode, either automatically because it is self-updating or manually by the node administrator. This condition should be temporary, please come back in a few minutes.'] = 'Diese Friendica Instanz befindet sich derzeit im Wartungsmodus, entweder aufgrund von automatischen Updateprozessen oder weil die Administratoren der Instanz den Wartungsmodus aktiviert haben. Dies sollte ein vorübergehender Zustand sein. Bitte versuche es in ein paar Minuten erneut.';
 $a->strings['A Decentralized Social Network'] = 'Ein dezentrales Soziales Netzwerk';
+$a->strings['List of all users'] = 'Liste aller Benutzerkonten';
+$a->strings['Active'] = 'Aktive';
+$a->strings['List of active accounts'] = 'Liste der aktiven Benutzerkonten';
+$a->strings['List of pending registrations'] = 'Liste der anstehenden Benutzerkonten';
+$a->strings['List of blocked users'] = 'Liste der geblockten Benutzer';
+$a->strings['Deleted'] = 'Gelöscht';
+$a->strings['List of pending user deletions'] = 'Liste der auf Löschung wartenden Benutzer';
+$a->strings['Normal Account Page'] = 'Normales Konto';
+$a->strings['Soapbox Page'] = 'Marktschreier-Konto';
+$a->strings['Public Forum'] = 'Öffentliches Forum';
+$a->strings['Automatic Friend Page'] = 'Automatische Freunde-Seite';
+$a->strings['Private Forum'] = 'Privates Forum';
+$a->strings['Personal Page'] = 'Persönliche Seite';
+$a->strings['Organisation Page'] = 'Organisationsseite';
+$a->strings['News Page'] = 'Nachrichtenseite';
+$a->strings['Community Forum'] = 'Gemeinschaftsforum';
+$a->strings['Relay'] = 'Relais';
+$a->strings['You can\'t block a local contact, please block the user instead'] = 'Lokale Kontakte können nicht geblockt werden. Bitte blocke den Nutzer stattdessen.';
+$a->strings['%s contact unblocked'] = [
+	0 => '%sKontakt wieder freigegeben',
+	1 => '%sKontakte wieder freigegeben',
+];
+$a->strings['Remote Contact Blocklist'] = 'Blockliste entfernter Kontakte';
+$a->strings['This page allows you to prevent any message from a remote contact to reach your node.'] = 'Auf dieser Seite kannst du Accounts von anderen Knoten blockieren und damit verhindern, dass ihre Beiträge von deinem Knoten angenommen werden.';
+$a->strings['Block Remote Contact'] = 'Blockiere entfernten Kontakt';
+$a->strings['select all'] = 'Alle auswählen';
+$a->strings['select none'] = 'Auswahl aufheben';
+$a->strings['No remote contact is blocked from this node.'] = 'Derzeit werden keine Kontakte auf diesem Knoten blockiert.';
+$a->strings['Blocked Remote Contacts'] = 'Blockierte Kontakte von anderen Knoten';
+$a->strings['Block New Remote Contact'] = 'Blockieren von weiteren Kontakten';
+$a->strings['Photo'] = 'Foto:';
+$a->strings['Reason'] = 'Grund';
+$a->strings['%s total blocked contact'] = [
+	0 => 'Insgesamt %s blockierter Kontakt',
+	1 => 'Insgesamt %s blockierte Kontakte',
+];
+$a->strings['URL of the remote contact to block.'] = 'Die URL des entfernten Kontakts, der blockiert werden soll.';
+$a->strings['Also purge contact'] = 'Kontakt auch löschen';
+$a->strings['Removes all content related to this contact from the node. Keeps the contact record. This action cannot be undone.'] = 'Entfernt alle Inhalte von diesem Knoten, die in Verbindung zu dem Kontakt stehen. Der Kontakt-Eintrag bleibt erhalten. Dieser Vorgang kann nicht rückgängig gemacht werden.';
+$a->strings['Block Reason'] = 'Sperrgrund';
+$a->strings['Server domain pattern added to the blocklist.'] = 'Server Domain Muster zur Blockliste hinzugefügt';
+$a->strings['%s server scheduled to be purged.'] = [
+	0 => '%s Server für die Löschung eingeplant.',
+	1 => '%s Server für die Löschung eingeplant.',
+];
+$a->strings['← Return to the list'] = '← zurück zur Liste';
+$a->strings['Block A New Server Domain Pattern'] = 'Neues Domainmuster blockieren';
+$a->strings['<p>The server domain pattern syntax is case-insensitive shell wildcard, comprising the following special characters:</p>
+<ul>
+	<li><code>*</code>: Any number of characters</li>
+	<li><code>?</code>: Any single character</li>
+</ul>'] = '<p>Die Syntax für das Domainmuster ist unabhängig von der Groß-/Kleinschreibung. Shell Willdcards bestehen aus den folgenden Zeichen:</p>
+<ul>
+<li><code>*</code>: Eine beliebige Anzahl von Zeichen</li>
+<li><code>?</code>: Ein einzelnes Zeichen</li>
+</ul>';
+$a->strings['Check pattern'] = 'Muster überprüfen';
+$a->strings['Matching known servers'] = 'Passende bekannte Server';
+$a->strings['Server Name'] = 'Server Name';
+$a->strings['Server Domain'] = 'Server Domain';
+$a->strings['Known Contacts'] = 'Bekannte Kontakte';
+$a->strings['%d known server'] = [
+	0 => '%d bekannter Server',
+	1 => '%d bekannte Server',
+];
+$a->strings['Add pattern to the blocklist'] = 'Muster zur Blockliste hinzufügen';
+$a->strings['Server Domain Pattern'] = 'Server Domain Muster';
+$a->strings['The domain pattern of the new server to add to the blocklist. Do not include the protocol.'] = 'Das Muster zur Erkennung der Domain, das zur Blockliste hinzugefügt werden soll. Das Protokoll nicht mir angeben.';
+$a->strings['Purge server'] = 'Server entfernen';
+$a->strings['Also purges all the locally stored content authored by the known contacts registered on that server. Keeps the contacts and the server records. This action cannot be undone.'] = [
+	0 => 'Sollen die Inhalte der bekannten Kontakte die auf diesem Server registriert sind, auch lokal gelöscht werden. Die Kontakt- und Server-Einträge verbleiben in der Datenbank deines Servers. Diese Aktion kann nicht rückgängig gemacht werden.',
+	1 => 'Sollen die Inhalte der bekannten Kontakte die auf diesen Servern registriert sind, auch lokal gelöscht werden. Die Kontakt- und Server-Einträge verbleiben in der Datenbank deines Servers. Diese Aktion kann nicht rückgängig gemacht werden.',
+];
+$a->strings['Block reason'] = 'Begründung der Blockierung';
+$a->strings['The reason why you blocked this server domain pattern. This reason will be shown publicly in the server information page.'] = 'Warum werden Server die diesem Domainmuster entsprechen geblockt? Die Begründung wird öffentlich auf der Server-Informationsseite sichtbar sein.';
+$a->strings['Error importing pattern file'] = 'Fehler beim Import der Muster Datei';
+$a->strings['Local blocklist replaced with the provided file.'] = 'Lokale Blockliste wurde durch die bereitgestellte Datei ersetzt.';
+$a->strings['%d pattern was added to the local blocklist.'] = [
+	0 => '%d Muster wurde zur lokalen Blockliste hinzugefügt.',
+	1 => '%d Muster wurden zur lokalen Blockliste hinzugefügt.',
+];
+$a->strings['No pattern was added to the local blocklist.'] = 'Kein Muster wurde zur lokalen Blockliste hinzugefügt.';
+$a->strings['Import a Server Domain Pattern Blocklist'] = 'Server Domain Muster Blockliste importieren';
+$a->strings['<p>This file can be downloaded from the <code>/friendica</code> path of any Friendica server.</p>'] = '<p>Diese Datei kann vom <code>/friendica</code> Pfad auf jedem  Friendica Server heruntergeladen werden.</p>';
+$a->strings['Upload file'] = 'Datei hochladen';
+$a->strings['Patterns to import'] = 'Zu importierende Muster';
+$a->strings['Domain Pattern'] = 'Domain Muster';
+$a->strings['Import Mode'] = 'Importmodus';
+$a->strings['Import Patterns'] = 'Muster importieren';
+$a->strings['%d total pattern'] = [
+	0 => '%dMuster gesamt',
+	1 => '%dMuster gesamt',
+];
+$a->strings['Server domain pattern blocklist CSV file'] = 'Server Domain Muster Blockliste CSV-Datei';
+$a->strings['Append'] = 'Anhängen';
+$a->strings['Imports patterns from the file that weren\'t already existing in the current blocklist.'] = 'Importiert Muster aus der Datei, die nicht bereits in der aktuellen Blockliste vorhanden waren.';
+$a->strings['Replace'] = 'Ersetzen';
+$a->strings['Replaces the current blocklist by the imported patterns.'] = 'Ersetzt die aktuelle Blockliste durch die importierten Muster.';
+$a->strings['Blocked server domain pattern'] = 'Blockierte Server Domain Muster';
+$a->strings['Delete server domain pattern'] = 'Server Domain Muster löschen';
+$a->strings['Check to delete this entry from the blocklist'] = 'Markieren, um diesen Eintrag von der Blocklist zu entfernen';
+$a->strings['Server Domain Pattern Blocklist'] = 'Server Domain Muster Blockliste';
+$a->strings['This page can be used to define a blocklist of server domain patterns from the federated network that are not allowed to interact with your node. For each domain pattern you should also provide the reason why you block it.'] = 'Auf dieser Seite kannst du Muster definieren mit denen Server Domains aus dem föderierten Netzwerk daran gehindert werden mit deiner Instanz zu interagieren. Es ist ratsam für jedes Muster anzugeben, warum du es zur Blockliste hinzugefügt hast.';
+$a->strings['The list of blocked server domain patterns will be made publically available on the <a href="/friendica">/friendica</a> page so that your users and people investigating communication problems can find the reason easily.'] = 'Die Liste der blockierten Domain Muster wird auf der Seite <a href="/friendica">/friendica</a> öffentlich einsehbar gemacht, damit deine Nutzer und Personen, die Kommunikationsprobleme erkunden, die Ursachen einfach finden können.';
+$a->strings['Import server domain pattern blocklist'] = 'Server Domain Muster Blockliste importieren';
+$a->strings['Add new entry to the blocklist'] = 'Neuen Eintrag in die Blockliste';
+$a->strings['Save changes to the blocklist'] = 'Änderungen der Blockliste speichern';
+$a->strings['Current Entries in the Blocklist'] = 'Aktuelle Einträge der Blockliste';
+$a->strings['Delete entry from the blocklist'] = 'Eintrag von der Blockliste entfernen';
+$a->strings['Delete entry from the blocklist?'] = 'Eintrag von der Blockliste entfernen?';
+$a->strings['Item marked for deletion.'] = 'Eintrag wurden zur Löschung markiert';
+$a->strings['Delete this Item'] = 'Diesen Eintrag löschen';
+$a->strings['On this page you can delete an item from your node. If the item is a top level posting, the entire thread will be deleted.'] = 'Auf dieser Seite kannst du Einträge von deinem Knoten löschen. Wenn der Eintrag der Anfang einer Diskussion ist, wird der gesamte Diskussionsverlauf gelöscht.';
+$a->strings['You need to know the GUID of the item. You can find it e.g. by looking at the display URL. The last part of http://example.com/display/123456 is the GUID, here 123456.'] = 'Zur Löschung musst du die GUID des Eintrags kennen. Diese findest du z.B. durch die /display URL des Eintrags. Der letzte Teil der URL ist die GUID. Lautet die URL beispielsweise http://example.com/display/123456, ist die GUID 123456.';
+$a->strings['GUID'] = 'GUID';
+$a->strings['The GUID of the item you want to delete.'] = 'Die GUID des zu löschenden Eintrags';
+$a->strings['Item Id'] = 'Item Id';
+$a->strings['Item URI'] = 'Item URI';
+$a->strings['Terms'] = 'Terms';
+$a->strings['Tag'] = 'Tag';
+$a->strings['Type'] = 'Typ';
+$a->strings['Term'] = 'Term';
+$a->strings['URL'] = 'URL';
+$a->strings['Mention'] = 'Mention';
+$a->strings['Implicit Mention'] = 'Implicit Mention';
+$a->strings['Item not found'] = 'Beitrag nicht gefunden';
+$a->strings['No source recorded'] = 'Keine Quelle aufgezeichnet';
+$a->strings['Please make sure the <code>debug.store_source</code> config key is set in <code>config/local.config.php</code> for future items to have sources.'] = 'Bitte stelle sicher, dass der Config-Schlüssel <code>debug.store_source</code>  in der <code>config/local.config.php</code> gesetzt ist um in Zukunft Quellen zu haben.';
+$a->strings['Item Guid'] = 'Beitrags-Guid';
+$a->strings['Normal Account'] = 'Normales Konto';
+$a->strings['Automatic Follower Account'] = 'Automatisch folgendes Konto (Marktschreier)';
+$a->strings['Public Forum Account'] = 'Öffentliches Forum-Konto';
+$a->strings['Automatic Friend Account'] = 'Automatische Freunde-Seite';
+$a->strings['Blog Account'] = 'Blog-Konto';
+$a->strings['Private Forum Account'] = 'Privates Forum-Konto';
+$a->strings['Registered users'] = 'Registrierte Personen';
+$a->strings['Pending registrations'] = 'Anstehende Anmeldungen';
+$a->strings['%s user blocked'] = [
+	0 => '%s Nutzer blockiert',
+	1 => '%s Nutzer blockiert',
+];
+$a->strings['You can\'t remove yourself'] = 'Du kannst dich nicht selbst löschen!';
+$a->strings['%s user deleted'] = [
+	0 => '%s Nutzer gelöscht',
+	1 => '%s Nutzer gelöscht',
+];
+$a->strings['User "%s" deleted'] = 'Nutzer "%s" gelöscht';
+$a->strings['User "%s" blocked'] = 'Nutzer "%s" blockiert';
+$a->strings['Register date'] = 'Anmeldedatum';
+$a->strings['Last login'] = 'Letzte Anmeldung';
+$a->strings['Last public item'] = 'Letzter öffentliche Beitrag';
+$a->strings['Active Accounts'] = 'Aktive Benutzerkonten';
+$a->strings['User blocked'] = 'Nutzer blockiert.';
+$a->strings['Site admin'] = 'Seitenadministrator';
+$a->strings['Account expired'] = 'Account ist abgelaufen';
+$a->strings['Create a new user'] = 'Neues Benutzerkonto anlegen';
+$a->strings['Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'] = 'Die markierten Nutzer werden gelöscht!\n\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\n\nBist du sicher?';
+$a->strings['The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'] = 'Der Nutzer {0} wird gelöscht!\n\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\n\nBist du sicher?';
+$a->strings['%s user unblocked'] = [
+	0 => '%s Nutzer freigeschaltet',
+	1 => '%s Nutzer freigeschaltet',
+];
+$a->strings['User "%s" unblocked'] = 'Nutzer "%s" frei geschaltet';
+$a->strings['Blocked Users'] = 'Blockierte Benutzer';
+$a->strings['New User'] = 'Neuer Nutzer';
+$a->strings['Add User'] = 'Nutzer hinzufügen';
+$a->strings['Name of the new user.'] = 'Name des neuen Nutzers';
+$a->strings['Nickname'] = 'Spitzname';
+$a->strings['Nickname of the new user.'] = 'Spitznamen für den neuen Nutzer';
+$a->strings['Email address of the new user.'] = 'Email Adresse des neuen Nutzers';
+$a->strings['Users awaiting permanent deletion'] = 'Nutzer wartet auf permanente Löschung';
+$a->strings['Permanent deletion'] = 'Permanent löschen';
+$a->strings['User waiting for permanent deletion'] = 'Nutzer wartet auf permanente Löschung';
+$a->strings['%s user approved'] = [
+	0 => '%sNutzer zugelassen',
+	1 => '%sNutzer zugelassen',
+];
+$a->strings['%s registration revoked'] = [
+	0 => '%sRegistration zurückgezogen',
+	1 => '%sRegistrierungen zurückgezogen',
+];
+$a->strings['Account approved.'] = 'Konto freigegeben.';
+$a->strings['Registration revoked'] = 'Registrierung zurückgezogen';
+$a->strings['User registrations awaiting review'] = 'Neuanmeldungen, die auf Deine Bestätigung warten';
+$a->strings['Request date'] = 'Anfragedatum';
+$a->strings['No registrations.'] = 'Keine Neuanmeldungen.';
+$a->strings['Note from the user'] = 'Hinweis vom Nutzer';
+$a->strings['Deny'] = 'Verwehren';
 $a->strings['Show Ignored Requests'] = 'Zeige ignorierte Anfragen';
 $a->strings['Hide Ignored Requests'] = 'Verberge ignorierte Anfragen';
 $a->strings['Notification type:'] = 'Art der Benachrichtigung:';
@@ -2102,6 +2001,21 @@ $a->strings['Unsupported or missing response type'] = 'Der Typ der Antwort fehlt
 $a->strings['Incomplete request data'] = 'Daten der Anfrage sind nicht vollständig';
 $a->strings['Please copy the following authentication code into your application and close this window: %s'] = 'Bitte kopiere den folgenden Authentifizierungscode in deine App und schließe dieses Fenster: %s';
 $a->strings['Unsupported or missing grant type'] = 'Der Grant-Typ fehlt oder wird nicht unterstützt';
+$a->strings['Resubscribing to OStatus contacts'] = 'Erneuern der OStatus-Abonements';
+$a->strings['Keep this window open until done.'] = 'Lasse dieses Fenster offen, bis der Vorgang abgeschlossen ist.';
+$a->strings['✔ Done'] = '✔ Erledigt';
+$a->strings['No OStatus contacts to resubscribe to.'] = 'Keine OStatus Kontakte zum Neufolgen vorhanden.';
+$a->strings['Subscribing to contacts'] = 'Kontakten folgen';
+$a->strings['No contact provided.'] = 'Keine Kontakte gefunden.';
+$a->strings['Couldn\'t fetch information for contact.'] = 'Konnte die Kontaktinformationen nicht einholen.';
+$a->strings['Couldn\'t fetch friends for contact.'] = 'Konnte die Kontaktliste des Kontakts nicht abfragen.';
+$a->strings['Couldn\'t fetch following contacts.'] = 'Konnte Liste der gefolgten Kontakte nicht einholen.';
+$a->strings['Couldn\'t fetch remote profile.'] = 'Konnte das entfernte Profil nicht laden.';
+$a->strings['Unsupported network'] = 'Netzwerk wird nicht unterstützt';
+$a->strings['Done'] = 'Erledigt';
+$a->strings['success'] = 'Erfolg';
+$a->strings['failed'] = 'Fehlgeschlagen';
+$a->strings['ignored'] = 'Ignoriert';
 $a->strings['Wrong type "%s", expected one of: %s'] = 'Falscher Typ "%s", hatte einen der Folgenden erwartet: %s';
 $a->strings['Model not found'] = 'Model nicht gefunden';
 $a->strings['Unlisted'] = 'Ungelistet';
@@ -2117,6 +2031,20 @@ $a->strings['The Photo is not available.'] = 'Das Foto ist nicht verfügbar.';
 $a->strings['The Photo with id %s is not available.'] = 'Das Bild mit ID %s ist nicht verfügbar.';
 $a->strings['Invalid external resource with url %s.'] = 'Ungültige externe Ressource mit der URL %s';
 $a->strings['Invalid photo with id %s.'] = 'Fehlerhaftes Foto mit der ID %s.';
+$a->strings['Post not found.'] = 'Beitrag nicht gefunden.';
+$a->strings['Edit post'] = 'Beitrag bearbeiten';
+$a->strings['web link'] = 'Weblink';
+$a->strings['Insert video link'] = 'Video-Adresse einfügen';
+$a->strings['video link'] = 'Video-Link';
+$a->strings['Insert audio link'] = 'Audio-Adresse einfügen';
+$a->strings['audio link'] = 'Audio-Link';
+$a->strings['Remove Item Tag'] = 'Gegenstands-Tag entfernen';
+$a->strings['Select a tag to remove: '] = 'Wähle ein Tag zum Entfernen aus: ';
+$a->strings['Remove'] = 'Entfernen';
+$a->strings['Sorry, maybe your upload is bigger than the PHP configuration allows'] = 'Entschuldige, die Datei scheint größer zu sein, als es die PHP-Konfiguration erlaubt.';
+$a->strings['Or - did you try to upload an empty file?'] = 'Oder - hast du versucht, eine leere Datei hochzuladen?';
+$a->strings['File exceeds size limit of %s'] = 'Die Datei ist größer als das erlaubte Limit von %s';
+$a->strings['File upload failed.'] = 'Hochladen der Datei fehlgeschlagen.';
 $a->strings['No contacts.'] = 'Keine Kontakte.';
 $a->strings['Profile not found.'] = 'Profil nicht gefunden.';
 $a->strings['You\'re currently viewing your profile as <b>%s</b> <a href="%s" class="btn btn-sm pull-right">Cancel</a>'] = 'Du betrachtest dein Profil gerade als <b>%s</b> <a href="%s" class="btn btn-sm pull-right">Abbrechen</a>';
@@ -2136,10 +2064,27 @@ $a->strings['View as'] = 'Betrachten als';
 $a->strings['%s\'s timeline'] = 'Timeline von %s';
 $a->strings['%s\'s posts'] = 'Beiträge von %s';
 $a->strings['%s\'s comments'] = 'Kommentare von %s';
+$a->strings['Profile unavailable.'] = 'Profil nicht verfügbar.';
+$a->strings['Invalid locator'] = 'Ungültiger Locator';
+$a->strings['The provided profile link doesn\'t seem to be valid'] = 'Der angegebene Profil-Link scheint nicht gültig zu sein.';
+$a->strings['Remote subscription can\'t be done for your network. Please subscribe directly on your system.'] = 'Entferntes Abon­nie­ren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems.   ';
+$a->strings['Friend/Connection Request'] = 'Kontaktanfrage';
+$a->strings['Enter your Webfinger address (user@domain.tld) or profile URL here. If this isn\'t supported by your system, you have to subscribe to <strong>%s</strong> or <strong>%s</strong> directly on your system.'] = 'Gib entweder deine Webfinger- (user@domain.tld) oder die Profil-Adresse an. Wenn dies von deinem System nicht unterstützt wird, folge bitte <strong>%s</strong> oder <strong>%s</strong> direkt von deinem System. ';
+$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>.'] = 'Solltest du das freie Soziale Netzwerk noch nicht benutzen, kannst du <a href="%s">diesem Link folgen</a> um eine öffentliche Friendica Instanz zu finden um noch heute dem Netzwerk beizutreten.';
+$a->strings['Your Webfinger address or profile URL:'] = 'Deine Webfinger Adresse oder Profil-URL';
 $a->strings['Scheduled'] = 'Zeitplan';
 $a->strings['Content'] = 'Inhalt';
 $a->strings['Remove post'] = 'Beitrag entfernen';
+$a->strings['Empty message body.'] = 'Leerer Nachrichtenkörper.';
+$a->strings['Unable to check your home location.'] = 'Konnte Deinen Heimatort nicht bestimmen.';
+$a->strings['Recipient not found.'] = 'Empfänger nicht gefunden.';
+$a->strings['Number of daily wall messages for %s exceeded. Message failed.'] = 'Maximale Anzahl der täglichen Pinnwand-Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen.';
+$a->strings['If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders.'] = 'Wenn du möchtest, dass %s dir antworten kann, überprüfe deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern.';
+$a->strings['To'] = 'An';
+$a->strings['Subject'] = 'Betreff';
+$a->strings['Your message'] = 'Deine Nachricht';
 $a->strings['Only parent users can create additional accounts.'] = 'Zusätzliche Nutzerkonten können nur von Verwaltern angelegt werden.';
+$a->strings['This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.'] = 'Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal.';
 $a->strings['You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking "Register".'] = 'Du kannst dieses Formular auch (optional) mit deiner OpenID ausfüllen, indem du deine OpenID angibst und \'Registrieren\' klickst.';
 $a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'Wenn du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus.';
 $a->strings['Your OpenID (optional): '] = 'Deine OpenID (optional): ';
@@ -2156,6 +2101,7 @@ $a->strings['Leave empty for an auto generated password.'] = 'Leer lassen, um da
 $a->strings['Confirm:'] = 'Bestätigen:';
 $a->strings['Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be "<strong>nickname@%s</strong>".'] = 'Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse deines Profils auf dieser Seite wird \'<strong>spitzname@%s</strong>\' sein.';
 $a->strings['Choose a nickname: '] = 'Spitznamen wählen: ';
+$a->strings['Import'] = 'Import';
 $a->strings['Import your profile to this friendica instance'] = 'Importiere dein Profil auf diese Friendica-Instanz';
 $a->strings['Note: This node explicitly contains adult content'] = 'Hinweis: Dieser Knoten enthält explizit Inhalte für Erwachsene';
 $a->strings['Parent Password:'] = 'Passwort des Verwalters';
@@ -2176,14 +2122,6 @@ $a->strings['Registration successful.'] = 'Registrierung erfolgreich.';
 $a->strings['Your registration can not be processed.'] = 'Deine Registrierung konnte nicht verarbeitet werden.';
 $a->strings['You have to leave a request note for the admin.'] = 'Du musst eine Nachricht für den Administrator als Begründung deiner Anfrage hinterlegen.';
 $a->strings['Your registration is pending approval by the site owner.'] = 'Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden.';
-$a->strings['Profile unavailable.'] = 'Profil nicht verfügbar.';
-$a->strings['Invalid locator'] = 'Ungültiger Locator';
-$a->strings['The provided profile link doesn\'t seem to be valid'] = 'Der angegebene Profil-Link scheint nicht gültig zu sein.';
-$a->strings['Remote subscription can\'t be done for your network. Please subscribe directly on your system.'] = 'Entferntes Abon­nie­ren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems.   ';
-$a->strings['Friend/Connection Request'] = 'Kontaktanfrage';
-$a->strings['Enter your Webfinger address (user@domain.tld) or profile URL here. If this isn\'t supported by your system, you have to subscribe to <strong>%s</strong> or <strong>%s</strong> directly on your system.'] = 'Gib entweder deine Webfinger- (user@domain.tld) oder die Profil-Adresse an. Wenn dies von deinem System nicht unterstützt wird, folge bitte <strong>%s</strong> oder <strong>%s</strong> direkt von deinem System. ';
-$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>.'] = 'Solltest du das freie Soziale Netzwerk noch nicht benutzen, kannst du <a href="%s">diesem Link folgen</a> um eine öffentliche Friendica Instanz zu finden um noch heute dem Netzwerk beizutreten.';
-$a->strings['Your Webfinger address or profile URL:'] = 'Deine Webfinger Adresse oder Profil-URL';
 $a->strings['You must be logged in to use this module.'] = 'Du musst eingeloggt sein, um dieses Modul benutzen zu können.';
 $a->strings['Only logged in users are permitted to perform a search.'] = 'Nur eingeloggten Benutzern ist das Suchen gestattet.';
 $a->strings['Only one search per minute is permitted for not logged in users.'] = 'Es ist nur eine Suchanfrage pro Minute für nicht eingeloggte Benutzer gestattet.';
@@ -2344,6 +2282,45 @@ $a->strings['Upload File'] = 'Datei hochladen';
 $a->strings['Relocate'] = 'Umziehen';
 $a->strings['If you have moved this profile from another server, and some of your contacts don\'t receive your updates, try pushing this button.'] = 'Wenn du dein Profil von einem anderen Server umgezogen hast und einige deiner Kontakte deine Beiträge nicht erhalten, verwende diesen Button.';
 $a->strings['Resend relocate message to contacts'] = 'Umzugsbenachrichtigung erneut an Kontakte senden';
+$a->strings['Addon Settings'] = 'Addon Einstellungen';
+$a->strings['No Addon settings configured'] = 'Keine Addon-Einstellungen konfiguriert';
+$a->strings['Failed to connect with email account using the settings provided.'] = 'Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich.';
+$a->strings['Diaspora (Socialhome, Hubzilla)'] = 'Diaspora (Socialhome, Hubzilla)';
+$a->strings['Built-in support for %s connectivity is enabled'] = 'Eingebaute Unterstützung für die Verbindung zu %s ist aktiviert.';
+$a->strings['Built-in support for %s connectivity is disabled'] = 'Eingebaute Unterstützung für die Verbindung zu %s ist nicht aktiviert.';
+$a->strings['OStatus (GNU Social)'] = 'OStatus (GNU Social)';
+$a->strings['Email access is disabled on this site.'] = 'Zugriff auf E-Mails für diese Seite deaktiviert.';
+$a->strings['None'] = 'Keine';
+$a->strings['General Social Media Settings'] = 'Allgemeine Einstellungen zu Sozialen Medien';
+$a->strings['Followed content scope'] = 'Umfang zu folgender Inhalte';
+$a->strings['By default, conversations in which your follows participated but didn\'t start will be shown in your timeline. You can turn this behavior off, or expand it to the conversations in which your follows liked a post.'] = 'Normalerweise werden Unterhaltungen an denen deine Kontakte beteiligt sind, sie aber nicht begonnen haben, in deiner Timeline angezeigt. Mit dieser Einstellung kann dieses Vorgehen kontrolliert werden. Es kann entweder dahin erweitert werden, dass auch Unterhaltungen angezeigt werden in denen deine Kontakte einen Kommentar mögen, oder komplett ausgeschaltet werden, so dass nur noch die Unterhaltungen angezeigt werden, die von deinen Kontakten gestartet wurden.';
+$a->strings['Only conversations my follows started'] = 'Nur Unterhaltungen, die meine Kontakte gestartet haben';
+$a->strings['Conversations my follows started or commented on (default)'] = 'Unterhaltungen an denen meine Kontakte beteiligt sind (Grundeinstellung)';
+$a->strings['Any conversation my follows interacted with, including likes'] = 'Unterhaltungen mit denen meine Kontakte interagiert haben, inklusive likes';
+$a->strings['Enable Content Warning'] = 'Inhaltswarnungen einschalten';
+$a->strings['Users on networks like Mastodon or Pleroma are able to set a content warning field which collapse their post by default. This enables the automatic collapsing instead of setting the content warning as the post title. Doesn\'t affect any other content filtering you eventually set up.'] = 'Benutzer in Netzwerken wie Mastodon oder Pleroma können eine Warnung für sensitive Inhalte ihrer Beiträge erstellen. Mit dieser Option werden derart markierte Beiträge automatisch zusammengeklappt und die Inhaltswarnung wird als Titel des Beitrags angezeigt. Diese Option hat keinen Einfluss auf andere Inhaltsfilterungen, die du eventuell eingerichtet hast.';
+$a->strings['Enable intelligent shortening'] = 'Intelligentes kürzen einschalten';
+$a->strings['Normally the system tries to find the best link to add to shortened posts. If disabled, every shortened post will always point to the original friendica post.'] = 'Normalerweise versucht das System, den besten Link zu finden, um ihn zum gekürzten Postings hinzuzufügen. Wird diese Option ausgewählt, wird stets ein Link auf die originale Friendica-Nachricht beigefügt.';
+$a->strings['Enable simple text shortening'] = 'Einfache Textkürzung aktivieren';
+$a->strings['Normally the system shortens posts at the next line feed. If this option is enabled then the system will shorten the text at the maximum character limit.'] = 'Normalerweise kürzt das System Beiträge bei Zeilenumbrüchen. Ist diese Option aktiv, wird das System die Kürzung beim Erreichen der maximalen Zeichenzahl vornehmen.';
+$a->strings['Attach the link title'] = 'Link Titel hinzufügen';
+$a->strings['When activated, the title of the attached link will be added as a title on posts to Diaspora. This is mostly helpful with "remote-self" contacts that share feed content.'] = 'Ist dies aktiviert, wird der Titel von angehangenen Links bei Beiträgen nach Diaspora* angefügt. Dies ist vorallem bei Entfernten Konten nützlich die Beiträge von Feeds weiterleiten.';
+$a->strings['Your legacy ActivityPub/GNU Social account'] = 'Dein alter ActivityPub/GNU Social-Account';
+$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.'] = 'Wenn du deinen alten ActivityPub oder GNU Social/Statusnet-Account-Namen hier angibst (Format name@domain.tld), werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden.';
+$a->strings['Repair OStatus subscriptions'] = 'OStatus-Abonnements reparieren';
+$a->strings['Email/Mailbox Setup'] = 'E-Mail/Postfach-Einstellungen';
+$a->strings['If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox.'] = 'Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an.';
+$a->strings['Last successful email check:'] = 'Letzter erfolgreicher E-Mail-Check';
+$a->strings['IMAP server name:'] = 'IMAP-Server-Name:';
+$a->strings['IMAP port:'] = 'IMAP-Port:';
+$a->strings['Security:'] = 'Sicherheit:';
+$a->strings['Email login name:'] = 'E-Mail-Login-Name:';
+$a->strings['Email password:'] = 'E-Mail-Passwort:';
+$a->strings['Reply-to address:'] = 'Reply-to Adresse:';
+$a->strings['Send public posts to all email contacts:'] = 'Sende öffentliche Beiträge an alle E-Mail-Kontakte:';
+$a->strings['Action after import:'] = 'Aktion nach Import:';
+$a->strings['Move to folder'] = 'In einen Ordner verschieben';
+$a->strings['Move to folder:'] = 'In diesen Ordner verschieben:';
 $a->strings['Delegation successfully granted.'] = 'Delegierung erfolgreich eingerichtet.';
 $a->strings['Parent user not found, unavailable or password doesn\'t match.'] = 'Der angegebene Nutzer konnte nicht gefunden werden, ist nicht verfügbar oder das angegebene Passwort ist nicht richtig.';
 $a->strings['Delegation successfully revoked.'] = 'Delegation erfolgreich aufgehoben.';
@@ -2368,7 +2345,6 @@ $a->strings['General Theme Settings'] = 'Allgemeine Theme-Einstellungen';
 $a->strings['Custom Theme Settings'] = 'Benutzerdefinierte Theme-Einstellungen';
 $a->strings['Content Settings'] = 'Einstellungen zum Inhalt';
 $a->strings['Theme settings'] = 'Theme-Einstellungen';
-$a->strings['Calendar'] = 'Kalender';
 $a->strings['Display Theme:'] = 'Theme:';
 $a->strings['Mobile Theme:'] = 'Mobiles Theme';
 $a->strings['Number of items to display per page:'] = 'Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: ';
@@ -2391,6 +2367,9 @@ $a->strings['Display the first resharer as icon and text on a reshared item.'] =
 $a->strings['Stay local'] = 'Bleib lokal';
 $a->strings['Don\'t go to a remote system when following a contact link.'] = 'Gehe nicht zu einem Remote-System, wenn einem Kontaktlink gefolgt wird';
 $a->strings['Beginning of week:'] = 'Wochenbeginn:';
+$a->strings['Additional Features'] = 'Zusätzliche Features';
+$a->strings['Connected Apps'] = 'Verbundene Programme';
+$a->strings['Remove authorization'] = 'Autorisierung entziehen';
 $a->strings['Profile Name is required.'] = 'Profilname ist erforderlich.';
 $a->strings['Profile couldn\'t be updated.'] = 'Das Profil konnte nicht aktualisiert werden.';
 $a->strings['Label:'] = 'Bezeichnung:';
@@ -2398,6 +2377,8 @@ $a->strings['Value:'] = 'Wert:';
 $a->strings['Field Permissions'] = 'Berechtigungen des Felds';
 $a->strings['(click to open/close)'] = '(klicke zum Öffnen/Schließen)';
 $a->strings['Add a new profile field'] = 'Neues Profilfeld hinzufügen';
+$a->strings['The homepage is verified. A rel="me" link back to your Friendica profile page was found on the homepage.'] = 'Die Homepage ist verifiziert. Ein rel="me" Link zurück auf dein Friendica Profil wurde gefunden.';
+$a->strings['To verify your homepage, add a rel="me" link to it, pointing to your profile URL (%s).'] = 'Um deine Homepage zu verifizieren, füge einen rel="me" Link auf der Seite hinzu, der auf dein Profil mit der URL (%s) verweist.';
 $a->strings['Profile Actions'] = 'Profilaktionen';
 $a->strings['Edit Profile Details'] = 'Profil bearbeiten';
 $a->strings['Change Profile Photo'] = 'Profilbild ändern';
@@ -2447,6 +2428,14 @@ $a->strings['Upload Picture:'] = 'Bild hochladen';
 $a->strings['or'] = 'oder';
 $a->strings['skip this step'] = 'diesen Schritt überspringen';
 $a->strings['select a photo from your photo albums'] = 'wähle ein Foto aus deinen Fotoalben';
+$a->strings['[Friendica System Notify]'] = '[Friendica-Systembenachrichtigung]';
+$a->strings['User deleted their account'] = 'Gelöschter Nutzeraccount';
+$a->strings['On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups.'] = 'Ein Nutzer deiner Friendica-Instanz hat seinen Account gelöscht. Bitte stelle sicher, dass dessen Daten aus deinen Backups entfernt werden.';
+$a->strings['The user id is %d'] = 'Die ID des Users lautet %d';
+$a->strings['Your user account has been successfully removed. Bye bye!'] = 'Dein Nutzeraccount wurde erfolgreich entfernt. Bye bye!';
+$a->strings['Remove My Account'] = 'Konto löschen';
+$a->strings['This will completely remove your account. Once this has been done it is not recoverable.'] = 'Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen.';
+$a->strings['Please enter your password for verification:'] = 'Bitte gib dein Passwort zur Verifikation ein:';
 $a->strings['Please enter your password to access this page.'] = 'Bitte gib dein Passwort ein, um auf diese Seite zuzugreifen.';
 $a->strings['App-specific password generation failed: The description is empty.'] = 'Die Erzeugung des App spezifischen Passworts ist fehlgeschlagen. Die Beschreibung ist leer.';
 $a->strings['App-specific password generation failed: This description already exists.'] = 'Die Erzeugung des App spezifischen Passworts ist fehlgeschlagen. Die Beschreibung existiert bereits.';
@@ -2546,8 +2535,26 @@ $a->strings['Exception thrown in %s:%d'] = 'Exception thrown in %s:%d';
 $a->strings['At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node\'s user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.'] = 'Zum Zwecke der Registrierung und um die Kommunikation zwischen dem Nutzer und seinen Kontakten zu gewährleisten, muß der Nutzer einen Namen (auch Pseudonym) und einen Nutzernamen (Spitzname) sowie eine funktionierende E-Mail-Adresse angeben. Der Name ist auf der Profilseite für alle Nutzer sichtbar, auch wenn die Profildetails nicht angezeigt werden.
 Die E-Mail-Adresse wird nur zur Benachrichtigung des Nutzers verwendet, sie wird nirgends angezeigt. Die Anzeige des Nutzerkontos im Server-Verzeichnis bzw. dem weltweiten Verzeichnis erfolgt gemäß den Einstellungen des Nutzers, sie ist zur Kommunikation nicht zwingend notwendig.';
 $a->strings['This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.'] = 'Diese Daten sind für die Kommunikation notwendig und werden an die Knoten der Kommunikationspartner übermittelt und dort gespeichert. Nutzer können weitere, private Angaben machen, die ebenfalls an die verwendeten Server der Kommunikationspartner übermittelt werden können.';
-$a->strings['At any point in time a logged in user can export their account data from the <a href="%1$s/settings/userexport">account settings</a>. If the user wants to delete their account they can do so at <a href="%1$s/removeme">%1$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.'] = 'Angemeldete Nutzer können ihre Nutzerdaten jederzeit von den <a href="%1$s/settings/userexport">Kontoeinstellungen</a> aus exportieren. Wenn ein Nutzer wünscht das Nutzerkonto zu löschen, so ist dies jederzeit unter <a href="%1$s/removeme">%1$s/removeme</a> möglich. Die Löschung des Nutzerkontos ist permanent. Die Löschung der Daten wird auch von den Knoten der Kommunikationspartner angefordert.';
+$a->strings['At any point in time a logged in user can export their account data from the <a href="%1$s/settings/userexport">account settings</a>. If the user wants to delete their account they can do so at <a href="%1$s/settings/removeme">%1$s/settings/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.'] = 'Angemeldete Nutzer können ihre Nutzerdaten jederzeit von den <a href="%1$s/settings/userexport">Kontoeinstellungen</a> aus exportieren. Wenn ein Nutzer wünscht das Nutzerkonto zu löschen, so ist dies jederzeit unter <a href="%1$s/settings/removeme">%1$s/settings/removeme</a> möglich. Die Löschung des Nutzerkontos ist permanent. Die Löschung der Daten wird auch von den Knoten der Kommunikationspartner angefordert.';
 $a->strings['Privacy Statement'] = 'Datenschutzerklärung';
+$a->strings['Parameter uri_id is missing.'] = 'Der Parameter uri_id fehlt.';
+$a->strings['User imports on closed servers can only be done by an administrator.'] = 'Auf geschlossenen Servern können ausschließlich die Administratoren Benutzerkonten importieren.';
+$a->strings['Move account'] = 'Account umziehen';
+$a->strings['You can import an account from another Friendica server.'] = 'Du kannst einen Account von einem anderen Friendica Server importieren.';
+$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.'] = 'Du musst deinen Account vom alten Server exportieren und hier hochladen. Wir stellen deinen alten Account mit all deinen Kontakten wieder her. Wir werden auch versuchen, deine Kontakte darüber zu informieren, dass du hierher umgezogen bist.';
+$a->strings['This feature is experimental. We can\'t import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora'] = 'Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus-Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren';
+$a->strings['Account file'] = 'Account-Datei';
+$a->strings['To export your account, go to "Settings->Export your personal data" and select "Export account"'] = 'Um Deinen Account zu exportieren, rufe "Einstellungen -> Persönliche Daten exportieren" auf und wähle "Account exportieren"';
+$a->strings['Error decoding account file'] = 'Fehler beim Verarbeiten der Account-Datei';
+$a->strings['Error! No version data in file! This is not a Friendica account file?'] = 'Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica-Account-Datei?';
+$a->strings['User \'%s\' already exists on this server!'] = 'Nutzer \'%s\' existiert bereits auf diesem Server!';
+$a->strings['User creation error'] = 'Fehler beim Anlegen des Nutzer-Accounts aufgetreten';
+$a->strings['%d contact not imported'] = [
+	0 => '%d Kontakt nicht importiert',
+	1 => '%d Kontakte nicht importiert',
+];
+$a->strings['User profile creation error'] = 'Fehler beim Anlegen des Nutzer-Profils';
+$a->strings['Done. You can now login with your username and password'] = 'Erledigt. Du kannst dich jetzt mit deinem Nutzernamen und Passwort anmelden';
 $a->strings['Welcome to Friendica'] = 'Willkommen bei Friendica';
 $a->strings['New Member Checklist'] = 'Checkliste für neue Mitglieder';
 $a->strings['We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear.'] = 'Wir möchten dir einige Tipps und Links anbieten, die dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für dich an deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden.';
@@ -2663,6 +2670,10 @@ Login Name:	%s (%s)'] = 'Kompletter Name: %s
 URL der Seite: %s
 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['new registration'] = 'Neue Registrierung';
+$a->strings['You\'ve received a new registration from \'%1$s\' at %2$s'] = 'Du hast eine neue Registrierung von %1$s auf %2$s erhalten.';
+$a->strings['You\'ve received a [url=%1$s]new registration[/url] from %2$s.'] = 'Du hast eine [url=%1$s]neue Registrierung[/url] von %2$s erhalten.';
+$a->strings['Please visit %s to have a look at the new registration.'] = 'Bitte rufe %s auf, um dir die Registrierung zu sichten.';
 $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['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.';

From 2edbd1a3e2b90430b378de32f79a7cbd3537d9de Mon Sep 17 00:00:00 2001
From: Thorsten <thorsten.daners@antwerpes.de>
Date: Fri, 18 Nov 2022 19:41:56 +0100
Subject: [PATCH 17/45] Reverted some changes that won't work with PHP7.3

---
 src/App/Page.php                      | 8 ++++----
 src/BaseCollection.php                | 4 ++--
 src/Content/Conversation.php          | 5 +----
 src/Content/Nav.php                   | 2 +-
 src/Core/Session/Handler/Database.php | 4 ++--
 src/Database/Database.php             | 2 +-
 src/Model/Log/ParsedLogIterator.php   | 6 +++---
 7 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/App/Page.php b/src/App/Page.php
index 5f4ac0f6dd..0f14d9f6e6 100644
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -130,7 +130,7 @@ class Page implements ArrayAccess
 	 * The return value will be casted to boolean if non-boolean was returned.
 	 * @since 5.0.0
 	 */
-	public function offsetExists(mixed $offset): bool
+	public function offsetExists($offset): bool
 	{
 		return isset($this->page[$offset]);
 	}
@@ -147,7 +147,7 @@ class Page implements ArrayAccess
 	 * @return mixed Can return all value types.
 	 * @since 5.0.0
 	 */
-	public function offsetGet(mixed $offset): mixed
+	public function offsetGet($offset)
 	{
 		return $this->page[$offset] ?? null;
 	}
@@ -167,7 +167,7 @@ class Page implements ArrayAccess
 	 * @return void
 	 * @since 5.0.0
 	 */
-	public function offsetSet(mixed $offset, mixed $value): void
+	public function offsetSet($offset, $value)
 	{
 		$this->page[$offset] = $value;
 	}
@@ -184,7 +184,7 @@ class Page implements ArrayAccess
 	 * @return void
 	 * @since 5.0.0
 	 */
-	public function offsetUnset(mixed $offset): void
+	public function offsetUnset($offset)
 	{
 		if (isset($this->page[$offset])) {
 			unset($this->page[$offset]);
diff --git a/src/BaseCollection.php b/src/BaseCollection.php
index c711755722..f6fa9bbd4d 100644
--- a/src/BaseCollection.php
+++ b/src/BaseCollection.php
@@ -48,7 +48,7 @@ class BaseCollection extends \ArrayIterator
 	/**
 	 * @inheritDoc
 	 */
-	public function offsetSet(mixed $offset, mixed $value): void
+	public function offsetSet($offset, $value)
 	{
 		if (is_null($offset)) {
 			$this->totalCount++;
@@ -60,7 +60,7 @@ class BaseCollection extends \ArrayIterator
 	/**
 	 * @inheritDoc
 	 */
-	public function offsetUnset(mixed $offset): void
+	public function offsetUnset($offset)
 	{
 		if ($this->offsetExists($offset)) {
 			$this->totalCount--;
diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index 46a906b138..da9aee87b0 100644
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -794,10 +794,7 @@ class Conversation
 			return [];
 		}
 
-		$blocked = $this->pConfig->get($this->session->getLocalUserId(), 'system', 'blocked');
-		if (!empty($blocked)) {
-			$str_blocked = str_replace(["\n", "\r"], ",", $blocked);
-		}
+		$str_blocked = str_replace(["\n", "\r"], ",", $this->pConfig->get($this->session->getLocalUserId(), 'system', 'blocked'));
 		if (empty($str_blocked)) {
 			return [];
 		}
diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 17fb1d12ce..0000b3d296 100644
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -245,7 +245,7 @@ class Nav
 
 		$gdirpath = 'directory';
 
-		if (empty(DI::config()->get('system', 'singleuser'))) {
+		if (strlen(DI::config()->get('system', 'singleuser'))) {
 			$gdir = DI::config()->get('system', 'directory');
 			if (strlen($gdir)) {
 				$gdirpath = Profile::zrl($gdir, true);
diff --git a/src/Core/Session/Handler/Database.php b/src/Core/Session/Handler/Database.php
index 6d067d8b6f..41ccb6b33f 100644
--- a/src/Core/Session/Handler/Database.php
+++ b/src/Core/Session/Handler/Database.php
@@ -57,7 +57,7 @@ class Database extends AbstractSessionHandler
 		return true;
 	}
 
-	public function read($id): string|false
+	public function read($id)
 	{
 		if (empty($id)) {
 			return '';
@@ -136,7 +136,7 @@ class Database extends AbstractSessionHandler
 		}
 	}
 
-	public function gc($max_lifetime): int|false
+	public function gc($max_lifetime): bool
 	{
 		try {
 			return $this->dba->delete('session', ["`expire` < ?", time()]);
diff --git a/src/Database/Database.php b/src/Database/Database.php
index 5dac99bcee..79c39e9af7 100644
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -117,7 +117,7 @@ class Database
 			$port = trim($serverdata[1]);
 		}
 
-		if (!empty(trim((string) $this->configCache->get('database', 'port')))) {
+		if (!empty(trim($this->configCache->get('database', 'port')))) {
 			$port = trim($this->configCache->get('database', 'port'));
 		}
 
diff --git a/src/Model/Log/ParsedLogIterator.php b/src/Model/Log/ParsedLogIterator.php
index 151a66adb4..4309e4cd00 100644
--- a/src/Model/Log/ParsedLogIterator.php
+++ b/src/Model/Log/ParsedLogIterator.php
@@ -160,7 +160,7 @@ class ParsedLogIterator implements \Iterator
 	 * @see Iterator::next()
 	 * @return void
 	 */
-	public function next(): void
+	public function next()
 	{
 		$parsed = $this->read();
 
@@ -177,7 +177,7 @@ class ParsedLogIterator implements \Iterator
 	 * @see Iterator::rewind()
 	 * @return void
 	 */
-	public function rewind(): void
+	public function rewind()
 	{
 		$this->value = null;
 		$this->reader->rewind();
@@ -202,7 +202,7 @@ class ParsedLogIterator implements \Iterator
 	 * @see Iterator::current()
 	 * @return ?ParsedLogLing
 	 */
-	public function current(): mixed
+	public function current()
 	{
 		return $this->value;
 	}

From 45badbf0f8b6dc59e6465536ec5a5e0fa274cc55 Mon Sep 17 00:00:00 2001
From: Thorsten <thorsten.daners@antwerpes.de>
Date: Fri, 18 Nov 2022 19:43:47 +0100
Subject: [PATCH 18/45] Changed ddev config to match supported PHP version.

---
 .ddev/config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ddev/config.yaml b/.ddev/config.yaml
index 810da8d6f0..afc9776564 100644
--- a/.ddev/config.yaml
+++ b/.ddev/config.yaml
@@ -1,7 +1,7 @@
 name: my-friendica
 type: php
 docroot: ""
-php_version: "8.1"
+php_version: "7.3"
 webserver_type: apache-fpm
 router_http_port: "80"
 router_https_port: "443"
@@ -17,7 +17,7 @@ use_dns_when_possible: true
 composer_version: "1"
 web_environment: []
 nodejs_version: "16"
-webimage_extra_packages: [php-gmp]
+webimage_extra_packages: [php7.3-gmp]
 
 # Key features of ddev's config.yaml:
 

From 565ade02a48075be6d69ac9844bcd8c897950968 Mon Sep 17 00:00:00 2001
From: Schnoop <thorsten@daners.info>
Date: Fri, 18 Nov 2022 20:07:46 +0100
Subject: [PATCH 19/45] Update main.js

Revert trailing slash changes as this will lead to wrong urls.
---
 view/js/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/js/main.js b/view/js/main.js
index e11585381c..93340dc37f 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -590,7 +590,7 @@ function liveUpdate(src) {
 
 	var orgHeight = $("section").height();
 
-	var udargs = ((netargs.length) ? netargs : '');
+	var udargs = ((netargs.length) ? '/' + netargs : '');
 
 	var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&force=' + (force ? 1 : 0) + '&item=' + update_item;
 

From 6460218c0eafbb0e567885e1166e2427c6f41068 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 18 Nov 2022 16:04:02 -0500
Subject: [PATCH 20/45] Ensure register records aren't created with uid = 0

- uid = 0 matches system account and public contact records, giving unexpected display in pending user list. More importantly, the originally created user can't be approved since its user id is lost.
---
 src/Model/Register.php  | 27 ++++++++++++++++++---------
 src/Module/Register.php | 12 ++++++++++--
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/Model/Register.php b/src/Model/Register.php
index c24e66d4d0..3965246731 100644
--- a/src/Model/Register.php
+++ b/src/Model/Register.php
@@ -23,6 +23,7 @@ namespace Friendica\Model;
 
 use Friendica\Content\Pager;
 use Friendica\Database\DBA;
+use Friendica\Network\HTTPException;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 
@@ -113,21 +114,27 @@ class Register
 	}
 
 	/**
-	 * Creates a register record for approval and returns the success of the database insert
+	 * Creates a register record for approval
 	 * Checks for the existence of the provided user id
 	 *
-	 * @param  integer $uid      The ID of the user needing approval
-	 * @param  string  $language The registration language
-	 * @param  string  $note     An additional message from the user
-	 * @return boolean
-	 * @throws \Exception
+	 * @param integer $uid      The ID of the user needing approval
+	 * @param string  $language The registration language
+	 * @param string  $note     An additional message from the user
+	 * @return void
+	 * @throws \OutOfBoundsException
+	 * @throws HTTPException\InternalServerErrorException
+	 * @throws HTTPException\NotFoundException
 	 */
-	public static function createForApproval(int $uid, string $language, string $note = ''): bool
+	public static function createForApproval(int $uid, string $language, string $note = ''): void
 	{
 		$hash = Strings::getRandomHex();
 
+		if (!$uid) {
+			throw new \OutOfBoundsException("User ID can't be empty");
+		}
+
 		if (!User::exists($uid)) {
-			return false;
+			throw new HTTPException\NotFoundException("User ID doesn't exist");
 		}
 
 		$fields = [
@@ -139,7 +146,9 @@ class Register
 			'note'     => $note
 		];
 
-		return DBA::insert('register', $fields);
+		if (!DBA::insert('register', $fields)) {
+			throw new HTTPException\InternalServerErrorException('Unable to insert a `register` record');
+		}
 	}
 
 	/**
diff --git a/src/Module/Register.php b/src/Module/Register.php
index b71fb777c5..cd963c17a5 100644
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -353,6 +353,7 @@ class Register extends BaseModule
 			}
 		} elseif (intval(DI::config()->get('config', 'register_policy')) === self::APPROVE) {
 			if (!User::getAdminEmailList()) {
+				$this->logger->critical('Registration policy is set to APPROVE but no admin email address has been set in config.admin_email');
 				DI::sysmsg()->addNotice(DI::l10n()->t('Your registration can not be processed.'));
 				DI::baseUrl()->redirect();
 			}
@@ -362,10 +363,17 @@ class Register extends BaseModule
 				DI::sysmsg()->addNotice(DI::l10n()->t('You have to leave a request note for the admin.')
 					. DI::l10n()->t('Your registration can not be processed.'));
 
-				DI::baseUrl()->redirect('register/');
+				$this->baseUrl->redirect('register');
 			}
 
-			Model\Register::createForApproval($user['uid'], DI::config()->get('system', 'language'), $_POST['permonlybox']);
+			try {
+				Model\Register::createForApproval($user['uid'], DI::config()->get('system', 'language'), $_POST['permonlybox']);
+			} catch (\Throwable $e) {
+				$this->logger->error('Unable to create a `register` record.', ['user' => $user]);
+				DI::sysmsg()->addNotice(DI::l10n()->t('An internal error occured.')
+					. DI::l10n()->t('Your registration can not be processed.'));
+				$this->baseUrl->redirect('register');
+			}
 
 			// invite system
 			if ($using_invites && $invite_id) {

From 805fa6024f8e4126eedcb25a0d5cdc70fcde6d5f Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 19 Nov 2022 07:53:55 -0500
Subject: [PATCH 21/45] Update main translation file after adding strings

---
 view/lang/C/messages.po | 57 ++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index 261a3bd363..0428ba5900 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2022.12-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-15 21:34+0000\n"
+"POT-Creation-Date: 2022-11-19 07:52-0500\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"
@@ -26,7 +26,7 @@ msgstr ""
 #: mod/fbrowser.php:119 mod/fbrowser.php:146 mod/photos.php:999
 #: mod/photos.php:1100 src/Content/Conversation.php:389
 #: src/Module/Contact/Follow.php:171 src/Module/Contact/Revoke.php:109
-#: src/Module/Contact/Unfollow.php:126 src/Module/Post/Edit.php:165
+#: src/Module/Contact/Unfollow.php:126 src/Module/Post/Edit.php:164
 #: src/Module/Post/Tag/Remove.php:109 src/Module/Profile/RemoteFollow.php:134
 #: src/Module/Security/TwoFactor/SignOut.php:125
 msgid "Cancel"
@@ -531,7 +531,7 @@ msgid "Do not show a status post for this upload"
 msgstr ""
 
 #: mod/photos.php:934 mod/photos.php:1288 src/Content/Conversation.php:373
-#: src/Module/Calendar/Event/Form.php:253 src/Module/Post/Edit.php:180
+#: src/Module/Calendar/Event/Form.php:253 src/Module/Post/Edit.php:179
 msgid "Permissions"
 msgstr ""
 
@@ -652,7 +652,7 @@ msgstr ""
 
 #: mod/photos.php:1334 mod/photos.php:1390 mod/photos.php:1464
 #: src/Content/Conversation.php:386 src/Module/Calendar/Event/Form.php:248
-#: src/Module/Item/Compose.php:199 src/Module/Post/Edit.php:163
+#: src/Module/Item/Compose.php:199 src/Module/Post/Edit.php:162
 #: src/Object/Post.php:997
 msgid "Preview"
 msgstr ""
@@ -1228,27 +1228,27 @@ msgid "attach file"
 msgstr ""
 
 #: src/Content/Conversation.php:346 src/Module/Item/Compose.php:190
-#: src/Module/Post/Edit.php:169 src/Object/Post.php:988
+#: src/Module/Post/Edit.php:168 src/Object/Post.php:988
 msgid "Bold"
 msgstr ""
 
 #: src/Content/Conversation.php:347 src/Module/Item/Compose.php:191
-#: src/Module/Post/Edit.php:170 src/Object/Post.php:989
+#: src/Module/Post/Edit.php:169 src/Object/Post.php:989
 msgid "Italic"
 msgstr ""
 
 #: src/Content/Conversation.php:348 src/Module/Item/Compose.php:192
-#: src/Module/Post/Edit.php:171 src/Object/Post.php:990
+#: src/Module/Post/Edit.php:170 src/Object/Post.php:990
 msgid "Underline"
 msgstr ""
 
 #: src/Content/Conversation.php:349 src/Module/Item/Compose.php:193
-#: src/Module/Post/Edit.php:172 src/Object/Post.php:991
+#: src/Module/Post/Edit.php:171 src/Object/Post.php:991
 msgid "Quote"
 msgstr ""
 
 #: src/Content/Conversation.php:350 src/Module/Item/Compose.php:194
-#: src/Module/Post/Edit.php:173 src/Object/Post.php:992
+#: src/Module/Post/Edit.php:172 src/Object/Post.php:992
 msgid "Code"
 msgstr ""
 
@@ -1258,12 +1258,12 @@ msgid "Image"
 msgstr ""
 
 #: src/Content/Conversation.php:352 src/Module/Item/Compose.php:196
-#: src/Module/Post/Edit.php:174 src/Object/Post.php:994
+#: src/Module/Post/Edit.php:173 src/Object/Post.php:994
 msgid "Link"
 msgstr ""
 
 #: src/Content/Conversation.php:353 src/Module/Item/Compose.php:197
-#: src/Module/Post/Edit.php:175 src/Object/Post.php:995
+#: src/Module/Post/Edit.php:174 src/Object/Post.php:995
 msgid "Link or Media"
 msgstr ""
 
@@ -1289,12 +1289,12 @@ msgid "clear location"
 msgstr ""
 
 #: src/Content/Conversation.php:360 src/Module/Item/Compose.php:205
-#: src/Module/Post/Edit.php:155
+#: src/Module/Post/Edit.php:154
 msgid "Set title"
 msgstr ""
 
 #: src/Content/Conversation.php:362 src/Module/Item/Compose.php:206
-#: src/Module/Post/Edit.php:157
+#: src/Module/Post/Edit.php:156
 msgid "Categories (comma-separated list)"
 msgstr ""
 
@@ -1312,16 +1312,16 @@ msgstr ""
 
 #: src/Content/Conversation.php:396 src/Content/Widget/VCard.php:113
 #: src/Model/Profile.php:465 src/Module/Admin/Logs/View.php:93
-#: src/Module/Post/Edit.php:178
+#: src/Module/Post/Edit.php:177
 msgid "Message"
 msgstr ""
 
-#: src/Content/Conversation.php:397 src/Module/Post/Edit.php:179
+#: src/Content/Conversation.php:397 src/Module/Post/Edit.php:178
 #: src/Module/Settings/TwoFactor/Trusted.php:139
 msgid "Browser"
 msgstr ""
 
-#: src/Content/Conversation.php:399 src/Module/Post/Edit.php:182
+#: src/Content/Conversation.php:399 src/Module/Post/Edit.php:181
 msgid "Open Compose page"
 msgstr ""
 
@@ -2246,7 +2246,7 @@ msgstr ""
 msgid "CC: email addresses"
 msgstr ""
 
-#: src/Core/ACL.php:327 src/Module/Post/Edit.php:158
+#: src/Core/ACL.php:327 src/Module/Post/Edit.php:157
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -3285,7 +3285,7 @@ msgstr ""
 msgid "Title/Description:"
 msgstr ""
 
-#: src/Model/Profile.php:1019 src/Module/Admin/Summary.php:215
+#: src/Model/Profile.php:1019 src/Module/Admin/Summary.php:217
 #: src/Module/Moderation/Summary.php:77
 msgid "Summary"
 msgstr ""
@@ -3613,7 +3613,7 @@ msgstr ""
 #: src/Module/Admin/Federation.php:202 src/Module/Admin/Logs/Settings.php:79
 #: src/Module/Admin/Logs/View.php:84 src/Module/Admin/Queue.php:72
 #: src/Module/Admin/Site.php:431 src/Module/Admin/Storage.php:138
-#: src/Module/Admin/Summary.php:214 src/Module/Admin/Themes/Details.php:90
+#: src/Module/Admin/Summary.php:216 src/Module/Admin/Themes/Details.php:90
 #: src/Module/Admin/Themes/Index.php:111 src/Module/Admin/Tos.php:75
 #: src/Module/Moderation/Users/Create.php:61
 #: src/Module/Moderation/Users/Pending.php:96
@@ -5117,11 +5117,11 @@ msgstr ""
 msgid "Server Settings"
 msgstr ""
 
-#: src/Module/Admin/Summary.php:217
+#: src/Module/Admin/Summary.php:219
 msgid "Version"
 msgstr ""
 
-#: src/Module/Admin/Summary.php:221
+#: src/Module/Admin/Summary.php:223
 msgid "Active addons"
 msgstr ""
 
@@ -8081,11 +8081,11 @@ msgstr ""
 msgid "Invalid photo with id %s."
 msgstr ""
 
-#: src/Module/Post/Edit.php:82 src/Module/Post/Edit.php:94
+#: src/Module/Post/Edit.php:82 src/Module/Post/Edit.php:96
 msgid "Post not found."
 msgstr ""
 
-#: src/Module/Post/Edit.php:101
+#: src/Module/Post/Edit.php:102
 msgid "Edit post"
 msgstr ""
 
@@ -8449,15 +8449,20 @@ msgstr ""
 msgid "Registration successful."
 msgstr ""
 
-#: src/Module/Register.php:356 src/Module/Register.php:363
+#: src/Module/Register.php:357 src/Module/Register.php:364
+#: src/Module/Register.php:374
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: src/Module/Register.php:362
+#: src/Module/Register.php:363
 msgid "You have to leave a request note for the admin."
 msgstr ""
 
-#: src/Module/Register.php:387
+#: src/Module/Register.php:373
+msgid "An internal error occured."
+msgstr ""
+
+#: src/Module/Register.php:395
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 

From d77fece3677635ae73554a4a6e8c5c18945ace1f Mon Sep 17 00:00:00 2001
From: Thorsten <thorsten.daners@antwerpes.de>
Date: Sat, 19 Nov 2022 15:17:42 +0100
Subject: [PATCH 22/45] Fix route for user import.

---
 view/templates/register.tpl            | 2 +-
 view/theme/frio/templates/register.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/templates/register.tpl b/view/templates/register.tpl
index bf6c9e37aa..40bf466d21 100644
--- a/view/templates/register.tpl
+++ b/view/templates/register.tpl
@@ -92,7 +92,7 @@
 	{{if !$additional}}
 		<h3>{{$importh}}</h3>
 		<div id ="import-profile">
-			<a href="uimport">{{$importt}}</a>
+			<a href="user/import">{{$importt}}</a>
 		</div>
 	{{/if}}
 </form>
diff --git a/view/theme/frio/templates/register.tpl b/view/theme/frio/templates/register.tpl
index 6ef70b3e67..918dea95c9 100644
--- a/view/theme/frio/templates/register.tpl
+++ b/view/theme/frio/templates/register.tpl
@@ -92,7 +92,7 @@
 		{{if !$additional}}
 			<h3>{{$importh}}</h3>
 			<div id ="import-profile">
-				<a href="uimport">{{$importt}}</a>
+				<a href="user/import">{{$importt}}</a>
 			</div>
 		{{/if}}
 	</form>

From 877369d964ca74fd96e65731ee5fcdf9ac4adbb4 Mon Sep 17 00:00:00 2001
From: Thorsten <thorsten.daners@antwerpes.de>
Date: Sat, 19 Nov 2022 16:48:07 +0100
Subject: [PATCH 23/45] Fix that user property should be an object instead of
 array.

---
 src/Model/Nodeinfo.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Model/Nodeinfo.php b/src/Model/Nodeinfo.php
index b10572612d..93b3b5b2da 100644
--- a/src/Model/Nodeinfo.php
+++ b/src/Model/Nodeinfo.php
@@ -80,19 +80,17 @@ class Nodeinfo
 		$config = DI::config();
 
 		$usage = new stdClass();
-		$usage->users = [];
+		$usage->users = new \stdClass;
 
 		if (!empty($config->get('system', 'nodeinfo'))) {
-			$usage->users = [
-				'total'          => intval($config->get('nodeinfo', 'total_users')),
-				'activeHalfyear' => intval($config->get('nodeinfo', 'active_users_halfyear')),
-				'activeMonth'    => intval($config->get('nodeinfo', 'active_users_monthly'))
-			];
+			$usage->users->total = intval($config->get('nodeinfo', 'total_users'));
+			$usage->users->activeHalfyear = intval($config->get('nodeinfo', 'active_users_halfyear'));
+			$usage->users->activeMonth = intval($config->get('nodeinfo', 'active_users_monthly'));
 			$usage->localPosts = intval($config->get('nodeinfo', 'local_posts'));
 			$usage->localComments = intval($config->get('nodeinfo', 'local_comments'));
 
 			if ($version2) {
-				$usage->users['activeWeek'] = intval($config->get('nodeinfo', 'active_users_weekly'));
+				$usage->users->activeWeek = intval($config->get('nodeinfo', 'active_users_weekly'));
 			}
 		}
 

From 90567772bda8ea52b1a69612477950084a160397 Mon Sep 17 00:00:00 2001
From: Thorsten <thorsten.daners@antwerpes.de>
Date: Sat, 19 Nov 2022 18:16:41 +0100
Subject: [PATCH 24/45] Prevent division by zero.

---
 src/Object/Api/Mastodon/Attachment.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/Object/Api/Mastodon/Attachment.php b/src/Object/Api/Mastodon/Attachment.php
index 8156155cde..90b1bffb9f 100644
--- a/src/Object/Api/Mastodon/Attachment.php
+++ b/src/Object/Api/Mastodon/Attachment.php
@@ -63,15 +63,19 @@ class Attachment extends BaseDataTransferObject
 		$this->text_url = $this->remote_url ?? $this->url;
 		$this->description = $attachment['description'];
 		if ($type === 'image') {
-			$this->meta['original']['width'] = (int) $attachment['width'];
-			$this->meta['original']['height'] = (int) $attachment['height'];
-			$this->meta['original']['size'] = (int) $attachment['width'] . 'x' . (int) $attachment['height'];
-			$this->meta['original']['aspect'] = (float) ((int)  $attachment['width'] / (int) $attachment['height']);
+			if ((int) $attachment['width'] > 0 && (int) $attachment['height'] > 0) {
+				$this->meta['original']['width'] = (int) $attachment['width'];
+				$this->meta['original']['height'] = (int) $attachment['height'];
+				$this->meta['original']['size'] = (int) $attachment['width'] . 'x' . (int) $attachment['height'];
+				$this->meta['original']['aspect'] = (float) ((int)  $attachment['width'] / (int) $attachment['height']);
+			}
 
-			$this->meta['small']['width'] = (int) $attachment['preview-width'];
-			$this->meta['small']['height'] = (int) $attachment['preview-height'];
-			$this->meta['small']['size'] = (int) $attachment['preview-width'] . 'x' . (int) $attachment['preview-height'];
-			$this->meta['small']['aspect'] = (float) ((int)  $attachment['preview-width'] / (int) $attachment['preview-height']);
+			if ((int) $attachment['preview-width'] > 0 && (int) $attachment['preview-height'] > 0) {
+				$this->meta['small']['width'] = (int) $attachment['preview-width'];
+				$this->meta['small']['height'] = (int) $attachment['preview-height'];
+				$this->meta['small']['size'] = (int) $attachment['preview-width'] . 'x' . (int) $attachment['preview-height'];
+				$this->meta['small']['aspect'] = (float) ((int)  $attachment['preview-width'] / (int) $attachment['preview-height']);
+			}
 		}
 	}
 

From de5097b7728b3c9d40daf8ac04df12ca09b4477f Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 19 Nov 2022 12:25:27 -0500
Subject: [PATCH 25/45] Fix support for `/contact/redir` URLs in
 Module\Contact\Hovercard

- The feature was broken after the Redir route was moved
---
 src/Module/Contact/Hovercard.php | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/Module/Contact/Hovercard.php b/src/Module/Contact/Hovercard.php
index 620b96095a..953d7e7a7f 100644
--- a/src/Module/Contact/Hovercard.php
+++ b/src/Module/Contact/Hovercard.php
@@ -47,20 +47,11 @@ class Hovercard extends BaseModule
 		// If a contact is connected the url is internally changed to 'contact/redir/CID'. We need the pure url to search for
 		// the contact. So we strip out the contact id from the internal url and look in the contact table for
 		// the real url (nurl)
-		if (strpos($contact_url, 'contact/redir/') === 0) {
-			$cid = intval(substr($contact_url, 6));
-		} elseif (strpos($contact_url, 'contact/') === 0) {
-			$cid = intval(substr($contact_url, 8));
-		}
-
-		if (!empty($cid)) {			
-			$remote_contact = Contact::selectFirst(['nurl'], ['id' => $cid]);
+		if (strpos($contact_url, 'contact/') === 0) {
+			$remote_contact = Contact::selectFirst(['nurl'], ['id' => intval(basename($contact_url))]);
 			$contact_url = $remote_contact['nurl'] ?? '';
 		}
 
-		$contact = [];
-
-		// if it's the url containing https it should be converted to http
 		if (!$contact_url) {
 			throw new HTTPException\BadRequestException();
 		}

From 525eab395cf4f5883ea50e5584c9a05b7b7e5325 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 18 Nov 2022 20:44:53 -0500
Subject: [PATCH 26/45] Improve error message when conversation isn't available
 in Module\Item\Display

- Retrieve the parent post no matter what. Previously it was depending on the user's settings, which gave unpredictable behavior if the parent post wasn't retrieved for whatever reason.
- List possible reasons the conversation isn't showing up based on the condition in Model\Post::selectViewForUser
- Allow HTML in exception messages
---
 src/Module/Item/Display.php  | 12 ++++++++++--
 view/templates/exception.tpl |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Module/Item/Display.php b/src/Module/Item/Display.php
index 42112a3e02..df500f7ccb 100644
--- a/src/Module/Item/Display.php
+++ b/src/Module/Item/Display.php
@@ -136,7 +136,7 @@ class Display extends BaseModule
 		}
 
 		if ($item['gravity'] != Item::GRAVITY_PARENT) {
-			$parent = Post::selectFirstForUser($itemUid, $fields, [
+			$parent = Post::selectFirst($fields, [
 				'uid'    => [0, $itemUid],
 				'uri-id' => $item['parent-uri-id']
 			], ['order' => ['uid' => true]]);
@@ -249,7 +249,15 @@ class Display extends BaseModule
 		$item = Post::selectFirstForUser($pageUid, $fields, $condition);
 
 		if (empty($item)) {
-			throw new HTTPException\NotFoundException($this->t('The requested item doesn\'t exist or has been deleted.'));
+			$this->page['aside'] = '';
+			throw new HTTPException\NotFoundException($this->t('Unfortunately, the requested conversation isn\'t available to you.</p>
+<p>Possible reasons include:</p>
+<ul>
+	<li>The top-level post isn\'t visible.</li>
+	<li>The top-level post was deleted.</li>
+	<li>The node has blocked the top-level author or the author of the shared post.</li>
+	<li>You have ignored or blocked the top-level author or the author of the shared post.</li>
+</ul><p>'));
 		}
 
 		$item['uri-id'] = $item['parent-uri-id'];
diff --git a/view/templates/exception.tpl b/view/templates/exception.tpl
index 0456136bc4..ad1a15f878 100644
--- a/view/templates/exception.tpl
+++ b/view/templates/exception.tpl
@@ -1,7 +1,7 @@
 <div id="exception" class="generic-page-wrapper">
     <img class="hare" src="images/friendica-404_svg_flexy-o-hare.png"/>
     <h1>{{$title}}</h1>
-    <p>{{$message}}</p>
+    <p>{{$message nofilter}}</p>
 {{if $thrown}}
 	<pre>{{$thrown}}
 {{$stack_trace}}

From 0c8242af642a11afd868cdd6631cbb5840d68643 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 19 Nov 2022 07:50:07 -0500
Subject: [PATCH 27/45] Update main translation file after adding a string

---
 view/lang/C/messages.po | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index 0428ba5900..cbd26b59a4 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2022.12-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-19 07:52-0500\n"
+"POT-Creation-Date: 2022-11-19 12:01-0500\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"
@@ -7089,11 +7089,24 @@ msgid ""
 "<a href=\"/settings/display\">Theme Customization settings</a>."
 msgstr ""
 
-#: src/Module/Item/Display.php:135 src/Module/Item/Display.php:252
-#: src/Module/Update/Display.php:55
+#: src/Module/Item/Display.php:135 src/Module/Update/Display.php:55
 msgid "The requested item doesn't exist or has been deleted."
 msgstr ""
 
+#: src/Module/Item/Display.php:253
+msgid ""
+"Unfortunately, the requested conversation isn't available to you.</p>\n"
+"<p>Possible reasons include:</p>\n"
+"<ul>\n"
+"\t<li>The top-level post isn't visible.</li>\n"
+"\t<li>The top-level post was deleted.</li>\n"
+"\t<li>The node has blocked the top-level author or the author of the shared "
+"post.</li>\n"
+"\t<li>You have ignored or blocked the top-level author or the author of the "
+"shared post.</li>\n"
+"</ul><p>"
+msgstr ""
+
 #: src/Module/Item/Feed.php:86
 msgid "The feed for this item is unavailable."
 msgstr ""

From a91944af24c2a06725f853717eb31378e055b520 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 19 Nov 2022 13:33:05 -0500
Subject: [PATCH 28/45] Fix constructor compatibility with BaseSettings parent
 class

- Address https://paste.metaversum.wtf/?fc75de3f8eba6e7d#813SFjJwWWaJERQyrEpGAVnL33xZpTRV4MZeKmzsAvK8
---
 src/Module/Settings/TwoFactor/AppSpecific.php | 5 +++--
 src/Module/Settings/TwoFactor/Recovery.php    | 7 ++++---
 src/Module/Settings/TwoFactor/Trusted.php     | 5 +++--
 src/Module/Settings/TwoFactor/Verify.php      | 5 +++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/Module/Settings/TwoFactor/AppSpecific.php b/src/Module/Settings/TwoFactor/AppSpecific.php
index 8a8d4801c7..7561712cb3 100644
--- a/src/Module/Settings/TwoFactor/AppSpecific.php
+++ b/src/Module/Settings/TwoFactor/AppSpecific.php
@@ -25,6 +25,7 @@ use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Renderer;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\DI;
 use Friendica\Module\Response;
 use Friendica\Security\TwoFactor\Model\AppSpecificPassword;
@@ -45,9 +46,9 @@ class AppSpecific extends BaseSettings
 	/** @var IManagePersonalConfigValues */
 	protected $pConfig;
 
-	public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManagePersonalConfigValues $pConfig, array $server, array $parameters = [])
+	public function __construct(IManagePersonalConfigValues $pConfig, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
 	{
-		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+		parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
 		$this->pConfig = $pConfig;
 
diff --git a/src/Module/Settings/TwoFactor/Recovery.php b/src/Module/Settings/TwoFactor/Recovery.php
index cde63f4fa2..82423747c9 100644
--- a/src/Module/Settings/TwoFactor/Recovery.php
+++ b/src/Module/Settings/TwoFactor/Recovery.php
@@ -25,6 +25,7 @@ use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Renderer;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\DI;
 use Friendica\Module\Response;
 use Friendica\Security\TwoFactor\Model\RecoveryCode;
@@ -43,9 +44,9 @@ class Recovery extends BaseSettings
 	/** @var IManagePersonalConfigValues */
 	protected $pConfig;
 
-	public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManagePersonalConfigValues $pConfig, array $server, array $parameters = [])
+	public function __construct(IManagePersonalConfigValues $pConfig, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
 	{
-		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+		parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
 		$this->pConfig = $pConfig;
 
@@ -97,7 +98,7 @@ class Recovery extends BaseSettings
 		$recoveryCodes = RecoveryCode::getListForUser(DI::userSession()->getLocalUserId());
 
 		$verified = $this->pConfig->get(DI::userSession()->getLocalUserId(), '2fa', 'verified');
-		
+
 		return Renderer::replaceMacros(Renderer::getMarkupTemplate('settings/twofactor/recovery.tpl'), [
 			'$form_security_token'     => self::getFormSecurityToken('settings_2fa_recovery'),
 			'$password_security_token' => self::getFormSecurityToken('settings_2fa_password'),
diff --git a/src/Module/Settings/TwoFactor/Trusted.php b/src/Module/Settings/TwoFactor/Trusted.php
index 6196eec7d7..00e8fe7024 100644
--- a/src/Module/Settings/TwoFactor/Trusted.php
+++ b/src/Module/Settings/TwoFactor/Trusted.php
@@ -25,6 +25,7 @@ use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Renderer;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\DI;
 use Friendica\Module\BaseSettings;
 use Friendica\Module\Response;
@@ -45,9 +46,9 @@ class Trusted extends BaseSettings
 	/** @var TwoFactor\Repository\TrustedBrowser */
 	protected $trustedBrowserRepo;
 
-	public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManagePersonalConfigValues $pConfig, TwoFactor\Repository\TrustedBrowser $trustedBrowserRepo, array $server, array $parameters = [])
+	public function __construct(IManagePersonalConfigValues $pConfig, TwoFactor\Repository\TrustedBrowser $trustedBrowserRepo, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
 	{
-		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+		parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
 		$this->pConfig            = $pConfig;
 		$this->trustedBrowserRepo = $trustedBrowserRepo;
diff --git a/src/Module/Settings/TwoFactor/Verify.php b/src/Module/Settings/TwoFactor/Verify.php
index 0c6ab59ba8..80005cf221 100644
--- a/src/Module/Settings/TwoFactor/Verify.php
+++ b/src/Module/Settings/TwoFactor/Verify.php
@@ -29,6 +29,7 @@ use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Renderer;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\DI;
 use Friendica\Module\BaseSettings;
 use Friendica\Module\Response;
@@ -47,9 +48,9 @@ class Verify extends BaseSettings
 	/** @var IManagePersonalConfigValues */
 	protected $pConfig;
 
-	public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManagePersonalConfigValues $pConfig, array $server, array $parameters = [])
+	public function __construct(IManagePersonalConfigValues $pConfig, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
 	{
-		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+		parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
 		$this->pConfig = $pConfig;
 

From 24804eb0422ec904649ee534bf384cbb2412d78c Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 19 Nov 2022 17:16:01 -0500
Subject: [PATCH 29/45] Hide non-functional mass deletion feature in search
 view

---
 src/Content/Conversation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index da9aee87b0..be7448a336 100644
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -526,7 +526,7 @@ class Conversation
 			$live_update_div = '<div id="live-search"></div>' . "\r\n";
 		}
 
-		$page_dropping = $this->session->getLocalUserId() && $this->session->getLocalUserId() == $uid;
+		$page_dropping = $this->session->getLocalUserId() && $this->session->getLocalUserId() == $uid && $mode != 'search';
 
 		if (!$update) {
 			$_SESSION['return_path'] = $this->args->getQueryString();

From a4eb6f971f7cfc0594e91b22633481a0b35ee8df Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 19 Nov 2022 17:16:51 -0500
Subject: [PATCH 30/45] [frio] Improve search list display for web and mobile

- Reduced margins
- Repositioned the network icon and external link
---
 view/theme/frio/templates/conversation.tpl |  30 ++
 view/theme/frio/templates/search_item.tpl  | 531 ++++++++++-----------
 2 files changed, 294 insertions(+), 267 deletions(-)
 create mode 100644 view/theme/frio/templates/conversation.tpl

diff --git a/view/theme/frio/templates/conversation.tpl b/view/theme/frio/templates/conversation.tpl
new file mode 100644
index 0000000000..492c005b8f
--- /dev/null
+++ b/view/theme/frio/templates/conversation.tpl
@@ -0,0 +1,30 @@
+{{$live_update nofilter}}
+{{foreach $threads as $thread}}
+<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper panel toplevel_item">
+    {{foreach $thread.items as $item}}
+        {{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+				<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span>
+				<span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
+			</div>
+			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
+        {{/if}}
+        {{if $item.comment_lastcollapsed}}</div>{{/if}}
+
+        {{include file="{{$item.template}}"}}
+
+    {{/foreach}}
+</div>
+{{/foreach}}
+
+{{if !$update}}
+<div id="conversation-end"></div>
+    {{if $dropping}}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
+	<div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}"
+	     onmouseover="imgbright(this);" onmouseout="imgdull(this);"></div>
+	<div id="item-delete-selected-desc">{{$dropping}}</div>
+</div>
+<div id="item-delete-selected-end"></div>
+    {{/if}}
+{{/if}}
diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index 7d381282ca..62a357fa6b 100644
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@ -1,302 +1,299 @@
-<!-- TODO => Unknow block -->
-<div class="wall-item-decor" style="display:none;">
-	{{if $item.star}}<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>{{/if}}
-	{{if $item.lock}}<span class="navicon lock fakelink" onclick="lockview(event, 'item', {{$item.id}});" title="{{$item.lock}}"></span><span class="fa fa-lock" aria-hidden="true"></span>{{/if}}
-</div>
-<!-- ./TODO => Unknow block -->
+<div id="item-{{$item.guid}}" class="item-{{$item.id}} wall-item-container panel-body{{$item.indent}} {{$item.shiny}} {{$item.previewing}}">
+	<div class="media">
+		{{* Put additional actions in a top-right dropdown menu *}}
+
+		{{* The avatar picture and the photo-menu *}}
+		<div class="dropdown pull-left"><!-- Dropdown -->
+			<div class="hidden-sm hidden-xs contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
+				<a href="{{$item.profile_url}}" class="userinfo click-card u-url" id="wall-item-photo-menu-{{$item.id}}">
+					<div class="contact-photo-image-wrapper">
+						<img src="{{$item.thumb}}" class="contact-photo media-object {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+					</div>
+				</a>
+			</div>
+			<div class="hidden-lg hidden-md contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
+				<a href="{{$item.profile_url}}" class="userinfo click-card u-url" id="wall-item-photo-menu-xs-{{$item.id}}">
+					<div class="contact-photo-image-wrapper">
+						<img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}}" id="wall-item-photo-xs-{{$item.id}}" alt="{{$item.name}}" />
+					</div>
+				</a>
+			</div>
+		</div><!-- ./Dropdown -->
 
 
-<div class="panel item-{{$item.id}}" id="item-{{$item.guid}}">
-	<span class="commented" style="display: none;">{{$item.commented}}</span>
-	<span class="received" style="display: none;">{{$item.received}}</span>
-	<span class="created" style="display: none;">{{$item.created_date}}</span>
-	<span class="uriid" style="display: none;">{{$item.uriid}}</span>
-	<div class="wall-item-container panel-body{{$item.indent}} {{$item.shiny}} {{$item.previewing}}">
-		<div class="media">
-			{{* Put additional actions in a top-right dropdown menu *}}
-
+		{{* contact info header*}}
+		<div role="heading" class="contact-info hidden-sm hidden-xs media-body"><!-- <= For computer -->
 			<div class="preferences">
-			{{if $item.network_icon != ""}}
-				<span class="wall-item-network"><i class="fa fa-{{$item.network_icon}}" title="{{$item.network_name}}" aria-hidden="true"></i></span>
-			{{else}}
-				<span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span>
-			{{/if}}
-			{{if $item.plink}}	{{*link to the original source of the item *}}
-				<a href="{{$item.plink.href}}" class="plink u-url" aria-label="{{$item.plink.title}}" title="{{$item.plink.title}}">
-					<i class="fa fa-external-link"></i>
+                {{if $item.network_icon != ""}}
+					<span class="wall-item-network"><i class="fa fa-{{$item.network_icon}}" title="{{$item.network_name}}" aria-hidden="true"></i></span>
+                {{else}}
+					<span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span>
+                {{/if}}
+                {{if $item.plink}}	{{*link to the original source of the item *}}
+					<a href="{{$item.plink.href}}" class="plink u-url" aria-label="{{$item.plink.title}}" title="{{$item.plink.title}}">
+						<i class="fa fa-external-link"></i>
+					</a>
+                {{/if}}
+			</div>
+			<h4 class="media-heading">
+				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card">
+					<span class="wall-item-name {{$item.sparkle}}">{{$item.name}}</span>
+				</a>
+			{{if $item.owner_url}}
+				{{$item.via}}
+				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo hover-card">
+					<span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span>
 				</a>
 			{{/if}}
-			</div>
-
-			{{* The avatar picture and the photo-menu *}}
-			<div class="dropdown pull-left"><!-- Dropdown -->
-				<div class="hidden-sm hidden-xs contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
-					<a href="{{$item.profile_url}}" class="userinfo click-card u-url" id="wall-item-photo-menu-{{$item.id}}">
-						<div class="contact-photo-image-wrapper">
-							<img src="{{$item.thumb}}" class="contact-photo media-object {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
-						</div>
-					</a>
-				</div>
-				<div class="hidden-lg hidden-md contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
-					<a href="{{$item.profile_url}}" class="userinfo click-card u-url" id="wall-item-photo-menu-xs-{{$item.id}}">
-						<div class="contact-photo-image-wrapper">
-							<img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}}" id="wall-item-photo-xs-{{$item.id}}" alt="{{$item.name}}" />
-						</div>
-					</a>
-				</div>
-			</div><!-- ./Dropdown -->
-
-
-			{{* contact info header*}}
-			<div role="heading" class="contact-info hidden-sm hidden-xs media-body"><!-- <= For computer -->
-				<h4 class="media-heading">
-					<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card">
-						<span class="wall-item-name {{$item.sparkle}}">{{$item.name}}</span>
-					</a>
-				{{if $item.owner_url}}
-					{{$item.via}}
-					<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo hover-card">
-						<span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span>
-					</a>
-				{{/if}}
-				{{if $item.lock}}
-					<span class="navicon lock fakelink" onClick="lockview(event, 'item', {{$item.id}});" title="{{$item.lock}}">
-						&nbsp;<small><i class="fa fa-lock" aria-hidden="true"></i></small>
-					</span>
-				{{elseif $item.connector}}
-					<span class="fa fa-lock" title="{{$item.connector}}"></span>
-				{{/if}}
-					<div class="additional-info text-muted">
-						<div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
-							<small>
-								<a href="{{$item.plink.orig}}">
-									<time class="time" title="{{$item.localtime}}" data-toggle="tooltip" datetime="{{$item.utc}}">{{$item.ago}}</time>
-								</a>
-								{{if $item.pinned}}
-									&bull; <i class="fa fa-thumb-tack" aria-hidden="true" title="{{$item.pinned}}"></i>
-									<span class="sr-only">{{$item.pinned}}</span>
-								{{/if}}
-							</small>
-						</div>
-
-						{{if $item.location_html}}
-						<div id="wall-item-location-{{$item.id}}" class="wall-item-location">
-							<small><span class="location">({{$item.location_html nofilter}})</span></small>
-						</div>
-						{{/if}}
+			{{if $item.lock}}
+				<span class="navicon lock fakelink" onClick="lockview(event, 'item', {{$item.id}});" title="{{$item.lock}}">
+					&nbsp;<small><i class="fa fa-lock" aria-hidden="true"></i></small>
+				</span>
+			{{elseif $item.connector}}
+				<span class="fa fa-lock" title="{{$item.connector}}"></span>
+			{{/if}}
+				<div class="additional-info text-muted">
+					<div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
+						<small>
+							<a href="{{$item.plink.orig}}">
+								<time class="time" title="{{$item.localtime}}" data-toggle="tooltip" datetime="{{$item.utc}}">{{$item.ago}}</time>
+							</a>
+							{{if $item.pinned}}
+								&bull; <i class="fa fa-thumb-tack" aria-hidden="true" title="{{$item.pinned}}"></i>
+								<span class="sr-only">{{$item.pinned}}</span>
+							{{/if}}
+						</small>
 					</div>
-				{{* @todo $item.created have to be inserted *}}
-				</h4>
+
+					{{if $item.location_html}}
+					<div id="wall-item-location-{{$item.id}}" class="wall-item-location">
+						<small><span class="location">({{$item.location_html nofilter}})</span></small>
+					</div>
+					{{/if}}
+				</div>
+			{{* @todo $item.created have to be inserted *}}
+			</h4>
+		</div>
+
+		{{* contact info header for smartphones *}}
+		<div role="heading" class="contact-info-xs hidden-lg hidden-md">
+			<div class="preferences">
+                {{if $item.network_icon != ""}}
+					<span class="wall-item-network"><i class="fa fa-{{$item.network_icon}}" title="{{$item.network_name}}" aria-hidden="true"></i></span>
+                {{else}}
+					<span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span>
+                {{/if}}
+                {{if $item.plink}}	{{*link to the original source of the item *}}
+					<a href="{{$item.plink.href}}" class="plink u-url" aria-label="{{$item.plink.title}}" title="{{$item.plink.title}}">
+						<i class="fa fa-external-link"></i>
+					</a>
+                {{/if}}
 			</div>
+			<h5 class="media-heading">
+				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card"><span>{{$item.name}}</span></a>
+				<p class="text-muted"><small>
+					<span class="wall-item-ago">{{$item.ago}}</span> {{if $item.location_html}}&nbsp;&mdash;&nbsp;({{$item.location_html nofilter}}){{/if}}</small>
+				</p>
+			</h5>
+		</div>
 
-			{{* contact info header for smartphones *}}
-			<div role="heading " class="contact-info-xs hidden-lg hidden-md">
-				<h5 class="media-heading">
-					<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card"><span>{{$item.name}}</span></a>
-					<p class="text-muted"><small>
-						<span class="wall-item-ago">{{$item.ago}}</span> {{if $item.location_html}}&nbsp;&mdash;&nbsp;({{$item.location_html nofilter}}){{/if}}</small>
-					</p>
-				</h5>
-			</div>
+		<div class="clearfix"></div>
 
-			<div class="clearfix"></div>
+		<hr />
 
-			<hr />
-
-			{{* item content *}}
-			<div class="wall-item-content {{$item.type}}" id="wall-item-content-{{$item.id}}">
-				{{if $item.title}}
-				<span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h4 class="media-heading" dir="auto"><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h4><br /></span>
-				{{/if}}
-
-				<div class="wall-item-body" id="wall-item-body-{{$item.id}}" dir="auto">{{$item.body_html nofilter}}</div>
-			</div>
-
-			<!-- TODO -->
-			<div class="wall-item-bottom">
-				<div class="wall-item-links"></div>
-				<div class="wall-item-tags">
-			{{if !$item.suppress_tags}}
-				{{foreach $item.hashtags as $tag}}
-					<span class="tag label btn-info sm">{{$tag nofilter}} <i class="fa fa-bolt" aria-hidden="true"></i></span>
-				{{/foreach}}
-
-				{{foreach $item.mentions as $tag}}
-					<span class="mention label btn-warning sm">{{$tag nofilter}} <i class="fa fa-user" aria-hidden="true"></i></span>
-				{{/foreach}}
+		{{* item content *}}
+		<div class="wall-item-content {{$item.type}}" id="wall-item-content-{{$item.id}}">
+			{{if $item.title}}
+			<span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h4 class="media-heading" dir="auto"><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h4><br /></span>
 			{{/if}}
 
-				{{foreach $item.folders as $cat}}
-					<span class="folder label btn-danger sm">{{$cat.name}}{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
-				{{/foreach}}
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" dir="auto">{{$item.body_html nofilter}}</div>
+		</div>
 
-				{{foreach $item.categories as $cat}}
-					<span class="category label btn-success sm">{{$cat.name}}{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
-				{{/foreach}}
-				</div>
-				{{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']}}">{{$item.edited['relative']}}</span>)</div>{{/if}}
+		<!-- TODO -->
+		<div class="wall-item-bottom">
+			<div class="wall-item-links"></div>
+			<div class="wall-item-tags">
+		{{if !$item.suppress_tags}}
+			{{foreach $item.hashtags as $tag}}
+				<span class="tag label btn-info sm">{{$tag nofilter}} <i class="fa fa-bolt" aria-hidden="true"></i></span>
+			{{/foreach}}
+
+			{{foreach $item.mentions as $tag}}
+				<span class="mention label btn-warning sm">{{$tag nofilter}} <i class="fa fa-user" aria-hidden="true"></i></span>
+			{{/foreach}}
+		{{/if}}
+
+			{{foreach $item.folders as $cat}}
+				<span class="folder label btn-danger sm">{{$cat.name}}{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+			{{/foreach}}
+
+			{{foreach $item.categories as $cat}}
+				<span class="category label btn-success sm">{{$cat.name}}{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+			{{/foreach}}
 			</div>
-			<!-- ./TODO -->
+			{{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']}}">{{$item.edited['relative']}}</span>)</div>{{/if}}
+		</div>
+		<!-- ./TODO -->
 
-			<p class="wall-item-actions">
-				{{* Action buttons to interact with the item (like: like, dislike, share and so on *}}
-				<span class="wall-item-actions-left">
-					<!--comment this out to try something different {{if $item.threaded}}{{if $item.comment_html}}
-					<div id="button-reply" class="pull-left">
-						<button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
-					</div>
-					{{/if}}{{/if}}-->
+		<p class="wall-item-actions">
+			{{* Action buttons to interact with the item (like: like, dislike, share and so on *}}
+			<span class="wall-item-actions-left">
+				<!--comment this out to try something different {{if $item.threaded}}{{if $item.comment_html}}
+				<div id="button-reply" class="pull-left">
+					<button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
+				</div>
+				{{/if}}{{/if}}-->
 
-					{{if $item.threaded}}{{/if}}
+				{{if $item.threaded}}{{/if}}
 
-					{{* Buttons for like and dislike *}}
-					{{if $item.vote}}
-						{{if $item.vote.like}}
-					<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doActivityItemAction({{$item.id}}, 'like'{{if $item.responses.like.self}}, true{{/if}});">{{$item.vote.like.0}}</button>
-						{{/if}}
-						{{if $item.vote.like AND $item.vote.dislike}}
-					<span role="presentation" class="separator">•</span>
-						{{/if}}
-
-						{{if $item.vote.dislike}}
-					<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doActivityItemAction({{$item.id}}, 'dislike'{{if $item.responses.dislike.self}}, true{{/if}});">{{$item.vote.dislike.0}}</button>
-						{{/if}}
-						{{if ($item.vote.like OR $item.vote.dislike) AND $item.comment_html}}
-					<span role="presentation" class="separator">•</span>
-						{{/if}}
+				{{* Buttons for like and dislike *}}
+				{{if $item.vote}}
+					{{if $item.vote.like}}
+				<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doActivityItemAction({{$item.id}}, 'like'{{if $item.responses.like.self}}, true{{/if}});">{{$item.vote.like.0}}</button>
+					{{/if}}
+					{{if $item.vote.like AND $item.vote.dislike}}
+				<span role="presentation" class="separator">•</span>
 					{{/if}}
 
-					{{* Button to open the comment text field *}}
-					{{if $item.comment_html}}
-						<button type="button" class="btn btn-default" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}}</button>
+					{{if $item.vote.dislike}}
+				<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doActivityItemAction({{$item.id}}, 'dislike'{{if $item.responses.dislike.self}}, true{{/if}});">{{$item.vote.dislike.0}}</button>
 					{{/if}}
-
-					{{* Button for sharing the item *}}
-					{{if $item.vote}}
-						{{if $item.vote.share}}
-							{{if $item.vote.like OR $item.vote.dislike OR $item.comment_html}}
-					<span role="presentation" class="separator">•</span>
-							{{/if}}
-					<button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.share.0}}</button>
-						{{/if}}
+					{{if ($item.vote.like OR $item.vote.dislike) AND $item.comment_html}}
+				<span role="presentation" class="separator">•</span>
 					{{/if}}
+				{{/if}}
 
-				{{* Put additional actions in a dropdown menu *}}
-				{{if $item.menu && ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread || $item.ignore || $item.drop.dropping || $item.browsershare)}}
-					<span role="presentation" class="separator"></span>
-					<span class="more-links btn-group{{if $item.thread_level> 1}} dropup{{/if}}">
-						<button type="button" class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuOptions-{{$item.id}}" aria-haspopup="true" aria-expanded="false" title="{{$item.menu}}"><i class="fa fa-ellipsis-h" aria-hidden="true"></i>&nbsp;{{$item.menu}}</button>
-						<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="dropdownMenuOptions-{{$item.id}}">
-						{{if $item.edpost}} {{* edit the posting *}}
-							<li role="menuitem">
-								<a href="javascript:editpost('{{$item.edpost.0}}?mode=none');" title="{{$item.edpost.1}}" class="btn-link navicon pencil"><i class="fa fa-pencil" aria-hidden="true"></i> {{$item.edpost.1}}</a>
-							</li>
+				{{* Button to open the comment text field *}}
+				{{if $item.comment_html}}
+					<button type="button" class="btn btn-default" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}}</button>
+				{{/if}}
+
+				{{* Button for sharing the item *}}
+				{{if $item.vote}}
+					{{if $item.vote.share}}
+						{{if $item.vote.like OR $item.vote.dislike OR $item.comment_html}}
+				<span role="presentation" class="separator">•</span>
 						{{/if}}
+				<button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.share.0}}</button>
+					{{/if}}
+				{{/if}}
 
-						{{if $item.tagger}} {{* tag the post *}}
-							<li role="menuitem">
-								<a id="tagger-{{$item.id}}" href="javascript:itemTag({{$item.id}});" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag" aria-hidden="true"></i> {{$item.tagger.add}}</a>
-							</li>
-						{{/if}}
-
-						{{if $item.filer}}
-							<li role="menuitem">
-								<a id="filer-{{$item.id}}" href="javascript:itemFiler({{$item.id}});" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder" aria-hidden="true"></i>&nbsp;{{$item.filer}}</a>
-							</li>
-						{{/if}}
-
-						{{if $item.pin}}
-							<li role="menuitem">
-								<a id="pin-{{$item.id}}" href="javascript:doPin({{$item.id}});" class="btn-link {{$item.pin.classdo}}" title="{{$item.pin.do}}"><i class="fa fa-circle-o" aria-hidden="true"></i>&nbsp;{{$item.pin.do}}</a>
-								<a id="unpin-{{$item.id}}" href="javascript:doPin({{$item.id}});" class="btn-link {{$item.pin.classundo}}" title="{{$item.pin.undo}}"><i class="fa fa-dot-circle-o" aria-hidden="true"></i>&nbsp;{{$item.pin.undo}}</a>
-							</li>
-						{{/if}}
-
-						{{if $item.star}}
-							<li role="menuitem">
-								<a id="star-{{$item.id}}" href="javascript:doStar({{$item.id}});" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o" aria-hidden="true"></i>&nbsp;{{$item.star.do}}</a>
-								<a id="unstar-{{$item.id}}" href="javascript:doStar({{$item.id}});" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star" aria-hidden="true"></i>&nbsp;{{$item.star.undo}}</a>
-							</li>
-						{{/if}}
-
-						{{if $item.follow_thread}}
-							<li role="menuitem">
-								<a id="follow_thread-{{$item.id}}" href="javascript:{{$item.follow_thread.action}}" class="btn-link" title="{{$item.follow_thread.title}}"><i class="fa fa-plus" aria-hidden="true"></i>&nbsp;{{$item.follow_thread.title}}</a>
-							</li>
-						{{/if}}
-
-						{{if $item.language}}
+			{{* Put additional actions in a dropdown menu *}}
+			{{if $item.menu && ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread || $item.ignore || $item.drop.dropping || $item.browsershare)}}
+				<span role="presentation" class="separator"></span>
+				<span class="more-links btn-group{{if $item.thread_level> 1}} dropup{{/if}}">
+					<button type="button" class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuOptions-{{$item.id}}" aria-haspopup="true" aria-expanded="false" title="{{$item.menu}}"><i class="fa fa-ellipsis-h" aria-hidden="true"></i>&nbsp;{{$item.menu}}</button>
+					<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="dropdownMenuOptions-{{$item.id}}">
+					{{if $item.edpost}} {{* edit the posting *}}
 						<li role="menuitem">
-							<a id="language-{{$item.id}}" href="javascript:alert('{{$item.language.1}}');" class="btn-link filer-item language-icon" title="{{$item.language.0}}"><i class="fa fa-language" aria-hidden="true"></i>&nbsp;{{$item.language.0}}</a>
+							<a href="javascript:editpost('{{$item.edpost.0}}?mode=none');" title="{{$item.edpost.1}}" class="btn-link navicon pencil"><i class="fa fa-pencil" aria-hidden="true"></i> {{$item.edpost.1}}</a>
+						</li>
+					{{/if}}
+
+					{{if $item.tagger}} {{* tag the post *}}
+						<li role="menuitem">
+							<a id="tagger-{{$item.id}}" href="javascript:itemTag({{$item.id}});" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag" aria-hidden="true"></i> {{$item.tagger.add}}</a>
+						</li>
+					{{/if}}
+
+					{{if $item.filer}}
+						<li role="menuitem">
+							<a id="filer-{{$item.id}}" href="javascript:itemFiler({{$item.id}});" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder" aria-hidden="true"></i>&nbsp;{{$item.filer}}</a>
+						</li>
+					{{/if}}
+
+					{{if $item.pin}}
+						<li role="menuitem">
+							<a id="pin-{{$item.id}}" href="javascript:doPin({{$item.id}});" class="btn-link {{$item.pin.classdo}}" title="{{$item.pin.do}}"><i class="fa fa-circle-o" aria-hidden="true"></i>&nbsp;{{$item.pin.do}}</a>
+							<a id="unpin-{{$item.id}}" href="javascript:doPin({{$item.id}});" class="btn-link {{$item.pin.classundo}}" title="{{$item.pin.undo}}"><i class="fa fa-dot-circle-o" aria-hidden="true"></i>&nbsp;{{$item.pin.undo}}</a>
+						</li>
+					{{/if}}
+
+					{{if $item.star}}
+						<li role="menuitem">
+							<a id="star-{{$item.id}}" href="javascript:doStar({{$item.id}});" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o" aria-hidden="true"></i>&nbsp;{{$item.star.do}}</a>
+							<a id="unstar-{{$item.id}}" href="javascript:doStar({{$item.id}});" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star" aria-hidden="true"></i>&nbsp;{{$item.star.undo}}</a>
+						</li>
+					{{/if}}
+
+					{{if $item.follow_thread}}
+						<li role="menuitem">
+							<a id="follow_thread-{{$item.id}}" href="javascript:{{$item.follow_thread.action}}" class="btn-link" title="{{$item.follow_thread.title}}"><i class="fa fa-plus" aria-hidden="true"></i>&nbsp;{{$item.follow_thread.title}}</a>
+						</li>
+					{{/if}}
+
+					{{if $item.language}}
+					<li role="menuitem">
+						<a id="language-{{$item.id}}" href="javascript:alert('{{$item.language.1}}');" class="btn-link filer-item language-icon" title="{{$item.language.0}}"><i class="fa fa-language" aria-hidden="true"></i>&nbsp;{{$item.language.0}}</a>
+					</li>
+					{{/if}}
+
+					{{if $item.browsershare}}
+						<li role="menuitem" class="button-browser-share">
+							<a id="browser-share-{{$item.id}}" href="javascript:navigator.share({url: '{{$item.plink.orig}}'});" class="btn-link button-browser-share" title="{{$item.browsershare.1}}"><i class="fa fa-share-alt" aria-hidden="true"></i>&nbsp;{{$item.browsershare.0}}</a>
+						</li>
+					{{/if}}
+
+					{{if ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread) && ($item.ignore || $item.drop.dropping)}}
+						<li role="separator" class="divider"></li>
+					{{/if}}
+
+					{{if $item.ignore}}
+						<li role="menuitem">
+							<a id="ignore-{{$item.id}}" href="javascript:doIgnoreThread({{$item.id}});" class="btn-link {{$item.ignore.classdo}}" title="{{$item.ignore.do}}"><i class="fa fa-eye-slash" aria-hidden="true"></i> {{$item.ignore.do}}</a>
+						</li>
+						<li role="menuitem">
+							<a id="unignore-{{$item.id}}" href="javascript:doIgnoreThread({{$item.id}});" class="btn-link {{$item.ignore.classundo}}"  title="{{$item.ignore.undo}}"><i class="fa fa-eye" aria-hidden="true"></i> {{$item.ignore.undo}}</a>
+						</li>
+					{{/if}}
+
+					{{if $item.drop && $item.drop.dropping}}
+						<li role="menuitem">
+							<a class="btn-link navicon delete" href="javascript:dropItem('item/drop/{{$item.id}}/{{$item.return}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</a>
 						</li>
 						{{/if}}
-
-						{{if $item.browsershare}}
-							<li role="menuitem" class="button-browser-share">
-								<a id="browser-share-{{$item.id}}" href="javascript:navigator.share({url: '{{$item.plink.orig}}'});" class="btn-link button-browser-share" title="{{$item.browsershare.1}}"><i class="fa fa-share-alt" aria-hidden="true"></i>&nbsp;{{$item.browsershare.0}}</a>
-							</li>
-						{{/if}}
-
-						{{if ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread) && ($item.ignore || $item.drop.dropping)}}
-							<li role="separator" class="divider"></li>
-						{{/if}}
-
-						{{if $item.ignore}}
-							<li role="menuitem">
-								<a id="ignore-{{$item.id}}" href="javascript:doIgnoreThread({{$item.id}});" class="btn-link {{$item.ignore.classdo}}" title="{{$item.ignore.do}}"><i class="fa fa-eye-slash" aria-hidden="true"></i> {{$item.ignore.do}}</a>
-							</li>
-							<li role="menuitem">
-								<a id="unignore-{{$item.id}}" href="javascript:doIgnoreThread({{$item.id}});" class="btn-link {{$item.ignore.classundo}}"  title="{{$item.ignore.undo}}"><i class="fa fa-eye" aria-hidden="true"></i> {{$item.ignore.undo}}</a>
-							</li>
-						{{/if}}
-
-						{{if $item.drop && $item.drop.dropping}}
-							<li role="menuitem">
-								<a class="btn-link navicon delete" href="javascript:dropItem('item/drop/{{$item.id}}/{{$item.return}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</a>
-							</li>
-							{{/if}}
-						</ul>
-						<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
-					</span>
-				{{else}}
+					</ul>
 					<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
-				{{/if}}
 				</span>
+			{{else}}
+				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+			{{/if}}
+			</span>
 
 
-				<span class="wall-item-actions-right">
-					{{* Event attendance buttons *}}
-				{{if $item.isevent}}
-					<span class="vote-event">
-						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="doActivityItemAction({{$item.id}}, 'attendyes'{{if $item.responses.attendyes.self}}, true{{/if}});"><i class="fa fa-check" aria-hidden="true"><span class="sr-only">{{$item.attend.0}}</span></i></button>
-						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="doActivityItemAction({{$item.id}}, 'attendno'{{if $item.responses.attendno.self}}, true{{/if}});"><i class="fa fa-times" aria-hidden="true"><span class="sr-only">{{$item.attend.1}}</span></i></button>
-						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="doActivityItemAction({{$item.id}}, 'attendmaybe'{{if $item.responses.attendmaybe.self}}, true{{/if}});"><i class="fa fa-question" aria-hidden="true"><span class="sr-only">{{$item.attend.2}}</span></i></button>
-					</span>
-				{{/if}}
-
-					<span class="pull-right checkbox">
-				{{if $item.drop && $item.drop.pagedrop}}
-						<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" id="checkbox-{{$item.id}}" class="item-select" value="{{$item.id}}" />
-						<label for="checkbox-{{$item.id}}"></label>
-				{{/if}}
-					</span>
+			<span class="wall-item-actions-right">
+				{{* Event attendance buttons *}}
+			{{if $item.isevent}}
+				<span class="vote-event">
+					<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="doActivityItemAction({{$item.id}}, 'attendyes'{{if $item.responses.attendyes.self}}, true{{/if}});"><i class="fa fa-check" aria-hidden="true"><span class="sr-only">{{$item.attend.0}}</span></i></button>
+					<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="doActivityItemAction({{$item.id}}, 'attendno'{{if $item.responses.attendno.self}}, true{{/if}});"><i class="fa fa-times" aria-hidden="true"><span class="sr-only">{{$item.attend.1}}</span></i></button>
+					<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="doActivityItemAction({{$item.id}}, 'attendmaybe'{{if $item.responses.attendmaybe.self}}, true{{/if}});"><i class="fa fa-question" aria-hidden="true"><span class="sr-only">{{$item.attend.2}}</span></i></button>
 				</span>
-			</p><!--./wall-item-actions-->
-
-			{{* Display likes, dislike and attendance stats *}}
-			{{if $item.responses}}
-			<div class="wall-item-responses">
-				{{foreach $item.responses as $verb=>$response}}
-				<div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output nofilter}}</div>
-				{{/foreach}}
-			</div>
 			{{/if}}
 
-			<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" dir="auto">
-			{{if $item.conv}}
-				<a href="{{$item.conv.href}}" id="context-{{$item.id}}" title="{{$item.conv.title}}">{{$item.conv.title}}</a>
+				<span class="pull-right checkbox">
+			{{if $item.drop && $item.drop.pagedrop}}
+					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" id="checkbox-{{$item.id}}" class="item-select" value="{{$item.id}}" />
+					<label for="checkbox-{{$item.id}}"></label>
 			{{/if}}
-			</div>
-		</div><!--./media>-->
-	</div><!-- ./panel-body -->
-</div><!--./panel-->
+				</span>
+			</span>
+		</p><!--./wall-item-actions-->
+
+		{{* Display likes, dislike and attendance stats *}}
+		{{if $item.responses}}
+		<div class="wall-item-responses">
+			{{foreach $item.responses as $verb=>$response}}
+			<div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output nofilter}}</div>
+			{{/foreach}}
+		</div>
+		{{/if}}
+
+		<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" dir="auto">
+		{{if $item.conv}}
+			<a href="{{$item.conv.href}}" id="context-{{$item.id}}" title="{{$item.conv.title}}">{{$item.conv.title}}</a>
+		{{/if}}
+		</div>
+	</div><!--./media>-->
+</div><!-- ./panel-body -->

From 2a4985cd46e2aece0111166cb74f04c152ee6c64 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 19 Nov 2022 19:07:43 -0500
Subject: [PATCH 31/45] Fix database connection with sockets

- Reformat Database\Database.php file
- Reformat and fix spelling in static/defaults.config.php file
---
 src/Database/Database.php  | 124 +++++++++++++++++++------------------
 static/defaults.config.php |  47 +++++++-------
 2 files changed, 88 insertions(+), 83 deletions(-)

diff --git a/src/Database/Database.php b/src/Database/Database.php
index 79c39e9af7..a34b17adbe 100644
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -43,12 +43,12 @@ use Psr\Log\NullLogger;
  */
 class Database
 {
-	const PDO = 'pdo';
+	const PDO    = 'pdo';
 	const MYSQLI = 'mysqli';
 
 	const INSERT_DEFAULT = 0;
-	const INSERT_UPDATE = 1;
-	const INSERT_IGNORE = 2;
+	const INSERT_UPDATE  = 1;
+	const INSERT_IGNORE  = 2;
 
 	protected $connected = false;
 
@@ -64,18 +64,18 @@ class Database
 	 * @var LoggerInterface
 	 */
 	protected $logger;
-	protected $server_info    = '';
+	protected $server_info = '';
 	/** @var PDO|mysqli */
 	protected $connection;
 	protected $driver = '';
 	protected $pdo_emulate_prepares = false;
-	private $error          = '';
-	private $errorno        = 0;
-	private $affected_rows  = 0;
+	private $error = '';
+	private $errorno = 0;
+	private $affected_rows = 0;
 	protected $in_transaction = false;
-	protected $in_retrial     = false;
-	protected $testmode       = false;
-	private $relation       = [];
+	protected $in_retrial = false;
+	protected $testmode = false;
+	private $relation = [];
 	/** @var DbaDefinition */
 	protected $dbaDefinition;
 	/** @var ViewDefinition */
@@ -112,23 +112,22 @@ class Database
 		$port       = 0;
 		$serveraddr = trim($this->configCache->get('database', 'hostname'));
 		$serverdata = explode(':', $serveraddr);
-		$server     = $serverdata[0];
+		$host       = trim($serverdata[0]);
 		if (count($serverdata) > 1) {
 			$port = trim($serverdata[1]);
 		}
 
-		if (!empty(trim($this->configCache->get('database', 'port')))) {
-			$port = trim($this->configCache->get('database', 'port'));
+		if (trim($this->configCache->get('database', 'port') ?? 0)) {
+			$port = trim($this->configCache->get('database', 'port') ?? 0);
 		}
 
-		$server  = trim($server);
-		$user    = trim($this->configCache->get('database', 'username'));
-		$pass    = trim($this->configCache->get('database', 'password'));
-		$db      = trim($this->configCache->get('database', 'database'));
-		$charset = trim($this->configCache->get('database', 'charset'));
-		$socket  = trim($this->configCache->get('database', 'socket')); 
+		$user     = trim($this->configCache->get('database', 'username'));
+		$pass     = trim($this->configCache->get('database', 'password'));
+		$database = trim($this->configCache->get('database', 'database'));
+		$charset  = trim($this->configCache->get('database', 'charset'));
+		$socket   = trim($this->configCache->get('database', 'socket'));
 
-		if (!(strlen($server) && strlen($user))) {
+		if (!$host && !$socket || !$user) {
 			return false;
 		}
 
@@ -138,19 +137,20 @@ class Database
 
 		if (!$this->configCache->get('database', 'disable_pdo') && class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
 			$this->driver = self::PDO;
-			$connect      = "mysql:host=" . $server . ";dbname=" . $db;
-
-			if ($port > 0) {
-				$connect .= ";port=" . $port;
+			if ($socket) {
+				$connect = 'mysql:unix_socket=' . $socket;
+			} else {
+				$connect = 'mysql:host=' . $host;
+				if ($port > 0) {
+					$connect .= ';port=' . $port;
+				}
 			}
 
 			if ($charset) {
-				$connect .= ";charset=" . $charset;
+				$connect .= ';charset=' . $charset;
 			}
 
-			if ($socket) {
-				$connect .= ";$unix_socket=" . $socket;
-			}
+			$connect .= ';dbname=' . $database;
 
 			try {
 				$this->connection = @new PDO($connect, $user, $pass, [PDO::ATTR_PERSISTENT => $persistent]);
@@ -165,10 +165,12 @@ class Database
 		if (!$this->connected && class_exists('\mysqli')) {
 			$this->driver = self::MYSQLI;
 
-			if ($port > 0) {
-				$this->connection = @new mysqli($server, $user, $pass, $db, $port);
+			if ($socket) {
+				$this->connection = @new mysqli(null, $user, $pass, $database, null, $socket);
+			} elseif ($port > 0) {
+				$this->connection = @new mysqli($host, $user, $pass, $database, $port);
 			} else {
-				$this->connection = @new mysqli($server, $user, $pass, $db);
+				$this->connection = @new mysqli($host, $user, $pass, $database);
 			}
 
 			if (!mysqli_connect_errno()) {
@@ -177,11 +179,6 @@ class Database
 				if ($charset) {
 					$this->connection->set_charset($charset);
 				}
-
-				if ($socket) {
-					$this->connection->set_socket($socket);
-				}
-
 			}
 		}
 
@@ -198,6 +195,7 @@ class Database
 	{
 		$this->testmode = $test;
 	}
+
 	/**
 	 * Sets the logger for DBA
 	 *
@@ -222,6 +220,7 @@ class Database
 	{
 		$this->profiler = $profiler;
 	}
+
 	/**
 	 * Disconnects the current database connection
 	 */
@@ -338,12 +337,12 @@ class Database
 		}
 
 		$watchlist = explode(',', $this->configCache->get('system', 'db_log_index_watch'));
-		$denylist = explode(',', $this->configCache->get('system', 'db_log_index_denylist'));
+		$denylist  = explode(',', $this->configCache->get('system', 'db_log_index_denylist'));
 
 		while ($row = $this->fetch($r)) {
 			if ((intval($this->configCache->get('system', 'db_loglimit_index')) > 0)) {
 				$log = (in_array($row['key'], $watchlist) &&
-				        ($row['rows'] >= intval($this->configCache->get('system', 'db_loglimit_index'))));
+					($row['rows'] >= intval($this->configCache->get('system', 'db_loglimit_index'))));
 			} else {
 				$log = false;
 			}
@@ -358,11 +357,15 @@ class Database
 
 			if ($log) {
 				$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-				@file_put_contents($this->configCache->get('system', 'db_log_index'), DateTimeFormat::utcNow() . "\t" .
-				                                                                      $row['key'] . "\t" . $row['rows'] . "\t" . $row['Extra'] . "\t" .
-				                                                                      basename($backtrace[1]["file"]) . "\t" .
-				                                                                      $backtrace[1]["line"] . "\t" . $backtrace[2]["function"] . "\t" .
-				                                                                      substr($query, 0, 4000) . "\n", FILE_APPEND);
+				@file_put_contents(
+					$this->configCache->get('system', 'db_log_index'),
+					DateTimeFormat::utcNow() . "\t" .
+					$row['key'] . "\t" . $row['rows'] . "\t" . $row['Extra'] . "\t" .
+					basename($backtrace[1]["file"]) . "\t" .
+					$backtrace[1]["line"] . "\t" . $backtrace[2]["function"] . "\t" .
+					substr($query, 0, 4000) . "\n",
+					FILE_APPEND
+				);
 			}
 		}
 	}
@@ -449,7 +452,7 @@ class Database
 	{
 		$server_info = $this->serverInfo();
 		if (version_compare($server_info, '5.7.5', '<') ||
-		    (stripos($server_info, 'MariaDB') !== false)) {
+			(stripos($server_info, 'MariaDB') !== false)) {
 			$sql = str_ireplace('ANY_VALUE(', 'MIN(', $sql);
 		}
 		return $sql;
@@ -647,7 +650,7 @@ class Database
 					} elseif (is_string($args[$param])) {
 						$param_types .= 's';
 					} elseif (is_object($args[$param]) && method_exists($args[$param], '__toString')) {
-						$param_types .= 's';
+						$param_types  .= 's';
 						$args[$param] = (string)$args[$param];
 					} else {
 						$param_types .= 'b';
@@ -743,10 +746,14 @@ class Database
 				$duration  = round($duration, 3);
 				$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 
-				@file_put_contents($this->configCache->get('system', 'db_log'), DateTimeFormat::utcNow() . "\t" . $duration . "\t" .
-				                                                                basename($backtrace[1]["file"]) . "\t" .
-				                                                                $backtrace[1]["line"] . "\t" . $backtrace[2]["function"] . "\t" .
-				                                                                substr($this->replaceParameters($sql, $args), 0, 4000) . "\n", FILE_APPEND);
+				@file_put_contents(
+					$this->configCache->get('system', 'db_log'),
+					DateTimeFormat::utcNow() . "\t" . $duration . "\t" .
+					basename($backtrace[1]["file"]) . "\t" .
+					$backtrace[1]["line"] . "\t" . $backtrace[2]["function"] . "\t" .
+					substr($this->replaceParameters($sql, $args), 0, 4000) . "\n",
+					FILE_APPEND
+				);
 			}
 		}
 		return $retval;
@@ -1365,7 +1372,7 @@ class Database
 			. $condition_string;
 
 		// Combines the updated fields parameter values with the condition parameter values
-		$params  = array_merge(array_values($fields), $condition);
+		$params = array_merge(array_values($fields), $condition);
 
 		return $this->e($sql, $params);
 	}
@@ -1415,8 +1422,8 @@ class Database
 	/**
 	 * Escape fields, adding special treatment for "group by" handling
 	 *
-	 * @param array $fields 
-	 * @param array $options 
+	 * @param array $fields
+	 * @param array $options
 	 * @return array Escaped fields
 	 */
 	private function escapeFields(array $fields, array $options): array
@@ -1438,8 +1445,7 @@ class Database
 			}
 		}
 
-		array_walk($fields, function(&$value, $key) use ($options)
-		{
+		array_walk($fields, function (&$value, $key) use ($options) {
 			$field = $value;
 			$value = DBA::quoteIdentifier($field);
 
@@ -1487,7 +1493,7 @@ class Database
 		}
 
 		if (count($fields) > 0) {
-			$fields = $this->escapeFields($fields, $params);
+			$fields        = $this->escapeFields($fields, $params);
 			$select_string = implode(', ', $fields);
 		} else {
 			$select_string = '*';
@@ -1827,16 +1833,16 @@ class Database
 	/**
 	 * Replaces a string in the provided fields of the provided table
 	 *
-	 * @param string $table  Table name
-	 * @param array  $fields List of field names in the provided table
-	 * @param string $search String to search for
+	 * @param string $table   Table name
+	 * @param array  $fields  List of field names in the provided table
+	 * @param string $search  String to search for
 	 * @param string $replace String to replace with
 	 * @return void
 	 * @throws \Exception
 	 */
 	public function replaceInTableFields(string $table, array $fields, string $search, string $replace)
 	{
-		$search = $this->escape($search);
+		$search  = $this->escape($search);
 		$replace = $this->escape($replace);
 
 		$upd = [];
diff --git a/static/defaults.config.php b/static/defaults.config.php
index a6c98abd14..a8fe5f8686 100644
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -38,12 +38,12 @@ return [
 		'port' => null,
 
 		// socket (String)
-                // Socket of the database server.
-                // Can be used instead of adding a socket location to the hostname
-                'socket' => '',
+		// Socket of the database server.
+		// Can be used instead of adding a socket location to the hostname
+		'socket' => '',
 
 		// user (String)
-		// Database user name. Please don't use "root".
+		// Database username. Please don't use "root".
 		'username' => '',
 
 		// pass (String)
@@ -64,7 +64,7 @@ return [
 		'pdo_emulate_prepares' => true,
 
 		// disable_pdo (Boolean)
-		// PDO is used by default (if available). Otherwise MySQLi will be used.
+		// PDO is used by default (if available). Otherwise, MySQLi will be used.
 		'disable_pdo' => false,
 
 		// persistent (Boolean)
@@ -145,7 +145,7 @@ return [
 		'block_local_dir' => false,
 
 		// blocked_tags (String)
-		// Comma separated list of hash tags that shouldn't be displayed in the trending tags
+		// Comma separated list of hashtags that shouldn't be displayed in the trending tags
 		'blocked_tags' => '',
 
 		// community_no_sharer (Boolean)
@@ -153,7 +153,7 @@ return [
 		'community_no_sharer' => false,
 
 		// contact_update_limit (Integer)
-		// How much contacts should be checked at a time?
+		// How many contacts should be checked at a time?
 		'contact_update_limit' => 100,
 
 		// cron_interval (Integer)
@@ -259,7 +259,7 @@ return [
 		'disable_implicit_mentions' => false,
 
 		// disable_url_validation (Boolean)
-		// Disables the DNS lookup of an URL.
+		// Disables the DNS lookup of a URL.
 		'disable_url_validation' => false,
 
 		// disable_password_exposed (Boolean)
@@ -283,7 +283,7 @@ return [
 		'dlogip' => '',
 
 		// expire-notify-priority (integer)
-		// Priority for the expirary notification 
+		// Priority for the expirary notification
 		'expire-notify-priority' => Friendica\Core\Worker::PRIORITY_LOW,
 
 		// fetch_by_worker (Boolean)
@@ -300,11 +300,11 @@ return [
 
 		// groupedit_image_limit (Integer)
 		// Number of contacts at which the group editor should switch from display the profile pictures of the contacts to only display the names.
-		// This can alternatively be set on a per account basis in the pconfig table.
+		// This can alternatively be set on a per-account basis in the pconfig table.
 		'groupedit_image_limit' => 400,
 
 		// gserver_update_limit (Integer)
-		// How much servers should be checked at a time?
+		// How many servers should be checked at a time?
 		'gserver_update_limit' => 100,
 
 		// hsts (Boolean)
@@ -330,7 +330,7 @@ return [
 		'ipv4_resolve' => false,
 
 		// invitation_only (Boolean)
-		// If set true registration is only possible after a current member of the node has send an invitation.
+		// If set true registration is only possible after a current member of the node has sent an invitation.
 		'invitation_only' => false,
 
 		// itemspage_network (Integer)
@@ -343,7 +343,7 @@ return [
 		'itemspage_network_mobile' => 20,
 
 		// jpeg_quality (Integer)
-		// 
+		//
 		// Lower numbers save space at cost of image detail
 		// where n is between 1 and 100, and with very poor results below about 50
 		'jpeg_quality' => 100,
@@ -415,13 +415,13 @@ return [
 
 		// max_image_length (Integer)
 		// An alternate way of limiting picture upload sizes.
-		// Specify the maximum pixel  length that pictures are allowed to be (for non-square pictures, it will apply to the longest side).
+		// Specify the maximum pixel length that pictures are allowed to be (for non-square pictures, it will apply to the longest side).
 		// Pictures longer than this length will be resized to be this length (on the longest side, the other side will be scaled appropriately).
 		// If you don't want to set a maximum length, set to -1.
 		'max_image_length' => -1,
 
 		// max_likers (Integer)
-		// Maximum number of "people who like (or don't like) this"  that we will list by name
+		// Maximum number of "people who like (or don't like) this" that we will list by name
 		'max_likers' => 75,
 
 		// max_processes_backend (Integer)
@@ -471,7 +471,7 @@ return [
 		'no_oembed' => false,
 
 		// no_redirect_list (Array)
-		// List of domains where HTTP redirects should be ignored. 
+		// List of domains where HTTP redirects should be ignored.
 		'no_redirect_list' => [],
 
 		// no_smilies (Boolean)
@@ -483,7 +483,7 @@ return [
 		'paranoia' => false,
 
 		// permit_crawling (Boolean)
-		// Restricts the search for not logged in users to one search per minute.
+		// Restricts the search for not logged-in users to one search per minute.
 		'permit_crawling' => false,
 
 		// pidfile (Path)
@@ -491,7 +491,7 @@ return [
 		'pidfile' => '',
 
 		// png_quality (Integer)
-		// Sets the ImageMagick compression level for PNG images. Values ranges from 0 (uncompressed) to 9 (most compressed).
+		// Sets the ImageMagick compression level for PNG images. Values range from 0 (uncompressed) to 9 (most compressed).
 		'png_quality' => 8,
 
 		// profiler (Boolean)
@@ -568,11 +568,11 @@ return [
 		'set_creation_date' => false,
 
 		// show_global_community_hint (Boolean)
-		// When the global community page is enabled, use this option to display a hint above the stream, that this is a collection of all public top-level postings that arrive on your node.
+		// When the global community page is enabled, use this option to display a hint above the stream, that this is a collection of all public top-level postings that arrive at your node.
 		'show_global_community_hint' => false,
 
 		// show_received (Boolean)
-		// Show the receive data along with the post creation date
+		// Show the received date along with the post creation date
 		'show_received' => true,
 
 		// show_received_seconds (Integer)
@@ -609,13 +609,13 @@ return [
 
 		// username_min_length (Integer)
 		// The minimum character length a username can be.
-		// This length is check once the username has been trimmed and multiple spaces have been collapsed into one.
+		// This length is checked once the username has been trimmed and multiple spaces have been collapsed into one.
 		// Minimum for this config value is 1. Maximum is 64 as the resulting profile URL mustn't be longer than 255 chars.
 		'username_min_length' => 3,
 
 		// username_max_length (Integer)
 		// The maximum character length a username can be.
-		// This length is check once the username has been trimmed and multiple spaces have been collapsed into one.
+		// This length is checked once the username has been trimmed and multiple spaces have been collapsed into one.
 		// Minimum for this config value is 1. Maximum is 64 as the resulting profile URL mustn't be longer than 255 chars.
 		'username_max_length' => 48,
 
@@ -738,8 +738,7 @@ return [
 		'config_dir' => 'view/smarty3',
 
 		// use_sub_dirs (Boolean)
-		// By default the template cache is stored in several sub directories.
-		// 
+		// By default the template cache is stored in several subdirectories.
 		'use_sub_dirs' => true,
 	],
 ];

From a147038c2eb4685c101a207289d0ec71f6a0efec Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 19 Nov 2022 19:08:44 -0500
Subject: [PATCH 32/45] Ensure IEMail::getMessage returns a string

---
 src/Object/EMail/IEmail.php | 2 +-
 src/Object/Email.php        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Object/EMail/IEmail.php b/src/Object/EMail/IEmail.php
index f1e66a224f..9fd1fe3da6 100644
--- a/src/Object/EMail/IEmail.php
+++ b/src/Object/EMail/IEmail.php
@@ -80,7 +80,7 @@ interface IEmail extends JsonSerializable
 	 *
 	 * @return string
 	 */
-	function getMessage(bool $plain = false);
+	function getMessage(bool $plain = false): string;
 
 	/**
 	 * Gets the additional mail header array
diff --git a/src/Object/Email.php b/src/Object/Email.php
index 57eb0c17e9..4d5a11715c 100644
--- a/src/Object/Email.php
+++ b/src/Object/Email.php
@@ -110,12 +110,12 @@ class Email implements IEmail
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getMessage(bool $plain = false)
+	public function getMessage(bool $plain = false): string
 	{
 		if ($plain) {
 			return $this->msgText;
 		} else {
-			return $this->msgHtml;
+			return $this->msgHtml ?? '';
 		}
 	}
 

From 6f93ee7e49fc555e10a008e04567cd72105533dc Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 19 Nov 2022 19:10:02 -0500
Subject: [PATCH 33/45] Fix various PHP 8 deprecations

---
 src/Content/Nav.php                          |  8 ++------
 src/Model/APContact.php                      |  4 ++--
 src/Model/Item.php                           |  4 ++--
 src/Model/Post/Media.php                     |  4 ++--
 src/Module/Home.php                          |  2 +-
 src/Network/HTTPClient/Client/HttpClient.php |  2 +-
 src/Protocol/Diaspora.php                    |  2 +-
 src/Render/FriendicaSmartyEngine.php         |  2 +-
 src/Worker/Notifier.php                      |  2 +-
 view/theme/frio/php/PHPColors/Color.php      | 12 ++++++------
 10 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 0000b3d296..cb2edb4eb6 100644
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -244,12 +244,8 @@ class Nav
 		}
 
 		$gdirpath = 'directory';
-
-		if (strlen(DI::config()->get('system', 'singleuser'))) {
-			$gdir = DI::config()->get('system', 'directory');
-			if (strlen($gdir)) {
-				$gdirpath = Profile::zrl($gdir, true);
-			}
+		if (DI::config()->get('system', 'singleuser') && DI::config()->get('system', 'directory')) {
+			$gdirpath = Profile::zrl(DI::config()->get('system', 'directory'), true);
 		}
 
 		if ((DI::userSession()->getLocalUserId() || DI::config()->get('system', 'community_page_style') != Community::DISABLED_VISITOR) &&
diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 742efcf190..3b568f39f1 100644
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -383,7 +383,7 @@ class APContact
 		// kroeg:blocks, updated
 
 		// When the photo is too large, try to shorten it by removing parts
-		if (strlen($apcontact['photo']) > 255) {
+		if (strlen($apcontact['photo'] ?? '') > 255) {
 			$parts = parse_url($apcontact['photo']);
 			unset($parts['fragment']);
 			$apcontact['photo'] = (string)Uri::fromParts($parts);
@@ -574,7 +574,7 @@ class APContact
 	 *
 	 * @param array $apcontact
 	 *
-	 * @return bool 
+	 * @return bool
 	 */
 	public static function isRelay(array $apcontact): bool
 	{
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 900bf3a2c4..7c8804a290 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -210,7 +210,7 @@ class Item
 						$fields['raw-body'] = BBCode::removeSharedData($fields['raw-body']);
 					}
 				}
-		
+
 				Post\Media::insertFromAttachmentData($item['uri-id'], $fields['body']);
 
 				$content_fields = ['raw-body' => trim($fields['raw-body'] ?? $fields['body'])];
@@ -337,7 +337,7 @@ class Item
 		 * generate a resource-id and therefore aren't intimately linked to the item.
 		 */
 		/// @TODO: this should first check if photo is used elsewhere
-		if (strlen($item['resource-id'])) {
+		if ($item['resource-id']) {
 			Photo::delete(['resource-id' => $item['resource-id'], 'uid' => $item['uid']]);
 		}
 
diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php
index 6cee11e6c8..04c0db0f80 100644
--- a/src/Model/Post/Media.php
+++ b/src/Model/Post/Media.php
@@ -279,7 +279,7 @@ class Media
 		if (!empty($contact['gsid'])) {
 			$gserver = DBA::selectFirst('gserver', ['url', 'site_name'], ['id' => $contact['gsid']]);
 		}
-		
+
 		$media['type'] = self::ACTIVITY;
 		$media['media-uri-id'] = $item['uri-id'];
 		$media['height'] = null;
@@ -687,7 +687,7 @@ class Media
 				$previews[] = $medium['preview'];
 			}
 
-			$type = explode('/', current(explode(';', $medium['mimetype'])));
+			$type = explode('/', explode(';', $medium['mimetype'])[0]);
 			if (count($type) < 2) {
 				Logger::info('Unknown MimeType', ['type' => $type, 'media' => $medium]);
 				$filetype = 'unkn';
diff --git a/src/Module/Home.php b/src/Module/Home.php
index ca4c4b8959..06bfa5eba5 100644
--- a/src/Module/Home.php
+++ b/src/Module/Home.php
@@ -46,7 +46,7 @@ class Home extends BaseModule
 			DI::baseUrl()->redirect('network');
 		}
 
-		if (strlen($config->get('system', 'singleuser'))) {
+		if ($config->get('system', 'singleuser')) {
 			DI::baseUrl()->redirect('/profile/' . $config->get('system', 'singleuser'));
 		}
 
diff --git a/src/Network/HTTPClient/Client/HttpClient.php b/src/Network/HTTPClient/Client/HttpClient.php
index cfc8fbfab1..32a1a22fc2 100644
--- a/src/Network/HTTPClient/Client/HttpClient.php
+++ b/src/Network/HTTPClient/Client/HttpClient.php
@@ -254,7 +254,7 @@ class HttpClient implements ICanSendHttpRequests
 		$urlResult = $this->resolver->resolveURL($url);
 
 		if ($urlResult->didErrorOccur()) {
-			throw new TransferException($urlResult->getErrorMessageString(), $urlResult->getHTTPStatusCode());
+			throw new TransferException($urlResult->getErrorMessageString(), $urlResult->getHTTPStatusCode() ?? 0);
 		}
 
 		return $urlResult->getURL();
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 8a5969dde1..09f4380b0b 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -3638,7 +3638,7 @@ class Diaspora
 
 		Logger::info('Got relayable data ' . $type . ' for item ' . $item['guid'] . ' (' . $item['id'] . ')');
 
-		$msg = json_decode($item['signed_text'], true);
+		$msg = json_decode($item['signed_text'] ?? '', true);
 
 		$message = [];
 		if (is_array($msg)) {
diff --git a/src/Render/FriendicaSmartyEngine.php b/src/Render/FriendicaSmartyEngine.php
index 5ea01166fd..201d99f822 100644
--- a/src/Render/FriendicaSmartyEngine.php
+++ b/src/Render/FriendicaSmartyEngine.php
@@ -81,7 +81,7 @@ final class FriendicaSmartyEngine extends TemplateEngine
 
 		// "middleware": inject variables into templates
 		$arr = [
-			'template' => basename($this->smarty->filename),
+			'template' => basename($this->smarty->filename ?? ''),
 			'vars' => $vars
 		];
 		Hook::callAll('template_vars', $arr);
diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 10fe6e3abc..db593b6a47 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -336,7 +336,7 @@ class Notifier
 				foreach ($items as $item) {
 					$recipients[] = $item['contact-id'];
 					// pull out additional tagged people to notify (if public message)
-					if ($public_message && strlen($item['inform'])) {
+					if ($public_message && $item['inform']) {
 						$people = explode(',',$item['inform']);
 						foreach ($people as $person) {
 							if (substr($person,0,4) === 'cid:') {
diff --git a/view/theme/frio/php/PHPColors/Color.php b/view/theme/frio/php/PHPColors/Color.php
index e4de79c40a..30de579966 100644
--- a/view/theme/frio/php/PHPColors/Color.php
+++ b/view/theme/frio/php/PHPColors/Color.php
@@ -132,16 +132,16 @@ class Color {
 
             $var_1 = 2 * $L - $var_2;
 
-            $r = round(255 * self::_huetorgb( $var_1, $var_2, $H + (1/3) ));
-            $g = round(255 * self::_huetorgb( $var_1, $var_2, $H ));
-            $b = round(255 * self::_huetorgb( $var_1, $var_2, $H - (1/3) ));
+            $r = 255 * self::_huetorgb( $var_1, $var_2, $H + (1/3) );
+            $g = 255 * self::_huetorgb( $var_1, $var_2, $H );
+            $b = 255 * self::_huetorgb( $var_1, $var_2, $H - (1/3) );
 
         }
 
         // Convert to hex
-        $r = dechex($r);
-        $g = dechex($g);
-        $b = dechex($b);
+        $r = dechex(round($r));
+        $g = dechex(round($g));
+        $b = dechex(round($b));
 
         // Make sure we get 2 digits for decimals
         $r = (strlen("".$r)===1) ? "0".$r:$r;

From 99df11e99b8d4df2594ae4cf7ad902a407e4a479 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 19 Nov 2022 19:30:48 -0500
Subject: [PATCH 34/45] Fix PHP 8 inheritance deprecation warnings in App\PAge
 and ParsedLogIterator

---
 src/App/Page.php                    | 62 ++++++-----------------------
 src/Model/Log/ParsedLogIterator.php |  8 ++--
 2 files changed, 17 insertions(+), 53 deletions(-)

diff --git a/src/App/Page.php b/src/App/Page.php
index 0f14d9f6e6..37141426c3 100644
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -115,76 +115,40 @@ class Page implements ArrayAccess
 		}
 	}
 
+	// ArrayAccess interface
+
 	/**
-	 * Whether a offset exists
-	 *
-	 * @link  https://php.net/manual/en/arrayaccess.offsetexists.php
-	 *
-	 * @param mixed $offset <p>
-	 *                      An offset to check for.
-	 *                      </p>
-	 *
-	 * @return boolean true on success or false on failure.
-	 * </p>
-	 * <p>
-	 * The return value will be casted to boolean if non-boolean was returned.
-	 * @since 5.0.0
+	 * @inheritDoc
 	 */
+	#[\ReturnTypeWillChange]
 	public function offsetExists($offset): bool
 	{
 		return isset($this->page[$offset]);
 	}
 
 	/**
-	 * Offset to retrieve
-	 *
-	 * @link  https://php.net/manual/en/arrayaccess.offsetget.php
-	 *
-	 * @param mixed $offset <p>
-	 *                      The offset to retrieve.
-	 *                      </p>
-	 *
-	 * @return mixed Can return all value types.
-	 * @since 5.0.0
+	 * @inheritDoc
 	 */
+	#[\ReturnTypeWillChange]
 	public function offsetGet($offset)
 	{
 		return $this->page[$offset] ?? null;
 	}
 
 	/**
-	 * Offset to set
-	 *
-	 * @link  https://php.net/manual/en/arrayaccess.offsetset.php
-	 *
-	 * @param mixed $offset <p>
-	 *                      The offset to assign the value to.
-	 *                      </p>
-	 * @param mixed $value  <p>
-	 *                      The value to set.
-	 *                      </p>
-	 *
-	 * @return void
-	 * @since 5.0.0
+	 * @inheritDoc
 	 */
-	public function offsetSet($offset, $value)
+	#[\ReturnTypeWillChange]
+	public function offsetSet($offset, $value): void
 	{
 		$this->page[$offset] = $value;
 	}
 
 	/**
-	 * Offset to unset
-	 *
-	 * @link  https://php.net/manual/en/arrayaccess.offsetunset.php
-	 *
-	 * @param mixed $offset <p>
-	 *                      The offset to unset.
-	 *                      </p>
-	 *
-	 * @return void
-	 * @since 5.0.0
+	 * @inheritDoc
 	 */
-	public function offsetUnset($offset)
+	#[\ReturnTypeWillChange]
+	public function offsetUnset($offset): void
 	{
 		if (isset($this->page[$offset])) {
 			unset($this->page[$offset]);
@@ -310,7 +274,7 @@ class Page implements ArrayAccess
 		}
 		return $pageURL;
 	}
-      
+
 	/**
 	 * Initializes Page->page['footer'].
 	 *
diff --git a/src/Model/Log/ParsedLogIterator.php b/src/Model/Log/ParsedLogIterator.php
index 4309e4cd00..e3415da8ca 100644
--- a/src/Model/Log/ParsedLogIterator.php
+++ b/src/Model/Log/ParsedLogIterator.php
@@ -160,7 +160,7 @@ class ParsedLogIterator implements \Iterator
 	 * @see Iterator::next()
 	 * @return void
 	 */
-	public function next()
+	public function next(): void
 	{
 		$parsed = $this->read();
 
@@ -177,7 +177,7 @@ class ParsedLogIterator implements \Iterator
 	 * @see Iterator::rewind()
 	 * @return void
 	 */
-	public function rewind()
+	public function rewind(): void
 	{
 		$this->value = null;
 		$this->reader->rewind();
@@ -200,9 +200,9 @@ class ParsedLogIterator implements \Iterator
 	 * Return current iterator value
 	 *
 	 * @see Iterator::current()
-	 * @return ?ParsedLogLing
+	 * @return ?ParsedLogLine
 	 */
-	public function current()
+	public function current(): ?ParsedLogLine
 	{
 		return $this->value;
 	}

From 83c04ac433a706d19433e819529b0a3b23640443 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 19 Nov 2022 19:41:45 -0500
Subject: [PATCH 35/45] Fix support for `/contact/123456/conversations` URLs in
 Module\Contact\Hovercard

---
 src/Module/Contact/Hovercard.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Module/Contact/Hovercard.php b/src/Module/Contact/Hovercard.php
index 953d7e7a7f..5c82fd2c42 100644
--- a/src/Module/Contact/Hovercard.php
+++ b/src/Module/Contact/Hovercard.php
@@ -44,11 +44,12 @@ class Hovercard extends BaseModule
 			throw new HTTPException\ForbiddenException();
 		}
 
-		// If a contact is connected the url is internally changed to 'contact/redir/CID'. We need the pure url to search for
-		// the contact. So we strip out the contact id from the internal url and look in the contact table for
-		// the real url (nurl)
-		if (strpos($contact_url, 'contact/') === 0) {
-			$remote_contact = Contact::selectFirst(['nurl'], ['id' => intval(basename($contact_url))]);
+		/* Possible formats for relative URLs that need to be converted to the absolute contact URL:
+		 * - contact/redir/123456
+		 * - contact/123456/conversations
+		 */
+		if (strpos($contact_url, 'contact/') === 0 && preg_match('/(\d+)/', $contact_url, $matches)) {
+			$remote_contact = Contact::selectFirst(['nurl'], ['id' => $matches[1]]);
 			$contact_url = $remote_contact['nurl'] ?? '';
 		}
 

From 5f074bc4e7534f91d61f76faec06e736b8005221 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 19 Nov 2022 19:55:01 -0500
Subject: [PATCH 36/45] Add support for Mastodon /authorize_interaction route

- It is used by Fedifind to follow people who set their Webfinger address in their Twitter bio
---
 src/Module/Contact/Follow.php | 4 +++-
 static/routes.config.php      | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Module/Contact/Follow.php b/src/Module/Contact/Follow.php
index c274769402..f8b88c05fc 100644
--- a/src/Module/Contact/Follow.php
+++ b/src/Module/Contact/Follow.php
@@ -88,7 +88,9 @@ class Follow extends BaseModule
 		}
 
 		$uid = $this->session->getLocalUserId();
-		$url = Probe::cleanURI(trim($request['url'] ?? ''));
+
+		// uri is used by the /authorize_interaction Mastodon route
+		$url = Probe::cleanURI(trim($request['uri'] ?? $request['url'] ?? ''));
 
 		// Issue 6874: Allow remote following from Peertube
 		if (strpos($url, 'acct:') === 0) {
diff --git a/static/routes.config.php b/static/routes.config.php
index 5f5c238e05..9adc8ec1dd 100644
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -342,6 +342,10 @@ return [
 	'/acctlink'            => [Module\Acctlink::class,     [R::GET]],
 	'/apps'                => [Module\Apps::class,         [R::GET]],
 	'/attach/{item:\d+}'   => [Module\Attach::class,       [R::GET]],
+
+	// Mastodon route used by Fedifind to follow people who set their Webfinger address in their Twitter bio
+	'/authorize_interaction' => [Module\Contact\Follow::class, [R::GET, R::POST]],
+
 	'/babel'               => [Module\Debug\Babel::class,  [R::GET, R::POST]],
 	'/debug/ap'            => [Module\Debug\ActivityPubConversion::class,  [R::GET, R::POST]],
 

From d4bb5223a4587d2fe94932dd114756b00737847d Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 20 Nov 2022 13:01:37 -0500
Subject: [PATCH 37/45] Use guid from shared post in
 Protocol\Diaspora::getReshareDetails

- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1321194769
---
 src/Protocol/Diaspora.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 09f4380b0b..4a42a5e0b2 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -3201,7 +3201,7 @@ class Diaspora
 	 */
 	public static function getReshareDetails(array $item): array
 	{
-		$reshared = DI::contentItem()->getSharedPost($item, ['network', 'author-addr']);
+		$reshared = DI::contentItem()->getSharedPost($item, ['guid', 'network', 'author-addr']);
 		if (empty($reshared)) {
 			return [];
 		}
@@ -3213,7 +3213,7 @@ class Diaspora
 
 		return [
 			'root_handle' => strtolower($reshared['post']['author-addr']),
-			'root_guid'   => $reshared['guid']
+			'root_guid'   => $reshared['post']['guid'],
 		];
 	}
 

From fa3db8737bacff77e1f9fd5dea53f1ef174070d5 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 20 Nov 2022 11:37:26 -0500
Subject: [PATCH 38/45] Remove config/addon-sample.config.php file in favor of
 per-addon configuration files

- Update documentation and .gitignore
---
 .gitignore                     |  7 +++----
 config/addon-sample.config.php | 12 ------------
 doc/Config.md                  | 18 +++++++++---------
 3 files changed, 12 insertions(+), 25 deletions(-)
 delete mode 100644 config/addon-sample.config.php

diff --git a/.gitignore b/.gitignore
index c094f6a246..3db593f1d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,10 +10,9 @@ home.html
 robots.txt
 
 #ignore local config
-/config/local.config.php
-/config/addon.config.php
-/config/local.ini.php
-/config/addon.ini.php
+!/config/local-sample.config.php
+/config/*.config.php
+/config/*.ini.php
 
 #ignore documentation, it should be newly built
 /doc/api
diff --git a/config/addon-sample.config.php b/config/addon-sample.config.php
deleted file mode 100644
index 5159370c3a..0000000000
--- a/config/addon-sample.config.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-// Addon configuration
-
-// Copy this configuration file to addon.config.php and edit it if you want to configure addons, see below example for the twitter addon
-
-return [
-	'twitter' => [
-		'consumerkey' => '1234567890',
-		'consumersecret' => 'ABCDEFGHIJKLMONPQRSTUVWXYZ',
-	],
-];
diff --git a/doc/Config.md b/doc/Config.md
index 8855099391..a66895ca17 100644
--- a/doc/Config.md
+++ b/doc/Config.md
@@ -37,8 +37,8 @@ The `config` directory holds key configuration files and can have different conf
 All of them have to end with `.config.php` and must not include `-sample` in their name.
 
 Some examples of common known configuration files:
-- `local.config.php` holds the current node custom configuration.
-- `addon.config.php` is optional and holds the custom configuration for specific addons.
+- `local.config.php` holds the base node custom configuration.
+- Any other file in this folder is meant for addon configuration.
 
 Addons can define their own default configuration values in `addon/[addon]/config/[addon].config.php` which is loaded when the addon is activated.
 
@@ -59,7 +59,7 @@ Currently, the following configurations are included:
 The legacy `.htconfig.php` configuration file is still supported, but is deprecated and will be removed in a subsequent Friendica release.
 
 The migration is pretty straightforward:
-If you had any addon-specific configuration in your `.htconfig.php`, just copy `config/addon-sample.config.php` to `config/addon.config.php` and move your configuration values.
+If you had any addon-specific configuration in your `.htconfig.php`, copy `config/local-sample.config.php` to `config/addon.config.php` and move your configuration values.
 Afterwards, copy `config/local-sample.config.php` to `config/local.config.php`, move the remaining configuration values to it according to the following conversion chart, then rename your `.htconfig.php` to check your node is working as expected before deleting it.
 
 <style>
@@ -206,7 +206,7 @@ $lang = "value";
 The legacy `config/local.ini.php` configuration file is still supported, but is deprecated and will be removed in a subsequent Friendica release.
 
 The migration is pretty straightforward:
-If you had any addon-specific configuration in your `config/addon.ini.php`, just copy `config/addon-sample.config.php` to `config/addon.config.php` and move your configuration values.
+If you had any addon-specific configuration in your `config/addon.ini.php`, copy `config/local-sample.config.php` to `config/addon.config.php` and move your configuration values.
 Afterwards, copy `config/local-sample.config.php` to `config/local.config.php`, move the remaining configuration values to it according to the following conversion chart, then rename your `config/local.ini.php` file to check your node is working as expected before deleting it.
 
 <table class="config">
@@ -278,16 +278,16 @@ key[] = value3
 
 ### Database Settings
 
-The configuration variables database.hostname, database.username, database.password, database.database and database.charset are holding your credentials for the database connection.
-If you need to specify a port to access the database, you can do so by appending ":portnumber" to the database.hostname variable.
+The configuration variables `database.hostname` (or `database.socket`), `database.username`, `database.password`, `database.database` and optionally `database.charset` are holding your credentials for the database connection.
+If you need to specify a port to access the database, you can do so by appending ":portnumber" to the `database.hostname` variable.
 
     'database' => [
         'hostname' => 'your.mysqlhost.com:123456',
     ]
 
-If all of the following environment variables are set, Friendica will use them instead of the previously configured variables for the db:
+If all the following environment variables are set, Friendica will use them instead of the previously configured variables for the db:
 
-    MYSQL_HOST
+    MYSQL_HOST or MYSQL_SOCKET
     MYSQL_PORT
     MYSQL_USERNAME
     MYSQL_PASSWORD
@@ -316,7 +316,7 @@ Enabling the admin panel for an account, and thus making the account holder admi
     
 
 Where you have to match the email address used for the account with the one you enter to the `config/local.config.php` file.
-If more then one account should be able to access the admin panel, separate the email addresses with a comma.
+If more than one account should be able to access the admin panel, separate the email addresses with a comma.
 
     'config' => [
         'admin_email' => 'someone@example.com,someoneelse@example.com',

From 6dcc964ed873ef3a4f601b30cd05657ca4c44186 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 20 Nov 2022 17:07:08 -0500
Subject: [PATCH 39/45] Fix string interpolation in Model\Photo::upload

---
 src/Model/Photo.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 550d802e81..7c620b0ad4 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -1130,8 +1130,8 @@ class Photo
 		$picture['height']      = $photo['height'];
 		$picture['type']        = $photo['type'];
 		$picture['albumpage']   = DI::baseUrl() . '/photos/' . $user['nickname'] . '/image/' . $resource_id;
-		$picture['picture']     = DI::baseUrl() . '/photo/{$resource_id}-0.' . $image->getExt();
-		$picture['preview']     = DI::baseUrl() . '/photo/{$resource_id}-{$smallest}.' . $image->getExt();
+		$picture['picture']     = DI::baseUrl() . '/photo/' . $resource_id . '-0.' . $image->getExt();
+		$picture['preview']     = DI::baseUrl() . '/photo/' . $resource_id . '-' . $smallest . '.' . $image->getExt();
 
 		Logger::info('upload done', ['picture' => $picture]);
 		return $picture;
@@ -1272,4 +1272,3 @@ class Photo
 		return $resource_id;
 	}
 }
-

From 77e87da4410ddabc06e37aa8cb8f723de37f5fc5 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 20 Nov 2022 17:15:07 -0500
Subject: [PATCH 40/45] Create /profile/{nickname}/photos route

- Create new Profile\Photos\Index module class
- Update most references of the legacy /photos/{nickname} route
---
 doc/FAQ.md                                  |   2 +-
 doc/de/FAQ.md                               |   2 +-
 mod/photos.php                              |  70 +------
 src/Content/Item.php                        |   6 +-
 src/Content/Nav.php                         |   2 +-
 src/Model/Contact.php                       |   2 +-
 src/Module/BaseProfile.php                  |   4 +-
 src/Module/Profile/Photos/Index.php         | 196 ++++++++++++++++++++
 src/Module/Settings/Profile/Index.php       |   2 +-
 src/Module/Settings/Profile/Photo/Index.php |   2 +-
 static/routes.config.php                    |   5 +
 view/templates/photo_albums.tpl             |   4 +-
 view/templates/photos_upload.tpl            |   3 +-
 view/theme/frio/templates/photo_albums.tpl  |   6 +-
 view/theme/frio/templates/photos_upload.tpl |   4 +-
 view/theme/frio/theme.php                   |   3 +
 16 files changed, 225 insertions(+), 88 deletions(-)
 create mode 100644 src/Module/Profile/Photos/Index.php

diff --git a/doc/FAQ.md b/doc/FAQ.md
index 118e05cbc4..0f9e115022 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -50,7 +50,7 @@ We recommend to talk to the admin(s) of the affected friendica server. (Admins,
 ### How can I upload images, files, links, videos and sound files to posts?
 
 You can upload images from your computer using the [editor](help/Text_editor).
-An overview of all uploaded images is listed at *yourpage.com/photos/profilename*.
+An overview of all uploaded images is listed at *yourpage.com/profile/profilename/photos*.
 On that page, you can also upload images directly and choose if your contacts will receive a message about this upload.
 
 Generally, you can attach any kind of file to a post.
diff --git a/doc/de/FAQ.md b/doc/de/FAQ.md
index e3e4ac672f..0e5f9c42ff 100644
--- a/doc/de/FAQ.md
+++ b/doc/de/FAQ.md
@@ -69,7 +69,7 @@ Andere erlauben nur kostenpflichtige Zertifikate als eigenes Angebot bzw. von an
 ### Wie kann ich Bilder, Dateien, Links, Video und Audio in Beiträge einfügen?
 
 Bilder können direkt im [Beitragseditor](help/Text_editor) vom Computer hochgeladen werden.
-Eine Übersicht aller Bilder, die auf Deinem Server liegen, findest Du unter <i>deineSeite.de/photos/profilname</i>.
+Eine Übersicht aller Bilder, die auf Deinem Server liegen, findest Du unter <i>deineSeite.de/profile/profilname/photos</i>.
 Dort kannst Du auch direkt Bilder hochladen und festlegen, ob Deine Kontakte eine Nachricht über das neue Bild bekommen.
 
 Alle Arten von Dateien können grundsätzlich als Anhang in Friendica hochgeladen werden.
diff --git a/mod/photos.php b/mod/photos.php
index 3923bdfc89..e5a24d22a9 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -284,8 +284,7 @@ function photos_post(App $a)
 				DI::baseUrl()->redirect('photos/' . DI::args()->getArgv()[1] . '/image/' . DI::args()->getArgv()[3]);
 			}
 
-			DI::baseUrl()->redirect('photos/' . DI::args()->getArgv()[1]);
-			return; // NOTREACHED
+			DI::baseUrl()->redirect('profile/' . DI::args()->getArgv()[1] . '/photos');
 		}
 	}
 
@@ -778,7 +777,6 @@ function photos_post(App $a)
 function photos_content(App $a)
 {
 	// URLs:
-	// photos/name
 	// photos/name/upload
 	// photos/name/upload/xxxxx (xxxxx is album name)
 	// photos/name/album/xxxxx
@@ -905,7 +903,7 @@ function photos_content(App $a)
 
 		$uploader = '';
 
-		$ret = ['post_url' => 'photos/' . $user['nickname'],
+		$ret = ['post_url' => 'profile/' . $user['nickname'] . '/photos',
 				'addon_text' => $uploader,
 				'default_upload' => true];
 
@@ -1522,68 +1520,4 @@ function photos_content(App $a)
 
 		return $o;
 	}
-
-	// Default - show recent photos with upload link (if applicable)
-	//$o = '';
-	$total = 0;
-	$r = DBA::toArray(DBA::p("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = ? AND `photo-type` = ?
-		$sql_extra GROUP BY `resource-id`",
-		$user['uid'],
-		Photo::DEFAULT,
-	));
-	if (DBA::isResult($r)) {
-		$total = count($r);
-	}
-
-	$pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 20);
-
-	$r = DBA::toArray(DBA::p("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`,
-		ANY_VALUE(`type`) AS `type`, ANY_VALUE(`album`) AS `album`, max(`scale`) AS `scale`,
-		ANY_VALUE(`created`) AS `created` FROM `photo`
-		WHERE `uid` = ? AND `photo-type` = ?
-		$sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT ? , ?",
-		$user['uid'],
-		Photo::DEFAULT,
-		$pager->getStart(),
-		$pager->getItemsPerPage()
-	));
-
-	$photos = [];
-	if (DBA::isResult($r)) {
-		// "Twist" is only used for the duepunto theme with style "slackr"
-		$twist = false;
-		foreach ($r as $rr) {
-			$twist = !$twist;
-			$ext = $phototypes[$rr['type']];
-
-			$alt_e = $rr['filename'];
-			$name_e = $rr['album'];
-
-			$photos[] = [
-				'id'    => $rr['id'],
-				'twist' => ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2,4),
-				'link'  => 'photos/' . $user['nickname'] . '/image/' . $rr['resource-id'],
-				'title' => DI::l10n()->t('View Photo'),
-				'src'   => 'photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,
-				'alt'   => $alt_e,
-				'album' => [
-					'link' => 'photos/' . $user['nickname'] . '/album/' . bin2hex($rr['album']),
-					'name' => $name_e,
-					'alt'  => DI::l10n()->t('View Album'),
-				],
-
-			];
-		}
-	}
-
-	$tpl = Renderer::getMarkupTemplate('photos_recent.tpl');
-	$o .= Renderer::replaceMacros($tpl, [
-		'$title' => DI::l10n()->t('Recent Photos'),
-		'$can_post' => $can_post,
-		'$upload' => [DI::l10n()->t('Upload New Photos'), 'photos/' . $user['nickname'] . '/upload'],
-		'$photos' => $photos,
-		'$paginate' => $pager->renderFull($total),
-	]);
-
-	return $o;
 }
diff --git a/src/Content/Item.php b/src/Content/Item.php
index 0d4c3c180b..4fb1f85d62 100644
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -361,7 +361,7 @@ class Item
 
 		if ($sparkle) {
 			$status_link = $profile_link . '/status';
-			$photos_link = str_replace('/profile/', '/photos/', $profile_link);
+			$photos_link = $profile_link . '/photos';
 			$profile_link = $profile_link . '/profile';
 		}
 
@@ -729,7 +729,7 @@ class Item
 					'message_id' => $shared['uri'],
 					'comment'    => $item['body'],
 					'shared'     => $shared['body'],
-				];				
+				];
 			}
 		}
 
@@ -737,7 +737,7 @@ class Item
 	}
 
 	/**
-	 * Add a link to a shared post at the end of the post 
+	 * Add a link to a shared post at the end of the post
 	 *
 	 * @param string  $body
 	 * @param integer $quote_uri_id
diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index cb2edb4eb6..8ebb412db7 100644
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -192,7 +192,7 @@ class Nav
 			// user menu
 			$nav['usermenu'][] = ['profile/' . $a->getLoggedInUserNickname(), DI::l10n()->t('Status'), '', DI::l10n()->t('Your posts and conversations')];
 			$nav['usermenu'][] = ['profile/' . $a->getLoggedInUserNickname() . '/profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')];
-			$nav['usermenu'][] = ['photos/' . $a->getLoggedInUserNickname(), DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')];
+			$nav['usermenu'][] = ['profile/' . $a->getLoggedInUserNickname() . '/photos', DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')];
 			$nav['usermenu'][] = ['profile/' . $a->getLoggedInUserNickname() . '/media', DI::l10n()->t('Media'), '', DI::l10n()->t('Your postings with media')];
 			$nav['usermenu'][] = ['calendar/', DI::l10n()->t('Calendar'), '', DI::l10n()->t('Your calendar')];
 			$nav['usermenu'][] = ['notes/', DI::l10n()->t('Personal notes'), '', DI::l10n()->t('Your personal notes')];
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index cd4e52acd5..ce392217dd 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1158,7 +1158,7 @@ class Contact
 
 		if ($sparkle) {
 			$status_link = $profile_link . '/status';
-			$photos_link = str_replace('/profile/', '/photos/', $profile_link);
+			$photos_link = $profile_link . '/photos';
 			$profile_link = $profile_link . '/profile';
 		}
 
diff --git a/src/Module/BaseProfile.php b/src/Module/BaseProfile.php
index 16ba224c9c..56577ef33a 100644
--- a/src/Module/BaseProfile.php
+++ b/src/Module/BaseProfile.php
@@ -62,7 +62,7 @@ class BaseProfile extends BaseModule
 			],
 			[
 				'label' => DI::l10n()->t('Photos'),
-				'url'   => DI::baseUrl() . '/photos/' . $nickname,
+				'url'   => $baseProfileUrl . '/photos',
 				'sel'   => $current == 'photos' ? 'active' : '',
 				'title' => DI::l10n()->t('Photo Albums'),
 				'id'    => 'photo-tab',
@@ -78,7 +78,7 @@ class BaseProfile extends BaseModule
 			],
 		];
 
-		// the calendar link for the full featured events calendar
+		// the calendar link for the full-featured events calendar
 		if ($is_owner && $a->getThemeInfoValue('events_in_profile')) {
 			$tabs[] = [
 				'label' => DI::l10n()->t('Calendar'),
diff --git a/src/Module/Profile/Photos/Index.php b/src/Module/Profile/Photos/Index.php
new file mode 100644
index 0000000000..82803ac570
--- /dev/null
+++ b/src/Module/Profile/Photos/Index.php
@@ -0,0 +1,196 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2022, 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\Module\Profile\Photos;
+
+use Friendica\App;
+use Friendica\Content\Pager;
+use Friendica\Content\Widget;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Database\Database;
+use Friendica\Model\Contact;
+use Friendica\Model\Photo;
+use Friendica\Model\Profile;
+use Friendica\Model\User;
+use Friendica\Module\Response;
+use Friendica\Network\HTTPException;
+use Friendica\Security\Security;
+use Friendica\Util\Images;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
+
+class Index extends \Friendica\Module\BaseProfile
+{
+	/** @var IHandleUserSessions */
+	private $session;
+	/** @var App\Page */
+	private $page;
+	/** @var IManageConfigValues */
+	private $config;
+	/** @var App */
+	private $app;
+	/** @var Database */
+	private $database;
+
+	public function __construct(Database $database, App $app, IManageConfigValues $config, App\Page $page, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+	{
+		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+		$this->session  = $session;
+		$this->page     = $page;
+		$this->config   = $config;
+		$this->app      = $app;
+		$this->database = $database;
+	}
+
+	protected function content(array $request = []): string
+	{
+		parent::content($request);
+
+		if ($this->config->get('system', 'block_public') && !$this->session->isAuthenticated()) {
+			throw new HttpException\ForbiddenException($this->t('Public access denied.'));
+		}
+
+		$owner = User::getOwnerDataByNick($this->parameters['nickname']);
+		if (!isset($owner['account_removed']) || $owner['account_removed']) {
+			throw new HTTPException\NotFoundException($this->t('User not found.'));
+		}
+
+		$owner_uid = $owner['uid'];
+		$is_owner  = $this->session->getLocalUserId() && ($this->session->getLocalUserId() == $owner_uid);
+
+		$remote_contact = false;
+		if ($this->session->getRemoteContactID($owner_uid)) {
+			$contact_id = $this->session->getRemoteContactID($owner_uid);
+
+			$contact        = Contact::getContactForUser($contact_id, $owner_uid, ['blocked', 'pending']);
+			$remote_contact = $contact && !$contact['blocked'] && !$contact['pending'];
+		}
+
+		if ($owner['hidewall'] && !$is_owner && !$remote_contact) {
+			throw new HttpException\ForbiddenException($this->t('Access to this item is restricted.'));
+		}
+
+		$this->session->set('photo_return', $this->args->getCommand());
+
+		$sql_extra = Security::getPermissionsSQLByUserId($owner_uid);
+
+		$photo = $this->database->toArray($this->database->p(
+			"SELECT COUNT(DISTINCT `resource-id`) AS `count`
+			FROM `photo`
+			WHERE `uid` = ?
+			  AND `photo-type` = ?
+			  $sql_extra",
+			$owner['uid'],
+			Photo::DEFAULT,
+		));
+		$total = $photo[0]['count'];
+
+		$pager = new Pager($this->l10n, $this->args->getQueryString(), 20);
+
+		$photos = $this->database->toArray($this->database->p(
+			"SELECT
+				`resource-id`,
+				ANY_VALUE(`id`) AS `id`,
+				ANY_VALUE(`filename`) AS `filename`,
+				ANY_VALUE(`type`) AS `type`,
+				ANY_VALUE(`album`) AS `album`,
+				max(`scale`) AS `scale`,
+				ANY_VALUE(`created`) AS `created`
+			FROM `photo`
+			WHERE `uid` = ?
+			  AND `photo-type` = ?
+			  $sql_extra
+			GROUP BY `resource-id`
+			ORDER BY `created` DESC
+		    LIMIT ? , ?",
+			$owner['uid'],
+			Photo::DEFAULT,
+			$pager->getStart(),
+			$pager->getItemsPerPage()
+		));
+
+		$phototypes = Images::supportedTypes();
+
+		$photos = array_map(function ($photo) use ($owner, $phototypes) {
+			return [
+				'id'    => $photo['id'],
+				'link'  => 'photos/' . $owner['nickname'] . '/image/' . $photo['resource-id'],
+				'title' => $this->t('View Photo'),
+				'src'   => 'photo/' . $photo['resource-id'] . '-' . ((($photo['scale']) == 6) ? 4 : $photo['scale']) . '.' . $phototypes[$photo['type']],
+				'alt'   => $photo['filename'],
+				'album' => [
+					'link' => 'photos/' . $owner['nickname'] . '/album/' . bin2hex($photo['album']),
+					'name' => $photo['album'],
+					'alt'  => $this->t('View Album'),
+				],
+			];
+		}, $photos);
+
+		$tpl = Renderer::getMarkupTemplate('photos_head.tpl');
+		$this->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
+			'$ispublic' => $this->t('everybody')
+		]);
+
+		if ($albums = Photo::getAlbums($owner['uid'])) {
+			$albums = array_map(function ($album) use ($owner) {
+				return [
+					'text'      => $album['album'],
+					'total'     => $album['total'],
+					'url'       => 'photos/' . $owner['nickname'] . '/album/' . bin2hex($album['album']),
+					'urlencode' => urlencode($album['album']),
+					'bin2hex'   => bin2hex($album['album'])
+				];
+			}, $albums);
+
+			$photo_albums_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('photo_albums.tpl'), [
+				'$nick'     => $owner['nickname'],
+				'$title'    => $this->t('Photo Albums'),
+				'$recent'   => $this->t('Recent Photos'),
+				'$albums'   => $albums,
+				'$upload'   => [$this->t('Upload New Photos'), 'photos/' . $owner['nickname'] . '/upload'],
+				'$can_post' => $this->session->getLocalUserId() && $owner['uid'] == $this->session->getLocalUserId(),
+			]);
+		}
+
+		$this->page['aside'] .= Widget\VCard::getHTML($owner);
+
+		if (!empty($photo_albums_widget)) {
+			$this->page['aside'] .= $photo_albums_widget;
+		}
+
+		$o = self::getTabsHTML($this->app, 'photos', $is_owner, $owner['nickname'], Profile::getByUID($owner['uid'])['hide-friends'] ?? false);
+
+		$tpl = Renderer::getMarkupTemplate('photos_recent.tpl');
+		$o .= Renderer::replaceMacros($tpl, [
+			'$title'    => $this->t('Recent Photos'),
+			'$can_post' => $is_owner || $remote_contact && $owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY,
+			'$upload'   => [$this->t('Upload New Photos'), 'photos/' . $owner['nickname'] . '/upload'],
+			'$photos'   => $photos,
+			'$paginate' => $pager->renderFull($total),
+		]);
+
+		return $o;
+	}
+}
diff --git a/src/Module/Settings/Profile/Index.php b/src/Module/Settings/Profile/Index.php
index 52f61efd48..76930b7263 100644
--- a/src/Module/Settings/Profile/Index.php
+++ b/src/Module/Settings/Profile/Index.php
@@ -230,7 +230,7 @@ class Index extends BaseSettings
 			'$banner' => DI::l10n()->t('Edit Profile Details'),
 			'$submit' => DI::l10n()->t('Submit'),
 			'$profpic' => DI::l10n()->t('Change Profile Photo'),
-			'$profpiclink' => '/photos/' . $profile['nickname'],
+			'$profpiclink' => '/profile/' . $profile['nickname'] . '/photos',
 			'$viewprof' => DI::l10n()->t('View Profile'),
 
 			'$lbl_personal_section' => DI::l10n()->t('Personal'),
diff --git a/src/Module/Settings/Profile/Photo/Index.php b/src/Module/Settings/Profile/Photo/Index.php
index 3553a9f401..d58576e757 100644
--- a/src/Module/Settings/Profile/Photo/Index.php
+++ b/src/Module/Settings/Profile/Photo/Index.php
@@ -132,7 +132,7 @@ class Index extends BaseSettings
 				DI::l10n()->t('or'),
 				($newuser) ?
 					'<a href="' . DI::baseUrl() . '">' . DI::l10n()->t('skip this step') . '</a>'
-					: '<a href="' . DI::baseUrl() . '/photos/' . DI::app()->getLoggedInUserNickname() . '">'
+					: '<a href="' . DI::baseUrl() . '/profile/' . DI::app()->getLoggedInUserNickname() . '/photos">'
 						. DI::l10n()->t('select a photo from your photo albums') . '</a>'
 			),
 		]);
diff --git a/static/routes.config.php b/static/routes.config.php
index 9adc8ec1dd..13c8737187 100644
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -36,6 +36,7 @@ $profileRoutes = [
 	'/contacts/common'                         => [Module\Profile\Common::class,            [R::GET]],
 	'/contacts[/{type}]'                       => [Module\Profile\Contacts::class,          [R::GET]],
 	'/media'                                   => [Module\Profile\Media::class,             [R::GET]],
+	'/photos'                                  => [Module\Profile\Photos\Index::class,      [R::GET         ]],
 	'/photos/upload'                           => [Module\Profile\Photos\Upload::class,     [        R::POST]],
 	'/profile'                                 => [Module\Profile\Profile::class,           [R::GET]],
 	'/remote_follow'                           => [Module\Profile\RemoteFollow::class,      [R::GET, R::POST]],
@@ -553,6 +554,10 @@ return [
 		'/{type}/{customsize:\d+}/{nickname_ext}'                  => [Module\Photo::class, [R::GET]],
 	],
 
+	// Kept for backwards-compatibility
+	// @TODO remove by version 2023.12
+	'/photos/{nickname}' => [Module\Profile\Photos\Index::class, [R::GET]],
+
 	'/ping'              => [Module\Notifications\Ping::class, [R::GET]],
 
 	'/post' => [
diff --git a/view/templates/photo_albums.tpl b/view/templates/photo_albums.tpl
index 86b468e06d..f5a13d714e 100644
--- a/view/templates/photo_albums.tpl
+++ b/view/templates/photo_albums.tpl
@@ -2,14 +2,14 @@
 	<h3>{{$title}}</h3>
 	<ul role="menubar" class="sidebar-photos-albums-ul">
 		<li role="menuitem" class="sidebar-photos-albums-li">
-			<a href="{{$baseurl}}/photos/{{$nick}}" class="sidebar-photos-albums-element" title="{{$title}}">{{$recent}}</a>
+			<a href="profile/{{$nick}}/photos" class="sidebar-photos-albums-element" title="{{$title}}">{{$recent}}</a>
 		</li>
 
 		{{if $albums}}
 		{{foreach $albums as $al}}
 		{{if $al.text}}
 		<li role="menuitem" class="sidebar-photos-albums-li">
-			<a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}" class="sidebar-photos-albums-element">
+			<a href="photos/{{$nick}}/album/{{$al.bin2hex}}" class="sidebar-photos-albums-element">
 				<span class="badge pull-right">{{$al.total}}</span>{{$al.text}}
 			</a>
 		</li>
diff --git a/view/templates/photos_upload.tpl b/view/templates/photos_upload.tpl
index 5c5727bccb..637681ca54 100644
--- a/view/templates/photos_upload.tpl
+++ b/view/templates/photos_upload.tpl
@@ -3,7 +3,7 @@
 
 <div id="photos-usage-message">{{$usage}}</div>
 
-<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
+<form action="profile/{{$nickname}}/photos" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
 	<div id="photos-upload-new-wrapper">
 		<div id="photos-upload-newalbum-div">
 			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum">{{$newalbum}}</label>
@@ -47,4 +47,3 @@
 
 	<div class="photos-upload-end"></div>
 </form>
-
diff --git a/view/theme/frio/templates/photo_albums.tpl b/view/theme/frio/templates/photo_albums.tpl
index d19ab0638b..3ccfedb438 100644
--- a/view/theme/frio/templates/photo_albums.tpl
+++ b/view/theme/frio/templates/photo_albums.tpl
@@ -2,7 +2,7 @@
 	<div class="pull-left">
 		<h3>{{$title}}</h3>
 	</div>
-	
+
 	<div class="pull-right">
 	{{if $can_post}}
 		<div class="photos-upload-link">
@@ -15,14 +15,14 @@
 
 	<ul role="menubar" class="sidebar-photos-albums-ul clear">
 		<li role="menuitem" class="sidebar-photos-albums-li">
-			<a href="{{$baseurl}}/photos/{{$nick}}" class="sidebar-photos-albums-element" title="{{$title}}">{{$recent}}</a>
+			<a href="profile/{{$nick}}/photos" class="sidebar-photos-albums-element" title="{{$title}}">{{$recent}}</a>
 		</li>
 
 		{{if $albums}}
 		{{foreach $albums as $al}}
 			{{if $al.text}}
 			<li role="menuitem" class="sidebar-photos-albums-li">
-				<a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}" class="sidebar-photos-albums-element">
+				<a href="photos/{{$nick}}/album/{{$al.bin2hex}}" class="sidebar-photos-albums-element">
 					<span class="badge pull-right">{{$al.total}}</span>{{$al.text}}
 				</a>
 			</li>
diff --git a/view/theme/frio/templates/photos_upload.tpl b/view/theme/frio/templates/photos_upload.tpl
index a93211671b..f6a84373df 100644
--- a/view/theme/frio/templates/photos_upload.tpl
+++ b/view/theme/frio/templates/photos_upload.tpl
@@ -4,7 +4,7 @@
 
 	<div id="photos-usage-message">{{$usage}}</div>
 
-	<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
+	<form action="profile/{{$nickname}}/photos" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
 		<div id="photos-upload-div" class="form-group">
 			<label id="photos-upload-text" for="photos-upload-newalbum">{{$newalbum}}</label>
 
@@ -40,7 +40,7 @@
 			<div class="photos-upload-wrapper">
 				<div id="photos-upload-perms" class="btn-group pull-right">
 					<button class="btn btn-default" data-toggle="modal" data-target="#aclModal" onclick="return false;">
-						<i id="jot-perms-icon" class="fa {{$lockstate}}"></i> 
+						<i id="jot-perms-icon" class="fa {{$lockstate}}"></i>
 					</button>
 
 					{{$default_upload_submit nofilter}}
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 498ef69f24..c504678577 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -236,6 +236,9 @@ function frio_remote_nav(App $a, array &$nav_info)
 			// user menu
 			$nav_info['nav']['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'], DI::l10n()->t('Status'), '', DI::l10n()->t('Your posts and conversations')];
 			$nav_info['nav']['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '/profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')];
+			// Kept for backwards-compatibility reasons, the remote server may not have updated to version 2022.12 yet
+			// @TODO Switch with the new routes by version 2023.12
+			//$nav_info['nav']['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '/photos', DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')];
 			$nav_info['nav']['usermenu'][] = [$server_url . '/photos/' . $remoteUser['nick'], DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')];
 			$nav_info['nav']['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '/media', DI::l10n()->t('Media'), '', DI::l10n()->t('Your postings with media')];
 			$nav_info['nav']['usermenu'][] = [$server_url . '/calendar/', DI::l10n()->t('Calendar'), '', DI::l10n()->t('Your calendar')];

From 187a28abda5a496dda4981df6f525d37870c9c70 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 20 Nov 2022 17:26:08 -0500
Subject: [PATCH 41/45] Update main translation file after moving strings

---
 view/lang/C/messages.po | 381 ++++++++++++++++++++--------------------
 1 file changed, 194 insertions(+), 187 deletions(-)

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index cbd26b59a4..90f89211de 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2022.12-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-19 12:01-0500\n"
+"POT-Creation-Date: 2022-11-20 17:22-0500\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"
@@ -19,13 +19,13 @@ msgstr ""
 
 
 #: mod/fbrowser.php:61 src/Content/Nav.php:195 src/Module/BaseProfile.php:64
-#: view/theme/frio/theme.php:239
+#: view/theme/frio/theme.php:242
 msgid "Photos"
 msgstr ""
 
-#: mod/fbrowser.php:119 mod/fbrowser.php:146 mod/photos.php:999
-#: mod/photos.php:1100 src/Content/Conversation.php:389
-#: src/Module/Contact/Follow.php:171 src/Module/Contact/Revoke.php:109
+#: mod/fbrowser.php:119 mod/fbrowser.php:146 mod/photos.php:997
+#: mod/photos.php:1098 src/Content/Conversation.php:389
+#: src/Module/Contact/Follow.php:173 src/Module/Contact/Revoke.php:109
 #: src/Module/Contact/Unfollow.php:126 src/Module/Post/Edit.php:164
 #: src/Module/Post/Tag/Remove.php:109 src/Module/Profile/RemoteFollow.php:134
 #: src/Module/Security/TwoFactor/SignOut.php:125
@@ -46,13 +46,13 @@ msgid "Unable to locate original post."
 msgstr ""
 
 #: mod/item.php:181 mod/item.php:186 mod/item.php:870 mod/message.php:69
-#: mod/message.php:114 mod/notes.php:44 mod/photos.php:159 mod/photos.php:886
+#: mod/message.php:114 mod/notes.php:44 mod/photos.php:159 mod/photos.php:884
 #: src/Module/Attach.php:56 src/Module/BaseApi.php:94
 #: src/Module/BaseNotifications.php:98 src/Module/BaseSettings.php:52
 #: src/Module/Calendar/Event/API.php:88 src/Module/Calendar/Event/Form.php:84
 #: src/Module/Calendar/Event/Show.php:54 src/Module/Calendar/Export.php:62
 #: src/Module/Calendar/Show.php:64 src/Module/Contact/Advanced.php:60
-#: src/Module/Contact/Follow.php:86 src/Module/Contact/Follow.php:158
+#: src/Module/Contact/Follow.php:86 src/Module/Contact/Follow.php:160
 #: src/Module/Contact/MatchInterests.php:86
 #: src/Module/Contact/Suggestions.php:54 src/Module/Contact/Unfollow.php:66
 #: src/Module/Contact/Unfollow.php:80 src/Module/Contact/Unfollow.php:112
@@ -244,7 +244,7 @@ msgstr ""
 msgid "Your password has been changed at %s"
 msgstr ""
 
-#: mod/message.php:46 mod/message.php:129 src/Content/Nav.php:289
+#: mod/message.php:46 mod/message.php:129 src/Content/Nav.php:285
 msgid "New Message"
 msgstr ""
 
@@ -270,7 +270,7 @@ msgstr ""
 msgid "Discard"
 msgstr ""
 
-#: mod/message.php:136 src/Content/Nav.php:286 view/theme/frio/theme.php:246
+#: mod/message.php:136 src/Content/Nav.php:282 view/theme/frio/theme.php:249
 msgid "Messages"
 msgstr ""
 
@@ -316,16 +316,16 @@ msgstr ""
 msgid "Insert web link"
 msgstr ""
 
-#: mod/message.php:203 mod/message.php:360 mod/photos.php:1486
+#: mod/message.php:203 mod/message.php:360 mod/photos.php:1484
 #: src/Content/Conversation.php:371 src/Content/Conversation.php:717
 #: src/Module/Item/Compose.php:204 src/Module/Post/Edit.php:142
 #: src/Module/Profile/UnkMail.php:155 src/Object/Post.php:537
 msgid "Please wait"
 msgstr ""
 
-#: mod/message.php:204 mod/message.php:359 mod/photos.php:916
-#: mod/photos.php:1020 mod/photos.php:1292 mod/photos.php:1333
-#: mod/photos.php:1389 mod/photos.php:1463
+#: mod/message.php:204 mod/message.php:359 mod/photos.php:914
+#: mod/photos.php:1018 mod/photos.php:1290 mod/photos.php:1331
+#: mod/photos.php:1387 mod/photos.php:1461
 #: src/Module/Calendar/Event/Form.php:250 src/Module/Contact/Advanced.php:132
 #: src/Module/Contact/Profile.php:328
 #: src/Module/Debug/ActivityPubConversion.php:140
@@ -408,12 +408,13 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: mod/photos.php:68 mod/photos.php:139 mod/photos.php:793
+#: mod/photos.php:68 mod/photos.php:139 mod/photos.php:791
 #: src/Model/Event.php:514 src/Model/Profile.php:234
 #: src/Module/Calendar/Export.php:67 src/Module/Feed.php:72
 #: src/Module/HCard.php:51 src/Module/Profile/Common.php:40
 #: src/Module/Profile/Common.php:51 src/Module/Profile/Contacts.php:39
 #: src/Module/Profile/Contacts.php:49 src/Module/Profile/Media.php:38
+#: src/Module/Profile/Photos/Index.php:77
 #: src/Module/Profile/Photos/Upload.php:87
 #: src/Module/Profile/RemoteFollow.php:71 src/Module/Profile/Status.php:58
 #: src/Module/Register.php:267
@@ -421,18 +422,23 @@ msgid "User not found."
 msgstr ""
 
 #: mod/photos.php:107 src/Module/BaseProfile.php:67
+#: src/Module/Profile/Photos/Index.php:169
 msgid "Photo Albums"
 msgstr ""
 
-#: mod/photos.php:108 mod/photos.php:1581
+#: mod/photos.php:108 src/Module/Profile/Photos/Index.php:170
+#: src/Module/Profile/Photos/Index.php:187
 msgid "Recent Photos"
 msgstr ""
 
-#: mod/photos.php:110 mod/photos.php:1068 mod/photos.php:1583
+#: mod/photos.php:110 mod/photos.php:1066
+#: src/Module/Profile/Photos/Index.php:172
+#: src/Module/Profile/Photos/Index.php:189
 msgid "Upload New Photos"
 msgstr ""
 
 #: mod/photos.php:128 src/Module/BaseSettings.php:74
+#: src/Module/Profile/Photos/Index.php:153
 msgid "everybody"
 msgstr ""
 
@@ -456,217 +462,218 @@ msgstr ""
 msgid "Failed to delete the photo."
 msgstr ""
 
-#: mod/photos.php:552
+#: mod/photos.php:551
 msgid "a photo"
 msgstr ""
 
-#: mod/photos.php:552
+#: mod/photos.php:551
 #, php-format
 msgid "%1$s was tagged in %2$s by %3$s"
 msgstr ""
 
-#: mod/photos.php:631 mod/photos.php:634 mod/photos.php:661
+#: mod/photos.php:630 mod/photos.php:633 mod/photos.php:660
 #: src/Module/Profile/Photos/Upload.php:213
 #: src/Module/Settings/Profile/Photo/Index.php:59
 #, php-format
 msgid "Image exceeds size limit of %s"
 msgstr ""
 
-#: mod/photos.php:637
+#: mod/photos.php:636
 msgid "Image upload didn't complete, please try again"
 msgstr ""
 
-#: mod/photos.php:640
+#: mod/photos.php:639
 msgid "Image file is missing"
 msgstr ""
 
-#: mod/photos.php:645
+#: mod/photos.php:644
 msgid ""
 "Server can't accept new file upload at this time, please contact your "
 "administrator"
 msgstr ""
 
-#: mod/photos.php:669
+#: mod/photos.php:668
 msgid "Image file is empty."
 msgstr ""
 
-#: mod/photos.php:684 src/Module/Profile/Photos/Upload.php:179
+#: mod/photos.php:683 src/Module/Profile/Photos/Upload.php:179
 #: src/Module/Profile/Photos/Upload.php:180
 #: src/Module/Settings/Profile/Photo/Index.php:68
 msgid "Unable to process image."
 msgstr ""
 
-#: mod/photos.php:710 src/Module/Profile/Photos/Upload.php:231
+#: mod/photos.php:709 src/Module/Profile/Photos/Upload.php:231
 #: src/Module/Settings/Profile/Photo/Index.php:95
 msgid "Image upload failed."
 msgstr ""
 
-#: mod/photos.php:797 src/Module/Conversation/Community.php:187
-#: src/Module/Directory.php:48 src/Module/Search/Index.php:64
+#: mod/photos.php:795 src/Module/Conversation/Community.php:187
+#: src/Module/Directory.php:48 src/Module/Profile/Photos/Index.php:72
+#: src/Module/Search/Index.php:64
 msgid "Public access denied."
 msgstr ""
 
-#: mod/photos.php:802
+#: mod/photos.php:800
 msgid "No photos selected"
 msgstr ""
 
-#: mod/photos.php:871
+#: mod/photos.php:869 src/Module/Profile/Photos/Index.php:92
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: mod/photos.php:926
+#: mod/photos.php:924
 msgid "Upload Photos"
 msgstr ""
 
-#: mod/photos.php:930 mod/photos.php:1016
+#: mod/photos.php:928 mod/photos.php:1014
 msgid "New album name: "
 msgstr ""
 
-#: mod/photos.php:931
+#: mod/photos.php:929
 msgid "or select existing album:"
 msgstr ""
 
-#: mod/photos.php:932
+#: mod/photos.php:930
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: mod/photos.php:934 mod/photos.php:1288 src/Content/Conversation.php:373
+#: mod/photos.php:932 mod/photos.php:1286 src/Content/Conversation.php:373
 #: src/Module/Calendar/Event/Form.php:253 src/Module/Post/Edit.php:179
 msgid "Permissions"
 msgstr ""
 
-#: mod/photos.php:997
+#: mod/photos.php:995
 msgid "Do you really want to delete this photo album and all its photos?"
 msgstr ""
 
-#: mod/photos.php:998 mod/photos.php:1021
+#: mod/photos.php:996 mod/photos.php:1019
 msgid "Delete Album"
 msgstr ""
 
-#: mod/photos.php:1025
+#: mod/photos.php:1023
 msgid "Edit Album"
 msgstr ""
 
-#: mod/photos.php:1026
+#: mod/photos.php:1024
 msgid "Drop Album"
 msgstr ""
 
-#: mod/photos.php:1030
+#: mod/photos.php:1028
 msgid "Show Newest First"
 msgstr ""
 
-#: mod/photos.php:1032
+#: mod/photos.php:1030
 msgid "Show Oldest First"
 msgstr ""
 
-#: mod/photos.php:1053 mod/photos.php:1566
+#: mod/photos.php:1051 src/Module/Profile/Photos/Index.php:140
 msgid "View Photo"
 msgstr ""
 
-#: mod/photos.php:1086
+#: mod/photos.php:1084
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: mod/photos.php:1088
+#: mod/photos.php:1086
 msgid "Photo not available"
 msgstr ""
 
-#: mod/photos.php:1098
+#: mod/photos.php:1096
 msgid "Do you really want to delete this photo?"
 msgstr ""
 
-#: mod/photos.php:1099 mod/photos.php:1293
+#: mod/photos.php:1097 mod/photos.php:1291
 msgid "Delete Photo"
 msgstr ""
 
-#: mod/photos.php:1191
+#: mod/photos.php:1189
 msgid "View photo"
 msgstr ""
 
-#: mod/photos.php:1193
+#: mod/photos.php:1191
 msgid "Edit photo"
 msgstr ""
 
-#: mod/photos.php:1194
+#: mod/photos.php:1192
 msgid "Delete photo"
 msgstr ""
 
-#: mod/photos.php:1195
+#: mod/photos.php:1193
 msgid "Use as profile photo"
 msgstr ""
 
-#: mod/photos.php:1202
+#: mod/photos.php:1200
 msgid "Private Photo"
 msgstr ""
 
-#: mod/photos.php:1208
+#: mod/photos.php:1206
 msgid "View Full Size"
 msgstr ""
 
-#: mod/photos.php:1261
+#: mod/photos.php:1259
 msgid "Tags: "
 msgstr ""
 
-#: mod/photos.php:1264
+#: mod/photos.php:1262
 msgid "[Select tags to remove]"
 msgstr ""
 
-#: mod/photos.php:1279
+#: mod/photos.php:1277
 msgid "New album name"
 msgstr ""
 
-#: mod/photos.php:1280
+#: mod/photos.php:1278
 msgid "Caption"
 msgstr ""
 
-#: mod/photos.php:1281
+#: mod/photos.php:1279
 msgid "Add a Tag"
 msgstr ""
 
-#: mod/photos.php:1281
+#: mod/photos.php:1279
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: mod/photos.php:1282
+#: mod/photos.php:1280
 msgid "Do not rotate"
 msgstr ""
 
-#: mod/photos.php:1283
+#: mod/photos.php:1281
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: mod/photos.php:1284
+#: mod/photos.php:1282
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: mod/photos.php:1330 mod/photos.php:1386 mod/photos.php:1460
+#: mod/photos.php:1328 mod/photos.php:1384 mod/photos.php:1458
 #: src/Module/Contact.php:547 src/Module/Item/Compose.php:188
 #: src/Object/Post.php:983
 msgid "This is you"
 msgstr ""
 
-#: mod/photos.php:1332 mod/photos.php:1388 mod/photos.php:1462
+#: mod/photos.php:1330 mod/photos.php:1386 mod/photos.php:1460
 #: src/Object/Post.php:531 src/Object/Post.php:985
 msgid "Comment"
 msgstr ""
 
-#: mod/photos.php:1334 mod/photos.php:1390 mod/photos.php:1464
+#: mod/photos.php:1332 mod/photos.php:1388 mod/photos.php:1462
 #: src/Content/Conversation.php:386 src/Module/Calendar/Event/Form.php:248
 #: src/Module/Item/Compose.php:199 src/Module/Post/Edit.php:162
 #: src/Object/Post.php:997
 msgid "Preview"
 msgstr ""
 
-#: mod/photos.php:1335 src/Content/Conversation.php:341
+#: mod/photos.php:1333 src/Content/Conversation.php:341
 #: src/Module/Post/Edit.php:127 src/Object/Post.php:987
 msgid "Loading..."
 msgstr ""
 
-#: mod/photos.php:1421 src/Content/Conversation.php:633 src/Object/Post.php:255
+#: mod/photos.php:1419 src/Content/Conversation.php:633 src/Object/Post.php:255
 msgid "Select"
 msgstr ""
 
-#: mod/photos.php:1422 src/Content/Conversation.php:634
+#: mod/photos.php:1420 src/Content/Conversation.php:634
 #: src/Module/Moderation/Users/Active.php:136
 #: src/Module/Moderation/Users/Blocked.php:136
 #: src/Module/Moderation/Users/Index.php:151
@@ -674,30 +681,26 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: mod/photos.php:1483 src/Object/Post.php:378
+#: mod/photos.php:1481 src/Object/Post.php:378
 msgid "Like"
 msgstr ""
 
-#: mod/photos.php:1484 src/Object/Post.php:378
+#: mod/photos.php:1482 src/Object/Post.php:378
 msgid "I like this (toggle)"
 msgstr ""
 
-#: mod/photos.php:1485 src/Object/Post.php:379
+#: mod/photos.php:1483 src/Object/Post.php:379
 msgid "Dislike"
 msgstr ""
 
-#: mod/photos.php:1487 src/Object/Post.php:379
+#: mod/photos.php:1485 src/Object/Post.php:379
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: mod/photos.php:1509
+#: mod/photos.php:1507
 msgid "Map"
 msgstr ""
 
-#: mod/photos.php:1572
-msgid "View Album"
-msgstr ""
-
 #: src/App.php:493
 msgid "No system theme config value set."
 msgstr ""
@@ -706,17 +709,17 @@ msgstr ""
 msgid "Apologies but the website is unavailable at the moment."
 msgstr ""
 
-#: src/App/Page.php:282
+#: src/App/Page.php:246
 msgid "Delete this item?"
 msgstr ""
 
-#: src/App/Page.php:283
+#: src/App/Page.php:247
 msgid ""
 "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."
 msgstr ""
 
-#: src/App/Page.php:353
+#: src/App/Page.php:317
 msgid "toggle mobile"
 msgstr ""
 
@@ -1317,7 +1320,7 @@ msgid "Message"
 msgstr ""
 
 #: src/Content/Conversation.php:397 src/Module/Post/Edit.php:178
-#: src/Module/Settings/TwoFactor/Trusted.php:139
+#: src/Module/Settings/TwoFactor/Trusted.php:140
 msgid "Browser"
 msgstr ""
 
@@ -1570,7 +1573,7 @@ msgstr ""
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: src/Content/Item.php:386 view/theme/frio/theme.php:267
+#: src/Content/Item.php:386 view/theme/frio/theme.php:270
 msgid "Follow Thread"
 msgstr ""
 
@@ -1624,7 +1627,7 @@ msgstr ""
 
 #: src/Content/Item.php:403 src/Content/Widget.php:80
 #: src/Model/Contact.php:1192 src/Model/Contact.php:1203
-#: src/Module/Contact/Follow.php:165 view/theme/vier/theme.php:198
+#: src/Module/Contact/Follow.php:167 view/theme/vier/theme.php:198
 msgid "Connect/Follow"
 msgstr ""
 
@@ -1667,7 +1670,7 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: src/Content/Nav.php:193 src/Content/Nav.php:276
+#: src/Content/Nav.php:193 src/Content/Nav.php:272
 #: view/theme/frio/theme.php:237
 msgid "Your posts and conversations"
 msgstr ""
@@ -1683,29 +1686,29 @@ msgstr ""
 msgid "Your profile page"
 msgstr ""
 
-#: src/Content/Nav.php:195 view/theme/frio/theme.php:239
+#: src/Content/Nav.php:195 view/theme/frio/theme.php:242
 msgid "Your photos"
 msgstr ""
 
 #: src/Content/Nav.php:196 src/Module/BaseProfile.php:72
 #: src/Module/BaseProfile.php:75 src/Module/Contact.php:452
-#: view/theme/frio/theme.php:240
+#: view/theme/frio/theme.php:243
 msgid "Media"
 msgstr ""
 
-#: src/Content/Nav.php:196 view/theme/frio/theme.php:240
+#: src/Content/Nav.php:196 view/theme/frio/theme.php:243
 msgid "Your postings with media"
 msgstr ""
 
-#: src/Content/Nav.php:197 src/Content/Nav.php:261
+#: src/Content/Nav.php:197 src/Content/Nav.php:257
 #: src/Module/BaseProfile.php:84 src/Module/BaseProfile.php:87
 #: src/Module/BaseProfile.php:95 src/Module/BaseProfile.php:98
-#: src/Module/Settings/Display.php:205 view/theme/frio/theme.php:241
-#: view/theme/frio/theme.php:245
+#: src/Module/Settings/Display.php:205 view/theme/frio/theme.php:244
+#: view/theme/frio/theme.php:248
 msgid "Calendar"
 msgstr ""
 
-#: src/Content/Nav.php:197 view/theme/frio/theme.php:241
+#: src/Content/Nav.php:197 view/theme/frio/theme.php:244
 msgid "Your calendar"
 msgstr ""
 
@@ -1717,7 +1720,7 @@ msgstr ""
 msgid "Your personal notes"
 msgstr ""
 
-#: src/Content/Nav.php:215 src/Content/Nav.php:276
+#: src/Content/Nav.php:215 src/Content/Nav.php:272
 msgid "Home"
 msgstr ""
 
@@ -1735,10 +1738,10 @@ msgid "Create an account"
 msgstr ""
 
 #: src/Content/Nav.php:225 src/Module/Help.php:67
-#: src/Module/Settings/TwoFactor/AppSpecific.php:128
+#: src/Module/Settings/TwoFactor/AppSpecific.php:129
 #: src/Module/Settings/TwoFactor/Index.php:118
-#: src/Module/Settings/TwoFactor/Recovery.php:106
-#: src/Module/Settings/TwoFactor/Verify.php:145 view/theme/vier/theme.php:243
+#: src/Module/Settings/TwoFactor/Recovery.php:107
+#: src/Module/Settings/TwoFactor/Verify.php:146 view/theme/vier/theme.php:243
 msgid "Help"
 msgstr ""
 
@@ -1772,124 +1775,124 @@ msgstr ""
 msgid "Tags"
 msgstr ""
 
-#: src/Content/Nav.php:238 src/Content/Nav.php:297
+#: src/Content/Nav.php:238 src/Content/Nav.php:293
 #: src/Content/Text/HTML.php:899 src/Module/BaseProfile.php:125
 #: src/Module/BaseProfile.php:128 src/Module/Contact.php:373
-#: src/Module/Contact.php:467 view/theme/frio/theme.php:248
+#: src/Module/Contact.php:467 view/theme/frio/theme.php:251
 msgid "Contacts"
 msgstr ""
 
-#: src/Content/Nav.php:257
+#: src/Content/Nav.php:253
 msgid "Community"
 msgstr ""
 
-#: src/Content/Nav.php:257
+#: src/Content/Nav.php:253
 msgid "Conversations on this and other servers"
 msgstr ""
 
-#: src/Content/Nav.php:264
+#: src/Content/Nav.php:260
 msgid "Directory"
 msgstr ""
 
-#: src/Content/Nav.php:264
+#: src/Content/Nav.php:260
 msgid "People directory"
 msgstr ""
 
-#: src/Content/Nav.php:266 src/Module/BaseAdmin.php:85
+#: src/Content/Nav.php:262 src/Module/BaseAdmin.php:85
 #: src/Module/BaseModeration.php:108
 msgid "Information"
 msgstr ""
 
-#: src/Content/Nav.php:266
+#: src/Content/Nav.php:262
 msgid "Information about this friendica instance"
 msgstr ""
 
-#: src/Content/Nav.php:269 src/Module/Admin/Tos.php:76
+#: src/Content/Nav.php:265 src/Module/Admin/Tos.php:76
 #: src/Module/BaseAdmin.php:95 src/Module/Register.php:176
 #: src/Module/Tos.php:87
 msgid "Terms of Service"
 msgstr ""
 
-#: src/Content/Nav.php:269
+#: src/Content/Nav.php:265
 msgid "Terms of Service of this Friendica instance"
 msgstr ""
 
-#: src/Content/Nav.php:274 view/theme/frio/theme.php:244
+#: src/Content/Nav.php:270 view/theme/frio/theme.php:247
 msgid "Network"
 msgstr ""
 
-#: src/Content/Nav.php:274 view/theme/frio/theme.php:244
+#: src/Content/Nav.php:270 view/theme/frio/theme.php:247
 msgid "Conversations from your friends"
 msgstr ""
 
-#: src/Content/Nav.php:280
+#: src/Content/Nav.php:276
 msgid "Introductions"
 msgstr ""
 
-#: src/Content/Nav.php:280
+#: src/Content/Nav.php:276
 msgid "Friend Requests"
 msgstr ""
 
-#: src/Content/Nav.php:281 src/Module/BaseNotifications.php:149
+#: src/Content/Nav.php:277 src/Module/BaseNotifications.php:149
 #: src/Module/Notifications/Introductions.php:75
 msgid "Notifications"
 msgstr ""
 
-#: src/Content/Nav.php:282
+#: src/Content/Nav.php:278
 msgid "See all notifications"
 msgstr ""
 
-#: src/Content/Nav.php:283 src/Module/Settings/Connectors.php:242
+#: src/Content/Nav.php:279 src/Module/Settings/Connectors.php:242
 msgid "Mark as seen"
 msgstr ""
 
-#: src/Content/Nav.php:283
+#: src/Content/Nav.php:279
 msgid "Mark all system notifications as seen"
 msgstr ""
 
-#: src/Content/Nav.php:286 view/theme/frio/theme.php:246
+#: src/Content/Nav.php:282 view/theme/frio/theme.php:249
 msgid "Private mail"
 msgstr ""
 
-#: src/Content/Nav.php:287
+#: src/Content/Nav.php:283
 msgid "Inbox"
 msgstr ""
 
-#: src/Content/Nav.php:288
+#: src/Content/Nav.php:284
 msgid "Outbox"
 msgstr ""
 
-#: src/Content/Nav.php:292
+#: src/Content/Nav.php:288
 msgid "Accounts"
 msgstr ""
 
-#: src/Content/Nav.php:292
+#: src/Content/Nav.php:288
 msgid "Manage other pages"
 msgstr ""
 
-#: src/Content/Nav.php:295 src/Module/Admin/Addons/Details.php:114
+#: src/Content/Nav.php:291 src/Module/Admin/Addons/Details.php:114
 #: src/Module/Admin/Themes/Details.php:93 src/Module/BaseSettings.php:170
-#: src/Module/Welcome.php:52 view/theme/frio/theme.php:247
+#: src/Module/Welcome.php:52 view/theme/frio/theme.php:250
 msgid "Settings"
 msgstr ""
 
-#: src/Content/Nav.php:295 view/theme/frio/theme.php:247
+#: src/Content/Nav.php:291 view/theme/frio/theme.php:250
 msgid "Account settings"
 msgstr ""
 
-#: src/Content/Nav.php:297 view/theme/frio/theme.php:248
+#: src/Content/Nav.php:293 view/theme/frio/theme.php:251
 msgid "Manage/edit friends and contacts"
 msgstr ""
 
-#: src/Content/Nav.php:302 src/Module/BaseAdmin.php:119
+#: src/Content/Nav.php:298 src/Module/BaseAdmin.php:119
 msgid "Admin"
 msgstr ""
 
-#: src/Content/Nav.php:302
+#: src/Content/Nav.php:298
 msgid "Site setup and configuration"
 msgstr ""
 
-#: src/Content/Nav.php:303 src/Module/BaseModeration.php:127
+#: src/Content/Nav.php:299 src/Module/BaseModeration.php:127
 #: src/Module/Moderation/Blocklist/Contact.php:110
 #: src/Module/Moderation/Blocklist/Server/Add.php:119
 #: src/Module/Moderation/Blocklist/Server/Import.php:115
@@ -1903,15 +1906,15 @@ msgstr ""
 msgid "Moderation"
 msgstr ""
 
-#: src/Content/Nav.php:303
+#: src/Content/Nav.php:299
 msgid "Content and user moderation"
 msgstr ""
 
-#: src/Content/Nav.php:306
+#: src/Content/Nav.php:302
 msgid "Navigation"
 msgstr ""
 
-#: src/Content/Nav.php:306
+#: src/Content/Nav.php:302
 msgid "Site map"
 msgstr ""
 
@@ -5398,7 +5401,7 @@ msgid "Profile Details"
 msgstr ""
 
 #: src/Module/BaseProfile.php:59 src/Module/Contact.php:447
-#: src/Module/Contact/Follow.php:190 src/Module/Contact/Unfollow.php:138
+#: src/Module/Contact/Follow.php:192 src/Module/Contact/Unfollow.php:138
 msgid "Status Messages and Posts"
 msgstr ""
 
@@ -5521,7 +5524,7 @@ msgstr ""
 #: src/Module/Moderation/Item/Delete.php:67 src/Module/Register.php:148
 #: src/Module/Security/TwoFactor/Verify.php:101
 #: src/Module/Settings/TwoFactor/Index.php:140
-#: src/Module/Settings/TwoFactor/Verify.php:154
+#: src/Module/Settings/TwoFactor/Verify.php:155
 msgid "Required"
 msgstr ""
 
@@ -5834,36 +5837,36 @@ msgstr[1] ""
 msgid "Access denied."
 msgstr ""
 
-#: src/Module/Contact/Follow.php:102 src/Module/Contact/Unfollow.php:125
+#: src/Module/Contact/Follow.php:104 src/Module/Contact/Unfollow.php:125
 #: src/Module/Profile/RemoteFollow.php:133
 msgid "Submit Request"
 msgstr ""
 
-#: src/Module/Contact/Follow.php:113
+#: src/Module/Contact/Follow.php:115
 msgid "You already added this contact."
 msgstr ""
 
-#: src/Module/Contact/Follow.php:128
+#: src/Module/Contact/Follow.php:130
 msgid "The network type couldn't be detected. Contact can't be added."
 msgstr ""
 
-#: src/Module/Contact/Follow.php:136
+#: src/Module/Contact/Follow.php:138
 msgid "Diaspora support isn't enabled. Contact can't be added."
 msgstr ""
 
-#: src/Module/Contact/Follow.php:141
+#: src/Module/Contact/Follow.php:143
 msgid "OStatus support is disabled. Contact can't be added."
 msgstr ""
 
-#: src/Module/Contact/Follow.php:166 src/Module/Profile/RemoteFollow.php:132
+#: src/Module/Contact/Follow.php:168 src/Module/Profile/RemoteFollow.php:132
 msgid "Please answer the following:"
 msgstr ""
 
-#: src/Module/Contact/Follow.php:167 src/Module/Contact/Unfollow.php:123
+#: src/Module/Contact/Follow.php:169 src/Module/Contact/Unfollow.php:123
 msgid "Your Identity Address:"
 msgstr ""
 
-#: src/Module/Contact/Follow.php:168 src/Module/Contact/Profile.php:366
+#: src/Module/Contact/Follow.php:170 src/Module/Contact/Profile.php:366
 #: src/Module/Contact/Unfollow.php:129
 #: src/Module/Moderation/Blocklist/Contact.php:133
 #: src/Module/Notifications/Introductions.php:129
@@ -5871,22 +5874,22 @@ msgstr ""
 msgid "Profile URL"
 msgstr ""
 
-#: src/Module/Contact/Follow.php:169 src/Module/Contact/Profile.php:378
+#: src/Module/Contact/Follow.php:171 src/Module/Contact/Profile.php:378
 #: src/Module/Notifications/Introductions.php:191
 #: src/Module/Profile/Profile.php:206
 msgid "Tags:"
 msgstr ""
 
-#: src/Module/Contact/Follow.php:180
+#: src/Module/Contact/Follow.php:182
 #, php-format
 msgid "%s knows you"
 msgstr ""
 
-#: src/Module/Contact/Follow.php:181
+#: src/Module/Contact/Follow.php:183
 msgid "Add a personal note:"
 msgstr ""
 
-#: src/Module/Contact/Follow.php:219
+#: src/Module/Contact/Follow.php:221
 msgid "The contact could not be added."
 msgstr ""
 
@@ -6163,7 +6166,7 @@ msgstr ""
 #: src/Module/Contact/Revoke.php:108
 #: src/Module/Notifications/Introductions.php:144
 #: src/Module/OAuth/Acknowledge.php:53 src/Module/Register.php:130
-#: src/Module/Settings/TwoFactor/Trusted.php:125
+#: src/Module/Settings/TwoFactor/Trusted.php:126
 msgid "Yes"
 msgstr ""
 
@@ -7862,7 +7865,7 @@ msgstr ""
 
 #: src/Module/Notifications/Introductions.php:144
 #: src/Module/OAuth/Acknowledge.php:54 src/Module/Register.php:131
-#: src/Module/Settings/TwoFactor/Trusted.php:125
+#: src/Module/Settings/TwoFactor/Trusted.php:126
 msgid "No"
 msgstr ""
 
@@ -8131,7 +8134,7 @@ msgid "Select a tag to remove: "
 msgstr ""
 
 #: src/Module/Post/Tag/Remove.php:108 src/Module/Settings/Delegation.php:178
-#: src/Module/Settings/TwoFactor/Trusted.php:143
+#: src/Module/Settings/TwoFactor/Trusted.php:144
 msgid "Remove"
 msgstr ""
 
@@ -8156,6 +8159,10 @@ msgstr ""
 msgid "No contacts."
 msgstr ""
 
+#: src/Module/Profile/Photos/Index.php:146
+msgid "View Album"
+msgstr ""
+
 #: src/Module/Profile/Profile.php:81
 msgid "Profile not found."
 msgstr ""
@@ -8636,7 +8643,7 @@ msgstr ""
 
 #: src/Module/Security/TwoFactor/Recovery.php:80
 #: src/Module/Security/TwoFactor/Verify.php:77
-#: src/Module/Settings/TwoFactor/Verify.php:94
+#: src/Module/Settings/TwoFactor/Verify.php:95
 msgid "Invalid code, please retry."
 msgstr ""
 
@@ -8722,7 +8729,7 @@ msgid ""
 msgstr ""
 
 #: src/Module/Security/TwoFactor/Verify.php:101
-#: src/Module/Settings/TwoFactor/Verify.php:154
+#: src/Module/Settings/TwoFactor/Verify.php:155
 msgid "Please enter a code from your authentication app"
 msgstr ""
 
@@ -9868,82 +9875,82 @@ msgstr ""
 msgid "Please enter your password for verification:"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/AppSpecific.php:65
-#: src/Module/Settings/TwoFactor/Recovery.php:63
-#: src/Module/Settings/TwoFactor/Trusted.php:66
-#: src/Module/Settings/TwoFactor/Verify.php:68
+#: src/Module/Settings/TwoFactor/AppSpecific.php:66
+#: src/Module/Settings/TwoFactor/Recovery.php:64
+#: src/Module/Settings/TwoFactor/Trusted.php:67
+#: src/Module/Settings/TwoFactor/Verify.php:69
 msgid "Please enter your password to access this page."
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/AppSpecific.php:83
+#: src/Module/Settings/TwoFactor/AppSpecific.php:84
 msgid "App-specific password generation failed: The description is empty."
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/AppSpecific.php:86
+#: src/Module/Settings/TwoFactor/AppSpecific.php:87
 msgid ""
 "App-specific password generation failed: This description already exists."
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/AppSpecific.php:90
+#: src/Module/Settings/TwoFactor/AppSpecific.php:91
 msgid "New app-specific password generated."
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/AppSpecific.php:96
+#: src/Module/Settings/TwoFactor/AppSpecific.php:97
 msgid "App-specific passwords successfully revoked."
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/AppSpecific.php:106
+#: src/Module/Settings/TwoFactor/AppSpecific.php:107
 msgid "App-specific password successfully revoked."
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/AppSpecific.php:127
+#: src/Module/Settings/TwoFactor/AppSpecific.php:128
 msgid "Two-factor app-specific passwords"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/AppSpecific.php:129
+#: src/Module/Settings/TwoFactor/AppSpecific.php:130
 msgid ""
 "<p>App-specific passwords are randomly generated passwords used instead your "
 "regular password to authenticate your account on third-party applications "
 "that don't support two-factor authentication.</p>"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/AppSpecific.php:130
+#: src/Module/Settings/TwoFactor/AppSpecific.php:131
 msgid ""
 "Make sure to copy your new app-specific password now. You won’t be able to "
 "see it again!"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/AppSpecific.php:133
+#: src/Module/Settings/TwoFactor/AppSpecific.php:134
 msgid "Description"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/AppSpecific.php:134
+#: src/Module/Settings/TwoFactor/AppSpecific.php:135
 msgid "Last Used"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/AppSpecific.php:135
+#: src/Module/Settings/TwoFactor/AppSpecific.php:136
 msgid "Revoke"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/AppSpecific.php:136
+#: src/Module/Settings/TwoFactor/AppSpecific.php:137
 msgid "Revoke All"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/AppSpecific.php:139
+#: src/Module/Settings/TwoFactor/AppSpecific.php:140
 msgid ""
 "When you generate a new app-specific password, you must use it right away, "
 "it will be shown to you once after you generate it."
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/AppSpecific.php:140
+#: src/Module/Settings/TwoFactor/AppSpecific.php:141
 msgid "Generate new app-specific password"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/AppSpecific.php:141
+#: src/Module/Settings/TwoFactor/AppSpecific.php:142
 msgid "Friendiqa on my Fairphone 2..."
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/AppSpecific.php:142
+#: src/Module/Settings/TwoFactor/AppSpecific.php:143
 msgid "Generate"
 msgstr ""
 
@@ -10039,15 +10046,15 @@ msgstr ""
 msgid "Finish app configuration"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Recovery.php:79
+#: src/Module/Settings/TwoFactor/Recovery.php:80
 msgid "New recovery codes successfully generated."
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Recovery.php:105
+#: src/Module/Settings/TwoFactor/Recovery.php:106
 msgid "Two-factor recovery codes"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Recovery.php:107
+#: src/Module/Settings/TwoFactor/Recovery.php:108
 msgid ""
 "<p>Recovery codes can be used to access your account in the event you lose "
 "access to your device and cannot receive two-factor authentication codes.</"
@@ -10055,68 +10062,68 @@ msgid ""
 "don’t have the recovery codes you will lose access to your account.</p>"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Recovery.php:109
+#: src/Module/Settings/TwoFactor/Recovery.php:110
 msgid ""
 "When you generate new recovery codes, you must copy the new codes. Your old "
 "codes won’t work anymore."
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Recovery.php:110
+#: src/Module/Settings/TwoFactor/Recovery.php:111
 msgid "Generate new recovery codes"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Recovery.php:112
+#: src/Module/Settings/TwoFactor/Recovery.php:113
 msgid "Next: Verification"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Trusted.php:83
+#: src/Module/Settings/TwoFactor/Trusted.php:84
 msgid "Trusted browsers successfully removed."
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Trusted.php:93
+#: src/Module/Settings/TwoFactor/Trusted.php:94
 msgid "Trusted browser successfully removed."
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Trusted.php:135
+#: src/Module/Settings/TwoFactor/Trusted.php:136
 msgid "Two-factor Trusted Browsers"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Trusted.php:136
+#: src/Module/Settings/TwoFactor/Trusted.php:137
 msgid ""
 "Trusted browsers are individual browsers you chose to skip two-factor "
 "authentication to access Friendica. Please use this feature sparingly, as it "
 "can negate the benefit of two-factor authentication."
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Trusted.php:137
+#: src/Module/Settings/TwoFactor/Trusted.php:138
 msgid "Device"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Trusted.php:138
+#: src/Module/Settings/TwoFactor/Trusted.php:139
 msgid "OS"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Trusted.php:140
+#: src/Module/Settings/TwoFactor/Trusted.php:141
 msgid "Trusted"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Trusted.php:141
+#: src/Module/Settings/TwoFactor/Trusted.php:142
 msgid "Created At"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Trusted.php:142
+#: src/Module/Settings/TwoFactor/Trusted.php:143
 msgid "Last Use"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Trusted.php:144
+#: src/Module/Settings/TwoFactor/Trusted.php:145
 msgid "Remove All"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Verify.php:90
+#: src/Module/Settings/TwoFactor/Verify.php:91
 msgid "Two-factor authentication successfully activated."
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Verify.php:124
+#: src/Module/Settings/TwoFactor/Verify.php:125
 #, php-format
 msgid ""
 "<p>Or you can submit the authentication settings manually:</p>\n"
@@ -10136,24 +10143,24 @@ msgid ""
 "</dl>"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Verify.php:144
+#: src/Module/Settings/TwoFactor/Verify.php:145
 msgid "Two-factor code verification"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Verify.php:146
+#: src/Module/Settings/TwoFactor/Verify.php:147
 msgid ""
 "<p>Please scan this QR Code with your authenticator app and submit the "
 "provided code.</p>"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Verify.php:148
+#: src/Module/Settings/TwoFactor/Verify.php:149
 #, php-format
 msgid ""
 "<p>Or you can open the following URL in your mobile device:</p><p><a href="
 "\"%s\">%s</a></p>"
 msgstr ""
 
-#: src/Module/Settings/TwoFactor/Verify.php:155
+#: src/Module/Settings/TwoFactor/Verify.php:156
 msgid "Verify code and enable two-factor authentication"
 msgstr ""
 

From d4cbfeb54cf2a9aad1ad7252e2c330d077bf4788 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 20 Nov 2022 18:14:37 -0500
Subject: [PATCH 42/45] Update doc/Config.md from review suggestion

Co-authored-by: Philipp <admin+Github@philipp.info>
---
 doc/Config.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/Config.md b/doc/Config.md
index a66895ca17..fbc9ff1fd4 100644
--- a/doc/Config.md
+++ b/doc/Config.md
@@ -38,7 +38,7 @@ All of them have to end with `.config.php` and must not include `-sample` in the
 
 Some examples of common known configuration files:
 - `local.config.php` holds the base node custom configuration.
-- Any other file in this folder is meant for addon configuration.
+- Any other file in this folder is meant for additional configuration (e.g. for addons).
 
 Addons can define their own default configuration values in `addon/[addon]/config/[addon].config.php` which is loaded when the addon is activated.
 

From 548fd3201d7da8b790cfe1681472b7fc83216124 Mon Sep 17 00:00:00 2001
From: Hank Grabowski <hankgrabowski@gmail.com>
Date: Mon, 21 Nov 2022 16:38:54 -0500
Subject: [PATCH 43/45] The two endpoints for unfavoriting/liking (and related
 things) was failing because it wasn't using the correct uuid in item.php in
 processing the action.

---
 src/Model/Item.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 7c8804a290..5271dcefaa 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -2693,7 +2693,7 @@ class Item
 		}
 
 		$condition = ['vid' => $vids, 'deleted' => false, 'gravity' => self::GRAVITY_ACTIVITY,
-			'author-id' => $author_id, 'uid' => $item['uid'], 'thr-parent-id' => $uri_id];
+			'author-id' => $author_id, 'uid' => $uid, 'thr-parent-id' => $uri_id];
 		$like_item = Post::selectFirst(['id', 'guid', 'verb'], $condition);
 
 		if (DBA::isResult($like_item)) {

From 733509561ad58583625120c95c273f9bd7b66a31 Mon Sep 17 00:00:00 2001
From: Hank Grabowski <hankgrabowski@gmail.com>
Date: Mon, 21 Nov 2022 23:40:15 -0500
Subject: [PATCH 44/45] Update Notify->iid to itemId for notification endpoint

---
 src/Module/Api/Friendica/Notification/Seen.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Module/Api/Friendica/Notification/Seen.php b/src/Module/Api/Friendica/Notification/Seen.php
index 00015d90bc..756c004a98 100644
--- a/src/Module/Api/Friendica/Notification/Seen.php
+++ b/src/Module/Api/Friendica/Notification/Seen.php
@@ -65,7 +65,7 @@ class Seen extends BaseApi
 			DI::notify()->save($Notify);
 
 			if ($Notify->otype === Notification\ObjectType::ITEM) {
-				$item = Post::selectFirstForUser($uid, [], ['id' => $Notify->iid, 'uid' => $uid]);
+				$item = Post::selectFirstForUser($uid, [], ['id' => $Notify->itemId, 'uid' => $uid]);
 				if (DBA::isResult($item)) {
 					// we found the item, return it to the user
 					$ret  = [DI::twitterStatus()->createFromUriId($item['uri-id'], $item['uid'], $include_entities)->toArray()];

From 3d7e4cb9f406cb1acb16a7040a0d68c705afe2d4 Mon Sep 17 00:00:00 2001
From: MarekBenjamin <117765478+MarekBenjamin@users.noreply.github.com>
Date: Tue, 22 Nov 2022 22:56:29 +0100
Subject: [PATCH 45/45] Update sample-nginx.config

Removed  `ssl on`  in line 54 directive since it is deprecated and already activated with the `listen 443 ssl;`  directive in line 51
---
 mods/sample-nginx.config | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mods/sample-nginx.config b/mods/sample-nginx.config
index b90e1fe29f..63f73e01e4 100644
--- a/mods/sample-nginx.config
+++ b/mods/sample-nginx.config
@@ -51,8 +51,6 @@ server {
   listen 443 ssl;
   server_name friendica.example.net;
 
-  ssl on;
-
   #Traditional SSL
   ssl_certificate /etc/nginx/ssl/friendica.example.net.chain.pem;
   ssl_certificate_key /etc/nginx/ssl/example.net.key;