From: Michael Vogel <icarus@dabo.de>
Date: Sun, 25 Nov 2018 09:46:22 +0000 (+0100)
Subject: Merge pull request #6201 from JonnyTischbein/feature_admin_subsubpages
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ced4911c4ab268c9e502a3c3e1aa43ebda837044;hp=5e577ed1330425ec8da7966e27d24a9ea692e2b8;p=friendica.git

Merge pull request #6201 from JonnyTischbein/feature_admin_subsubpages

admin/site Change html b to strong
---

diff --git a/composer.json b/composer.json
index 339211f6f0..2f12d076d4 100644
--- a/composer.json
+++ b/composer.json
@@ -14,6 +14,8 @@
 	},
 	"require": {
 		"php": ">=5.6.1",
+		"ext-dom": "*",
+		"ext-json": "*",
 		"ext-xml": "*",
 		"asika/simple-console": "^1.0",
 		"divineomega/password_exposed": "^2.4",
diff --git a/composer.lock b/composer.lock
index 16b9e50b52..d0ce1c4e72 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ee7a6d8a1a9df21b46478dd91c1b73b7",
+    "content-hash": "11efc727fd6cae00c1230616e31ad2a2",
     "packages": [
         {
             "name": "asika/simple-console",
@@ -1019,22 +1019,6 @@
             "require": {
                 "npm-asset/ev-emitter": ">=1.0.0,<2.0.0"
             },
-            "require-dev": {
-                "npm-asset/chalk": ">=1.1.1,<2.0.0",
-                "npm-asset/cheerio": ">=0.19.0,<0.20.0",
-                "npm-asset/gulp": ">=3.9.0,<4.0.0",
-                "npm-asset/gulp-jshint": ">=1.11.2,<2.0.0",
-                "npm-asset/gulp-json-lint": ">=0.1.0,<0.2.0",
-                "npm-asset/gulp-rename": ">=1.2.2,<2.0.0",
-                "npm-asset/gulp-replace": ">=0.5.4,<0.6.0",
-                "npm-asset/gulp-requirejs-optimize": "dev-github:metafizzy/gulp-requirejs-optimize",
-                "npm-asset/gulp-uglify": ">=1.4.2,<2.0.0",
-                "npm-asset/gulp-util": ">=3.0.7,<4.0.0",
-                "npm-asset/highlight.js": ">=8.9.1,<9.0.0",
-                "npm-asset/marked": ">=0.3.5,<0.4.0",
-                "npm-asset/minimist": ">=1.2.0,<2.0.0",
-                "npm-asset/transfob": ">=1.0.0,<2.0.0"
-            },
             "type": "npm-asset-library",
             "extra": {
                 "npm-asset-bugs": {
@@ -1080,14 +1064,6 @@
                 "reference": null,
                 "shasum": "2736e332aaee73ccf0a14a5f0066391a0a13f4a3"
             },
-            "require-dev": {
-                "npm-asset/grunt": "~0.4.2",
-                "npm-asset/grunt-contrib-cssmin": "~0.9.0",
-                "npm-asset/grunt-contrib-jshint": "~0.6.3",
-                "npm-asset/grunt-contrib-less": "~0.11.0",
-                "npm-asset/grunt-contrib-uglify": "~0.4.0",
-                "npm-asset/grunt-contrib-watch": "~0.6.1"
-            },
             "type": "npm-asset-library",
             "extra": {
                 "npm-asset-bugs": {
@@ -1121,32 +1097,6 @@
                 "reference": null,
                 "shasum": "2c89d6889b5eac522a7eea32c14521559c6cbf02"
             },
-            "require-dev": {
-                "npm-asset/commitplease": "2.0.0",
-                "npm-asset/core-js": "0.9.17",
-                "npm-asset/grunt": "0.4.5",
-                "npm-asset/grunt-babel": "5.0.1",
-                "npm-asset/grunt-cli": "0.1.13",
-                "npm-asset/grunt-compare-size": "0.4.0",
-                "npm-asset/grunt-contrib-jshint": "0.11.2",
-                "npm-asset/grunt-contrib-uglify": "0.9.2",
-                "npm-asset/grunt-contrib-watch": "0.6.1",
-                "npm-asset/grunt-git-authors": "2.0.1",
-                "npm-asset/grunt-jscs": "2.1.0",
-                "npm-asset/grunt-jsonlint": "1.0.4",
-                "npm-asset/grunt-npmcopy": "0.1.0",
-                "npm-asset/gzip-js": "0.3.2",
-                "npm-asset/jsdom": "5.6.1",
-                "npm-asset/load-grunt-tasks": "1.0.0",
-                "npm-asset/qunit-assert-step": "1.0.3",
-                "npm-asset/qunitjs": "1.17.1",
-                "npm-asset/requirejs": "2.1.17",
-                "npm-asset/sinon": "1.10.3",
-                "npm-asset/sizzle": "2.2.1",
-                "npm-asset/strip-json-comments": "1.0.3",
-                "npm-asset/testswarm": "1.1.0",
-                "npm-asset/win-spawn": "2.0.0"
-            },
             "type": "npm-asset-library",
             "extra": {
                 "npm-asset-bugs": {
@@ -1244,6 +1194,18 @@
                 "npm-asset/jquery-mousewheel": ">=3.1.13",
                 "npm-asset/php-date-formatter": ">=1.3.4,<2.0.0"
             },
+            "require-dev": {
+                "npm-asset/chai": ">=4.1.2,<5.0.0",
+                "npm-asset/concat": "dev-github:azer/concat",
+                "npm-asset/concat-cli": ">=4.0.0,<5.0.0",
+                "npm-asset/karma": ">=2.0.0,<3.0.0",
+                "npm-asset/karma-chai": ">=0.1.0,<0.2.0",
+                "npm-asset/karma-firefox-launcher": ">=1.1.0,<2.0.0",
+                "npm-asset/karma-mocha": ">=1.3.0,<2.0.0",
+                "npm-asset/mocha": ">=5.0.4,<6.0.0",
+                "npm-asset/uglifycss": ">=0.0.27,<0.0.28",
+                "npm-asset/uglifyjs": ">=2.4.10,<3.0.0"
+            },
             "type": "npm-asset-library",
             "extra": {
                 "npm-asset-bugs": {
@@ -1297,12 +1259,6 @@
                 "reference": null,
                 "shasum": "06f0335f16e353a695e7206bf50503cb523a6ee5"
             },
-            "require-dev": {
-                "npm-asset/grunt": "~0.4.1",
-                "npm-asset/grunt-contrib-connect": "~0.5.0",
-                "npm-asset/grunt-contrib-jshint": "~0.7.1",
-                "npm-asset/grunt-contrib-uglify": "~0.2.7"
-            },
             "type": "npm-asset-library",
             "extra": {
                 "npm-asset-bugs": {
@@ -3607,6 +3563,8 @@
     "prefer-lowest": false,
     "platform": {
         "php": ">=5.6.1",
+        "ext-dom": "*",
+        "ext-json": "*",
         "ext-xml": "*"
     },
     "platform-dev": []
diff --git a/include/conversation.php b/include/conversation.php
index 1b7b34e71a..2d613f0f38 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -462,17 +462,17 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
 				. "<script> var profile_uid = " . $_SESSION['uid']
 				. "; var netargs = '" . substr($a->cmd, 8)
 				. '?f='
-				. ((x($_GET, 'cid'))    ? '&cid='    . $_GET['cid']    : '')
-				. ((x($_GET, 'search')) ? '&search=' . $_GET['search'] : '')
-				. ((x($_GET, 'star'))   ? '&star='   . $_GET['star']   : '')
-				. ((x($_GET, 'order'))  ? '&order='  . $_GET['order']  : '')
-				. ((x($_GET, 'bmark'))  ? '&bmark='  . $_GET['bmark']  : '')
-				. ((x($_GET, 'liked'))  ? '&liked='  . $_GET['liked']  : '')
-				. ((x($_GET, 'conv'))   ? '&conv='   . $_GET['conv']   : '')
-				. ((x($_GET, 'nets'))   ? '&nets='   . $_GET['nets']   : '')
-				. ((x($_GET, 'cmin'))   ? '&cmin='   . $_GET['cmin']   : '')
-				. ((x($_GET, 'cmax'))   ? '&cmax='   . $_GET['cmax']   : '')
-				. ((x($_GET, 'file'))   ? '&file='   . $_GET['file']   : '')
+				. ((x($_GET, 'cid'))    ? '&cid='    . rawurlencode($_GET['cid'])    : '')
+				. ((x($_GET, 'search')) ? '&search=' . rawurlencode($_GET['search']) : '')
+				. ((x($_GET, 'star'))   ? '&star='   . rawurlencode($_GET['star'])   : '')
+				. ((x($_GET, 'order'))  ? '&order='  . rawurlencode($_GET['order'])  : '')
+				. ((x($_GET, 'bmark'))  ? '&bmark='  . rawurlencode($_GET['bmark'])  : '')
+				. ((x($_GET, 'liked'))  ? '&liked='  . rawurlencode($_GET['liked'])  : '')
+				. ((x($_GET, 'conv'))   ? '&conv='   . rawurlencode($_GET['conv'])   : '')
+				. ((x($_GET, 'nets'))   ? '&nets='   . rawurlencode($_GET['nets'])   : '')
+				. ((x($_GET, 'cmin'))   ? '&cmin='   . rawurlencode($_GET['cmin'])   : '')
+				. ((x($_GET, 'cmax'))   ? '&cmax='   . rawurlencode($_GET['cmax'])   : '')
+				. ((x($_GET, 'file'))   ? '&file='   . rawurlencode($_GET['file'])   : '')
 
 				. "'; var profile_page = " . $pager->getPage() . "; </script>\r\n";
 		}
diff --git a/include/items.php b/include/items.php
index b9e1a0c994..c311383613 100644
--- a/include/items.php
+++ b/include/items.php
@@ -97,7 +97,7 @@ function add_page_info_data(array $data, $no_photos = false)
 			/// @TODO make a positive list of allowed characters
 			$hashtag = str_replace([" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"],
 						["", "", "", "", "", "", "", "", "", "", "", ""], $keyword);
-			$hashtags .= "#[url=" . System::baseUrl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url] ";
+			$hashtags .= "#[url=" . System::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url] ";
 		}
 	}
 
@@ -148,7 +148,7 @@ function add_page_keywords($url, $photo = "", $keywords = false, $keyword_blackl
 				$tags .= ", ";
 			}
 
-			$tags .= "#[url=" . System::baseUrl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url]";
+			$tags .= "#[url=" . System::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url]";
 		}
 	}
 
diff --git a/library/OAuth1.php b/library/OAuth1.php
index c537f2b252..4746328316 100644
--- a/library/OAuth1.php
+++ b/library/OAuth1.php
@@ -3,8 +3,10 @@
 
 /* Generic exception class
  */
-class OAuthException extends Exception {
-  // pass
+if (!class_exists('OAuthException', false)) {
+  class OAuthException extends Exception {
+    // pass
+  }
 }
 
 class OAuthConsumer {
diff --git a/mod/admin.php b/mod/admin.php
index f22bb7be02..dca1c33620 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -664,13 +664,17 @@ function admin_page_federation(App $a)
 				} while (!empty($parts) && ((strlen($part) >= 40) || (strlen($part) <= 3)));
 
 				if (!empty($part)) {
-					$compacted[$part] += $v[$key]['total'];
+					if (empty($compacted[$part])) {
+						$compacted[$part] = $v[$key]['total'];
+					} else {
+						$compacted[$part] += $v[$key]['total'];
+					}
 				}
 			}
 
 			$v = [];
-			foreach ($compacted as $version => $total) {
-				$v[] = ['version' => $version, 'total' => $total];
+			foreach ($compacted as $version => $pl_total) {
+				$v[] = ['version' => $version, 'total' => $pl_total];
 			}
 		}
 
@@ -1779,7 +1783,11 @@ function admin_page_users_post(App $a)
 	}
 	if (x($_POST, 'page_users_delete')) {
 		foreach ($users as $uid) {
-			User::remove($uid);
+			if (local_user() != $uid) {
+				User::remove($uid);
+			} else {
+				notice(L10n::t('You can\'t remove yourself'));
+			}
 		}
 		notice(L10n::tt("%s user deleted", "%s users deleted", count($users)));
 	}
@@ -1824,11 +1832,15 @@ function admin_page_users(App $a)
 		}
 		switch ($a->argv[2]) {
 			case "delete":
-				BaseModule::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
-				// delete user
-				User::remove($uid);
+				if (local_user() != $uid) {
+					BaseModule::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
+					// delete user
+					User::remove($uid);
 
-				notice(L10n::t("User '%s' deleted", $user['username']) . EOL);
+					notice(L10n::t("User '%s' deleted", $user['username']));
+				} else {
+					notice(L10n::t('You can\'t remove yourself'));
+				}
 				break;
 			case "block":
 				BaseModule::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
diff --git a/mod/filerm.php b/mod/filerm.php
index 30a7f69df9..d240c2d6a7 100644
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -36,6 +36,6 @@ function filerm_content(App $a)
 		info('Item was not deleted');
 	}
 
-	$a->internalRedirect('/network?f=&file=' . $term);
+	$a->internalRedirect('/network?f=&file=' . rawurlencode($term));
 	killme();
 }
diff --git a/mod/friendica.php b/mod/friendica.php
index 0e647eb5ea..77adccbfb6 100644
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -13,7 +13,13 @@ use Friendica\Database\DBA;
 function friendica_init(App $a)
 {
 	if (!empty($a->argv[1]) && ($a->argv[1] == "json")) {
-		$register_policy = ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'];
+		$register_policies = ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'];
+
+		$register_policy = $register_policies[intval(Config::get('config', 'register_policy'))];
+
+		if ($register_policy == 'REGISTER_OPEN' && Config::get('config', 'invitation_only')) {
+			$register_policy = 'REGISTER_INVITATION';
+		}
 
 		$sql_extra = '';
 		if (x($a->config, 'admin_nickname')) {
@@ -52,7 +58,7 @@ function friendica_init(App $a)
 			'locked_features'  => $locked_features,
 			'explicit_content' => (int)Config::get('system', 'explicit_content', false),
 			'language'         => Config::get('system','language'),
-			'register_policy'  => $register_policy[intval(Config::get('config', 'register_policy'))],
+			'register_policy'  => $register_policy,
 			'admin'            => $admin,
 			'site_name'        => Config::get('config', 'sitename'),
 			'platform'         => FRIENDICA_PLATFORM,
diff --git a/mod/hovercard.php b/mod/hovercard.php
index f5ad3ef021..6160642762 100644
--- a/mod/hovercard.php
+++ b/mod/hovercard.php
@@ -107,7 +107,7 @@ function hovercard_content()
 		'about'    => $contact['about'],
 		'network'  => Strings::formatNetworkName($contact['network'], $contact['url']),
 		'tags'     => $contact['keywords'],
-		'bd'       => $contact['birthday'] <= '0001-01-01' ? '' : $contact['birthday'],
+		'bd'       => $contact['birthday'] <= DBA::NULL_DATE ? '' : $contact['birthday'],
 		'account_type' => Contact::getAccountType($contact),
 		'actions'  => $actions,
 	];
diff --git a/mod/network.php b/mod/network.php
index 58f9484250..594a557997 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -170,21 +170,17 @@ function network_init(App $a)
 
 function saved_searches($search)
 {
-	$a = get_app();
-
 	$srchurl = '/network?f='
-		. ((x($_GET, 'cid'))   ? '&cid='   . $_GET['cid']   : '')
-		. ((x($_GET, 'star'))  ? '&star='  . $_GET['star']  : '')
-		. ((x($_GET, 'bmark')) ? '&bmark=' . $_GET['bmark'] : '')
-		. ((x($_GET, 'conv'))  ? '&conv='  . $_GET['conv']  : '')
-		. ((x($_GET, 'nets'))  ? '&nets='  . $_GET['nets']  : '')
-		. ((x($_GET, 'cmin'))  ? '&cmin='  . $_GET['cmin']  : '')
-		. ((x($_GET, 'cmax'))  ? '&cmax='  . $_GET['cmax']  : '')
-		. ((x($_GET, 'file'))  ? '&file='  . $_GET['file']  : '');
+		. ((x($_GET, 'cid'))   ? '&cid='   . rawurlencode($_GET['cid'])   : '')
+		. ((x($_GET, 'star'))  ? '&star='  . rawurlencode($_GET['star'])  : '')
+		. ((x($_GET, 'bmark')) ? '&bmark=' . rawurlencode($_GET['bmark']) : '')
+		. ((x($_GET, 'conv'))  ? '&conv='  . rawurlencode($_GET['conv'])  : '')
+		. ((x($_GET, 'nets'))  ? '&nets='  . rawurlencode($_GET['nets'])  : '')
+		. ((x($_GET, 'cmin'))  ? '&cmin='  . rawurlencode($_GET['cmin'])  : '')
+		. ((x($_GET, 'cmax'))  ? '&cmax='  . rawurlencode($_GET['cmax'])  : '')
+		. ((x($_GET, 'file'))  ? '&file='  . rawurlencode($_GET['file'])  : '');
 	;
 
-	$o = '';
-
 	$terms = DBA::select('search', ['id', 'term'], ['uid' => local_user()]);
 	$saved = [];
 
@@ -202,7 +198,7 @@ function saved_searches($search)
 	$o = Renderer::replaceMacros($tpl, [
 		'$title'     => L10n::t('Saved Searches'),
 		'$add'       => L10n::t('add'),
-		'$searchbox' => HTML::search($search, 'netsearch-box', $srchurl, true),
+		'$searchbox' => HTML::search($search, 'netsearch-box', $srchurl),
 		'$saved'     => $saved,
 	]);
 
diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 7fce9d0b69..5670820623 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -2,6 +2,7 @@
 /**
  * @file mod/ostatus_subscribe.php
  */
+
 use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -11,15 +12,15 @@ use Friendica\Model\Contact;
 use Friendica\Network\Probe;
 use Friendica\Util\Network;
 
-function ostatus_subscribe_content(App $a) {
-
-	if (! local_user()) {
+function ostatus_subscribe_content(App $a)
+{
+	if (!local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
 		$a->internalRedirect('ostatus_subscribe');
 		// NOTREACHED
 	}
 
-	$o = "<h2>".L10n::t("Subscribing to OStatus contacts")."</h2>";
+	$o = '<h2>' . L10n::t('Subscribing to OStatus contacts') . '</h2>';
 
 	$uid = local_user();
 
@@ -27,42 +28,46 @@ function ostatus_subscribe_content(App $a) {
 
 	$counter = intval($_REQUEST['counter']);
 
-	if (PConfig::get($uid, "ostatus", "legacy_friends") == "") {
+	if (PConfig::get($uid, 'ostatus', 'legacy_friends') == '') {
 
-		if ($_REQUEST["url"] == "") {
-			PConfig::delete($uid, "ostatus", "legacy_contact");
-			return $o.L10n::t("No contact provided.");
+		if ($_REQUEST['url'] == '') {
+			PConfig::delete($uid, 'ostatus', 'legacy_contact');
+			return $o . L10n::t('No contact provided.');
 		}
 
-		$contact = Probe::uri($_REQUEST["url"]);
+		$contact = Probe::uri($_REQUEST['url']);
 
 		if (!$contact) {
-			PConfig::delete($uid, "ostatus", "legacy_contact");
-			return $o.L10n::t("Couldn't fetch information for contact.");
+			PConfig::delete($uid, 'ostatus', 'legacy_contact');
+			return $o . L10n::t('Couldn\'t fetch information for contact.');
 		}
 
-		$api = $contact["baseurl"]."/api/";
+		$api = $contact['baseurl'] . '/api/';
 
 		// Fetching friends
-		$curlResult = Network::curl($api."statuses/friends.json?screen_name=".$contact["nick"]);
+		$curlResult = Network::curl($api . 'statuses/friends.json?screen_name=' . $contact['nick']);
 
 		if (!$curlResult->isSuccess()) {
-			PConfig::delete($uid, "ostatus", "legacy_contact");
-			return $o.L10n::t("Couldn't fetch friends for contact.");
+			PConfig::delete($uid, 'ostatus', 'legacy_contact');
+			return $o . L10n::t('Couldn\'t fetch friends for contact.');
 		}
 
-		PConfig::set($uid, "ostatus", "legacy_friends", $curlResult->getBody());
+		PConfig::set($uid, 'ostatus', 'legacy_friends', $curlResult->getBody());
 	}
 
-	$friends = json_decode(PConfig::get($uid, "ostatus", "legacy_friends"));
+	$friends = json_decode(PConfig::get($uid, 'ostatus', 'legacy_friends'));
+
+	if (empty($friends)) {
+		$friends = [];
+	}
 
 	$total = sizeof($friends);
 
 	if ($counter >= $total) {
-		$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.System::baseUrl().'/settings/connectors">';
-		PConfig::delete($uid, "ostatus", "legacy_friends");
-		PConfig::delete($uid, "ostatus", "legacy_contact");
-		$o .= L10n::t("Done");
+		$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . System::baseUrl() . '/settings/connectors">';
+		PConfig::delete($uid, 'ostatus', 'legacy_friends');
+		PConfig::delete($uid, 'ostatus', 'legacy_contact');
+		$o .= L10n::t('Done');
 		return $o;
 	}
 
@@ -70,25 +75,25 @@ function ostatus_subscribe_content(App $a) {
 
 	$url = $friend->statusnet_profile_url;
 
-	$o .= "<p>".$counter."/".$total.": ".$url;
+	$o .= '<p>' . $counter . '/' . $total . ': ' . $url;
 
 	$curlResult = Probe::uri($url);
-	if ($curlResult["network"] == Protocol::OSTATUS) {
+	if ($curlResult['network'] == Protocol::OSTATUS) {
 		$result = Contact::createFromProbe($uid, $url, true, Protocol::OSTATUS);
-		if ($result["success"]) {
-			$o .= " - ".L10n::t("success");
+		if ($result['success']) {
+			$o .= ' - ' . L10n::t('success');
 		} else {
-			$o .= " - ".L10n::t("failed");
+			$o .= ' - ' . L10n::t('failed');
 		}
 	} else {
-		$o .= " - ".L10n::t("ignored");
+		$o .= ' - ' . L10n::t('ignored');
 	}
 
-	$o .= "</p>";
+	$o .= '</p>';
 
-	$o .= "<p>".L10n::t("Keep this window open until done.")."</p>";
+	$o .= '<p>' . L10n::t('Keep this window open until done.') . '</p>';
 
-	$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.System::baseUrl().'/ostatus_subscribe?counter='.$counter.'">';
+	$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . System::baseUrl() . '/ostatus_subscribe?counter=' . $counter . '">';
 
 	return $o;
 }
diff --git a/mod/photos.php b/mod/photos.php
index 65a48c4c3f..70e0e1882d 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -613,7 +613,7 @@ function photos_post(App $a)
 							}
 
 							$profile = str_replace(',', '%2c', $profile);
-							$str_tags .= '@[url='.$profile.']'.$newname.'[/url]';
+							$str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]';
 						}
 					} elseif (strpos($tag, '#') === 0) {
 						$tagname = substr($tag, 1);
diff --git a/mod/profile.php b/mod/profile.php
index 0aa42cf446..3164f173bf 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -253,7 +253,7 @@ function profile_content(App $a, $update = 0)
 			$sql_extra4 = " AND `item`.`received` > '" . $gmupdate . "'";
 		}
 
-		$items = q("SELECT DISTINCT(`parent-uri`) AS `uri`
+		$items = q("SELECT DISTINCT(`parent-uri`) AS `uri`, `item`.`created`
 			FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 			AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
 			WHERE `item`.`uid` = %d AND `item`.`visible` AND
diff --git a/mod/profiles.php b/mod/profiles.php
index 459a1c5e75..fe3b362317 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -216,7 +216,7 @@ function profiles_post(App $a) {
 		} else {
 			$ignore_year = false;
 		}
-		if (!in_array($dob, ['0000-00-00', '0001-01-01'])) {
+		if (!in_array($dob, ['0000-00-00', DBA::NULL_DATE])) {
 			if (strpos($dob, '0000-') === 0 || strpos($dob, '0001-') === 0) {
 				$ignore_year = true;
 				$dob = substr($dob, 5);
diff --git a/mod/redir.php b/mod/redir.php
index f22af545f7..701b85953c 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -43,7 +43,7 @@ function redir_init(App $a) {
 
 		if ($contact['uid'] == 0 && local_user()) {
 			// Let's have a look if there is an established connection
-			// between the puplic contact we have found and the local user.
+			// between the public contact we have found and the local user.
 			$contact = DBA::selectFirst('contact', $fields, ['nurl' => $contact['nurl'], 'uid' => local_user()]);
 
 			if (DBA::isResult($contact)) {
diff --git a/mod/removeme.php b/mod/removeme.php
index 49b8f6d534..ee0b66db8a 100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -57,8 +57,12 @@ function removeme_post(App $a)
 		]);
 	}
 
-	if (User::authenticate($a->user, trim($_POST['qxz_password']))) {
+	if (User::getIdFromPasswordAuthentication($a->user, trim($_POST['qxz_password']))) {
 		User::remove($a->user['uid']);
+
+		unset($_SESSION['authenticated']);
+		unset($_SESSION['uid']);
+		$a->internalRedirect();
 		// NOTREACHED
 	}
 }
diff --git a/mod/search.php b/mod/search.php
index 1ada76a9e6..2810b23b13 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -162,7 +162,7 @@ function search_content(App $a) {
 		'name' => "search-header",
 		'$title' => L10n::t("Search"),
 		'$title_size' => 3,
-		'$content' => HTML::search($search,'search-box','search',((local_user()) ? true : false), false)
+		'$content' => HTML::search($search,'search-box','search', false)
 	]);
 
 	if (strpos($search,'#') === 0) {
diff --git a/mod/tagger.php b/mod/tagger.php
index 6c3c6157a5..5a8047414d 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -93,7 +93,7 @@ function tagger_content(App $a) {
 	</target>
 EOT;
 
-	$tagid = System::baseUrl() . '/search?tag=' . $term;
+	$tagid = System::baseUrl() . '/search?tag=' . $xterm;
 	$objtype = ACTIVITY_OBJ_TAGTERM;
 
 	$obj = <<< EOT
@@ -113,7 +113,7 @@ EOT;
 		return;
 	}
 
-	$termlink = html_entity_decode('&#x2317;') . '[url=' . System::baseUrl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/url]';
+	$termlink = html_entity_decode('&#x2317;') . '[url=' . System::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]';
 
 	$arr = [];
 
@@ -170,7 +170,7 @@ EOT;
 		   $term_objtype,
 		   TERM_HASHTAG,
 		   DBA::escape($term),
-		   DBA::escape(System::baseUrl() . '/search?tag=' . $term),
+		   '',
 		   intval($owner_uid)
 		);
 	}
@@ -192,7 +192,7 @@ EOT;
 				$term_objtype,
 				TERM_HASHTAG,
 				DBA::escape($term),
-				DBA::escape(System::baseUrl() . '/search?tag=' . $term),
+				'',
 				intval($owner_uid)
 			);
 		}
diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index f3d457e295..8b7acffbdc 100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -68,8 +68,9 @@ function viewcontacts_content(App $a)
 	$r = q("SELECT COUNT(*) AS `total` FROM `contact`
 		WHERE `uid` = %d AND NOT `blocked` AND NOT `pending`
 			AND NOT `hidden` AND NOT `archive`
-			AND `network` IN ('%s', '%s', '%s')",
+			AND `network` IN ('%s', '%s', '%s', '%s')",
 		intval($a->profile['uid']),
+		DBA::escape(Protocol::ACTIVITYPUB),
 		DBA::escape(Protocol::DFRN),
 		DBA::escape(Protocol::DIASPORA),
 		DBA::escape(Protocol::OSTATUS)
@@ -82,9 +83,10 @@ function viewcontacts_content(App $a)
 	$r = q("SELECT * FROM `contact`
 		WHERE `uid` = %d AND NOT `blocked` AND NOT `pending`
 			AND NOT `hidden` AND NOT `archive`
-			AND `network` IN ('%s', '%s', '%s')
+			AND `network` IN ('%s', '%s', '%s', '%s')
 		ORDER BY `name` ASC LIMIT %d, %d",
 		intval($a->profile['uid']),
+		DBA::escape(Protocol::ACTIVITYPUB),
 		DBA::escape(Protocol::DFRN),
 		DBA::escape(Protocol::DIASPORA),
 		DBA::escape(Protocol::OSTATUS),
diff --git a/src/App.php b/src/App.php
index 4451013093..67625228b4 100644
--- a/src/App.php
+++ b/src/App.php
@@ -1013,11 +1013,11 @@ class App
 			$meminfo[$key] = (int) ($meminfo[$key] / 1024);
 		}
 
-		if (!isset($meminfo['MemAvailable']) || !isset($meminfo['MemFree'])) {
+		if (!isset($meminfo['MemFree'])) {
 			return false;
 		}
 
-		$free = $meminfo['MemAvailable'] + $meminfo['MemFree'];
+		$free = $meminfo['MemFree'];
 
 		$reached = ($free < $min_memory);
 
diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index c77db3827f..c37e36f607 100644
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -247,8 +247,7 @@ class OEmbed
 
 		$ret .= '</div>';
 
-		$ret = str_replace("\n", "", $ret);
-		return mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));
+		return str_replace("\n", "", $ret);
 	}
 
 	public static function BBCode2HTML($text)
diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 9c9adec0fa..cb375dcd21 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -28,6 +28,7 @@ use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
+use Friendica\Util\XML;
 
 class BBCode extends BaseObject
 {
@@ -1340,15 +1341,21 @@ class BBCode extends BaseObject
 		$expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism";
 		$text = preg_replace($expression, System::baseUrl()."/display/$1", $text);
 
-		$text = preg_replace("/([#])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
-					'$1<a href="' . System::baseUrl() . '/search?tag=$3" class="tag" title="$3">$3</a>', $text);
-
-		$text = preg_replace("/\[url\=([$URLSearchString]*)\]#(.*?)\[\/url\]/ism",
-					'#<a href="' . System::baseUrl() . '/search?tag=$2" class="tag" title="$2">$2</a>', $text);
+		/* Tag conversion
+		 * Supports:
+		 * - #[url=<anything>]<term>[/url]
+		 * - [url=<anything>]#<term>[/url]
+		 */
+		$text = preg_replace_callback("/(?:#\[url\=[$URLSearchString]*\]|\[url\=[$URLSearchString]*\]#)(.*?)\[\/url\]/ism", function($matches) {
+			return '#<a href="'
+				. System::baseUrl()	. '/search?tag=' . rawurlencode($matches[1])
+				. '" class="tag" title="' . XML::escape($matches[1]) . '">'
+				. XML::escape($matches[1])
+				. '</a>';
+		}, $text);
 
 		$text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$1</a>', $text);
 		$text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $text);
-		//$Text = preg_replace("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $Text);
 
 		// Red compatibility, though the link can't be authenticated on Friendica
 		$text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<a href="$1" target="_blank">$2</a>', $text);
diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index 544811536b..6451b74faa 100644
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -951,7 +951,7 @@ class HTML
 	 *
 	 * @return string Formatted HTML.
 	 */
-	public static function search($s, $id = 'search-box', $url = 'search', $save = false, $aside = true)
+	public static function search($s, $id = 'search-box', $url = 'search', $aside = true)
 	{
 		$mode = 'text';
 
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 1c90d0c815..bb6fc25851 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -740,7 +740,7 @@ class Contact extends BaseObject
 
 			// "bd" always contains the upcoming birthday of a contact.
 			// "birthday" might contain the birthday including the year of birth.
-			if ($profile["birthday"] > '0001-01-01') {
+			if ($profile["birthday"] > DBA::NULL_DATE) {
 				$bd_timestamp = strtotime($profile["birthday"]);
 				$month = date("m", $bd_timestamp);
 				$day = date("d", $bd_timestamp);
@@ -757,7 +757,7 @@ class Contact extends BaseObject
 					$profile["bd"] = ( ++$current_year) . "-" . $month . "-" . $day;
 				}
 			} else {
-				$profile["bd"] = '0001-01-01';
+				$profile["bd"] = DBA::NULL_DATE;
 			}
 		} else {
 			$profile = $default;
@@ -794,7 +794,7 @@ class Contact extends BaseObject
 			$profile["location"] = "";
 			$profile["about"] = "";
 			$profile["gender"] = "";
-			$profile["birthday"] = '0001-01-01';
+			$profile["birthday"] = DBA::NULL_DATE;
 		}
 
 		$cache[$url][$uid] = $profile;
@@ -1285,10 +1285,15 @@ class Contact extends BaseObject
 			return false;
 		}
 
-		$blocked = DBA::selectFirst('contact', ['blocked'], ['id' => $cid]);
+		$blocked = DBA::selectFirst('contact', ['blocked', 'url'], ['id' => $cid]);
 		if (!DBA::isResult($blocked)) {
 			return false;
 		}
+
+		if (Network::isUrlBlocked($blocked['url'])) {
+			return true;
+		}
+
 		return (bool) $blocked['blocked'];
 	}
 
@@ -1957,44 +1962,33 @@ class Contact extends BaseObject
 	 */
 	public static function updateBirthdays()
 	{
-		// This only handles foreign or alien networks where a birthday has been provided.
-		// In-network birthdays are handled within local_delivery
-
-		$r = q("SELECT * FROM `contact` WHERE `bd` != '' AND `bd` > '0001-01-01' AND SUBSTRING(`bd`, 1, 4) != `bdyear` ");
-		if (DBA::isResult($r)) {
-			foreach ($r as $rr) {
-				Logger::log('update_contact_birthday: ' . $rr['bd']);
-
-				$nextbd = DateTimeFormat::utcNow('Y') . substr($rr['bd'], 4);
-
-				/*
-				 * Add new birthday event for this person
-				 *
-				 * $bdtext is just a readable placeholder in case the event is shared
-				 * with others. We will replace it during presentation to our $importer
-				 * to contain a sparkle link and perhaps a photo.
-				 */
-
-				// Check for duplicates
-				$condition = ['uid' => $rr['uid'], 'cid' => $rr['id'],
-					'start' => DateTimeFormat::utc($nextbd), 'type' => 'birthday'];
-				if (DBA::exists('event', $condition)) {
-					continue;
-				}
-
-				$bdtext = L10n::t('%s\'s birthday', $rr['name']);
-				$bdtext2 = L10n::t('Happy Birthday %s', ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]');
-
-				q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`)
-				VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ", intval($rr['uid']), intval($rr['id']),
-					DBA::escape(DateTimeFormat::utcNow()), DBA::escape(DateTimeFormat::utcNow()), DBA::escape(DateTimeFormat::utc($nextbd)),
-					DBA::escape(DateTimeFormat::utc($nextbd . ' + 1 day ')), DBA::escape($bdtext), DBA::escape($bdtext2), DBA::escape('birthday'),
-					intval(0)
-				);
-
+		$condition = [
+			'`bd` != ""
+			AND `bd` > "0001-01-01"
+			AND SUBSTRING(`bd`, 1, 4) != `bdyear`
+			AND (`contact`.`rel` = ? OR `contact`.`rel` = ?)
+			AND NOT `contact`.`pending`
+			AND NOT `contact`.`hidden`
+			AND NOT `contact`.`blocked`
+			AND NOT `contact`.`archive`
+			AND NOT `contact`.`deleted`',
+			Contact::SHARING,
+			Contact::FRIEND
+		];
+
+		$contacts = DBA::select('contact', ['id', 'uid', 'name', 'url', 'bd'], $condition);
+
+		while ($contact = DBA::fetch($contacts)) {
+			Logger::log('update_contact_birthday: ' . $contact['bd']);
+
+			$nextbd = DateTimeFormat::utcNow('Y') . substr($contact['bd'], 4);
+
+			if (Event::createBirthday($contact, $nextbd)) {
 				// update bdyear
-				q("UPDATE `contact` SET `bdyear` = '%s', `bd` = '%s' WHERE `uid` = %d AND `id` = %d", DBA::escape(substr($nextbd, 0, 4)),
-					DBA::escape($nextbd), intval($rr['uid']), intval($rr['id'])
+				DBA::update(
+					'contact',
+					['bdyear' => substr($nextbd, 0, 4), 'bd' => $nextbd],
+					['id' => $contact['id']]
 				);
 			}
 		}
diff --git a/src/Model/Event.php b/src/Model/Event.php
index 7356382871..886f124153 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -322,43 +322,48 @@ class Event extends BaseObject
 			// New event. Store it.
 			DBA::insert('event', $event);
 
-			$event['id'] = DBA::lastInsertId();
-
-			$item_arr = [];
-
-			$item_arr['uid']           = $event['uid'];
-			$item_arr['contact-id']    = $event['cid'];
-			$item_arr['uri']           = $event['uri'];
-			$item_arr['parent-uri']    = $event['uri'];
-			$item_arr['guid']          = $event['guid'];
-			$item_arr['plink']         = defaults($arr, 'plink', '');
-			$item_arr['post-type']     = Item::PT_EVENT;
-			$item_arr['wall']          = $event['cid'] ? 0 : 1;
-			$item_arr['contact-id']    = $contact['id'];
-			$item_arr['owner-name']    = $contact['name'];
-			$item_arr['owner-link']    = $contact['url'];
-			$item_arr['owner-avatar']  = $contact['thumb'];
-			$item_arr['author-name']   = $contact['name'];
-			$item_arr['author-link']   = $contact['url'];
-			$item_arr['author-avatar'] = $contact['thumb'];
-			$item_arr['title']         = '';
-			$item_arr['allow_cid']     = $event['allow_cid'];
-			$item_arr['allow_gid']     = $event['allow_gid'];
-			$item_arr['deny_cid']      = $event['deny_cid'];
-			$item_arr['deny_gid']      = $event['deny_gid'];
-			$item_arr['private']       = $private;
-			$item_arr['visible']       = 1;
-			$item_arr['verb']          = ACTIVITY_POST;
-			$item_arr['object-type']   = ACTIVITY_OBJ_EVENT;
-			$item_arr['origin']        = $event['cid'] === 0 ? 1 : 0;
-			$item_arr['body']          = self::getBBCode($event);
-			$item_arr['event-id']      = $event['id'];
-
-			$item_arr['object']  = '<object><type>' . XML::escape(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . XML::escape($event['uri']) . '</id>';
-			$item_arr['object'] .= '<content>' . XML::escape(self::getBBCode($event)) . '</content>';
-			$item_arr['object'] .= '</object>' . "\n";
-
-			$item_id = Item::insert($item_arr);
+			$item_id = 0;
+
+			// Don't create an item for birthday events
+			if ($event['type'] == 'event') {
+				$event['id'] = DBA::lastInsertId();
+
+				$item_arr = [];
+
+				$item_arr['uid']           = $event['uid'];
+				$item_arr['contact-id']    = $event['cid'];
+				$item_arr['uri']           = $event['uri'];
+				$item_arr['parent-uri']    = $event['uri'];
+				$item_arr['guid']          = $event['guid'];
+				$item_arr['plink']         = defaults($arr, 'plink', '');
+				$item_arr['post-type']     = Item::PT_EVENT;
+				$item_arr['wall']          = $event['cid'] ? 0 : 1;
+				$item_arr['contact-id']    = $contact['id'];
+				$item_arr['owner-name']    = $contact['name'];
+				$item_arr['owner-link']    = $contact['url'];
+				$item_arr['owner-avatar']  = $contact['thumb'];
+				$item_arr['author-name']   = $contact['name'];
+				$item_arr['author-link']   = $contact['url'];
+				$item_arr['author-avatar'] = $contact['thumb'];
+				$item_arr['title']         = '';
+				$item_arr['allow_cid']     = $event['allow_cid'];
+				$item_arr['allow_gid']     = $event['allow_gid'];
+				$item_arr['deny_cid']      = $event['deny_cid'];
+				$item_arr['deny_gid']      = $event['deny_gid'];
+				$item_arr['private']       = $private;
+				$item_arr['visible']       = 1;
+				$item_arr['verb']          = ACTIVITY_POST;
+				$item_arr['object-type']   = ACTIVITY_OBJ_EVENT;
+				$item_arr['origin']        = $event['cid'] === 0 ? 1 : 0;
+				$item_arr['body']          = self::getBBCode($event);
+				$item_arr['event-id']      = $event['id'];
+
+				$item_arr['object']  = '<object><type>' . XML::escape(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . XML::escape($event['uri']) . '</id>';
+				$item_arr['object'] .= '<content>' . XML::escape(self::getBBCode($event)) . '</content>';
+				$item_arr['object'] .= '</object>' . "\n";
+
+				$item_id = Item::insert($item_arr);
+			}
 
 			Addon::callHooks("event_created", $event['id']);
 		}
@@ -981,4 +986,47 @@ class Event extends BaseObject
 
 		return $location;
 	}
+
+	/**
+	 * @brief Add new birthday event for this person
+	 *
+	 * @param array  $contact  Contact array, expects: id, uid, url, name
+	 * @param string $birthday Birthday of the contact
+	 * @return bool
+	 */
+	public static function createBirthday($contact, $birthday)
+	{
+		// Check for duplicates
+		$condition = [
+			'uid' => $contact['uid'],
+			'cid' => $contact['id'],
+			'start' => DateTimeFormat::utc($birthday),
+			'type' => 'birthday'
+		];
+		if (DBA::exists('event', $condition)) {
+			return false;
+		}
+
+		/*
+		 * Add new birthday event for this person
+		 *
+		 * summary is just a readable placeholder in case the event is shared
+		 * with others. We will replace it during presentation to our $importer
+		 * to contain a sparkle link and perhaps a photo.
+		 */
+		$values = [
+			'uid'     => $contact['uid'],
+			'cid'     => $contact['id'],
+			'start'   => DateTimeFormat::utc($birthday),
+			'finish'  => DateTimeFormat::utc($birthday . ' + 1 day '),
+			'summary' => L10n::t('%s\'s birthday', $contact['name']),
+			'desc'    => L10n::t('Happy Birthday %s', ' [url=' . $contact['url'] . ']' . $contact['name'] . '[/url]'),
+			'type'    => 'birthday',
+			'adjust'  => 0
+		];
+
+		self::store($values);
+
+		return true;
+	}
 }
diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index 1fed1fc3ef..3acffb059d 100644
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -864,7 +864,7 @@ class GContact
 						'location' => $contact['location'], 'about' => $contact['about']];
 
 				// Don't update the birthday field if not set or invalid
-				if (empty($contact['birthday']) || ($contact['birthday'] < '0001-01-01')) {
+				if (empty($contact['birthday']) || ($contact['birthday'] <= DBA::NULL_DATE)) {
 					unset($fields['bd']);
 				}
 
diff --git a/src/Model/Group.php b/src/Model/Group.php
index b32b61e103..1640cb87b1 100644
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -400,6 +400,11 @@ class Group extends BaseObject
 			];
 		}
 
+		// Don't show the groups when there is only one
+		if (count($display_groups) <= 2) {
+			return '';
+		}
+
 		$tpl = Renderer::getMarkupTemplate('group_side.tpl');
 		$o = Renderer::replaceMacros($tpl, [
 			'$add' => L10n::t('add'),
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 9aaac7f7a0..0c420550b8 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -2448,15 +2448,15 @@ class Item extends BaseObject
 
 			$basetag = str_replace('_',' ',substr($tag,1));
 
-			$newtag = '#[url=' . System::baseUrl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+			$newtag = '#[url=' . System::baseUrl() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]';
 
 			$item["body"] = str_replace($tag, $newtag, $item["body"]);
 
 			if (!stristr($item["tag"], "/search?tag=" . $basetag . "]" . $basetag . "[/url]")) {
 				if (strlen($item["tag"])) {
-					$item["tag"] = ','.$item["tag"];
+					$item["tag"] = ',' . $item["tag"];
 				}
-				$item["tag"] = $newtag.$item["tag"];
+				$item["tag"] = $newtag . $item["tag"];
 			}
 		}
 
diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index c45bcdb84b..61357ef77a 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -572,9 +572,18 @@ class Profile
 		if (is_null($r)) {
 			$s = DBA::p(
 				"SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
-				INNER JOIN `contact` ON `contact`.`id` = `event`.`cid`
+				INNER JOIN `contact`
+					ON `contact`.`id` = `event`.`cid`
+					AND (`contact`.`rel` = ? OR `contact`.`rel` = ?)
+					AND NOT `contact`.`pending`
+					AND NOT `contact`.`hidden`
+					AND NOT `contact`.`blocked`
+					AND NOT `contact`.`archive`
+					AND NOT `contact`.`deleted`
 				WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ?
 				ORDER BY `start` ASC ",
+				Contact::SHARING,
+				Contact::FRIEND,
 				local_user(),
 				DateTimeFormat::utc('now + 6 days'),
 				DateTimeFormat::utcNow()
@@ -749,7 +758,7 @@ class Profile
 				$profile['gender'] = [L10n::t('Gender:'), $a->profile['gender']];
 			}
 
-			if (($a->profile['dob']) && ($a->profile['dob'] > '0001-01-01')) {
+			if (!empty($a->profile['dob']) && $a->profile['dob'] > DBA::NULL_DATE) {
 				$year_bd_format = L10n::t('j F, Y');
 				$short_bd_format = L10n::t('j F');
 
@@ -763,7 +772,7 @@ class Profile
 			}
 
 			if (!empty($a->profile['dob'])
-				&& $a->profile['dob'] > '0001-01-01'
+				&& $a->profile['dob'] > DBA::NULL_DATE
 				&& $age = Temporal::getAgeByTimezone($a->profile['dob'], $a->profile['timezone'], '')
 			) {
 				$profile['age'] = [L10n::t('Age:'), $age];
diff --git a/src/Model/Term.php b/src/Model/Term.php
index 2870eb167d..3718887122 100644
--- a/src/Model/Term.php
+++ b/src/Model/Term.php
@@ -140,6 +140,7 @@ class Term
 
 				$type = TERM_HASHTAG;
 				$term = substr($tag, 1);
+				$link = '';
 			} elseif ((substr(trim($tag), 0, 1) == '@') || (substr(trim($tag), 0, 1) == '!')) {
 				$type = TERM_MENTION;
 
@@ -152,6 +153,7 @@ class Term
 			} else { // This shouldn't happen
 				$type = TERM_HASHTAG;
 				$term = $tag;
+				$link = '';
 			}
 
 			if (DBA::exists('term', ['uid' => $message['uid'], 'otype' => TERM_OBJ_POST, 'oid' => $itemid, 'url' => $link])) {
@@ -262,29 +264,29 @@ class Term
 		);
 
 		while ($tag = DBA::fetch($taglist)) {
-			if ($tag["url"] == "") {
-				$tag["url"] = $searchpath . $tag["term"];
+			if ($tag['url'] == '') {
+				$tag['url'] = $searchpath . rawurlencode($tag['term']);
 			}
 
-			$orig_tag = $tag["url"];
+			$orig_tag = $tag['url'];
 
 			$author = ['uid' => 0, 'id' => $item['author-id'],
 				'network' => $item['author-network'], 'url' => $item['author-link']];
-			$tag["url"] = Contact::magicLinkByContact($author, $tag['url']);
+			$tag['url'] = Contact::magicLinkByContact($author, $tag['url']);
 
-			if ($tag["type"] == TERM_HASHTAG) {
-				if ($orig_tag != $tag["url"]) {
-					$item['body'] = str_replace($orig_tag, $tag["url"], $item['body']);
+			if ($tag['type'] == TERM_HASHTAG) {
+				if ($orig_tag != $tag['url']) {
+					$item['body'] = str_replace($orig_tag, $tag['url'], $item['body']);
 				}
 
-				$return['hashtags'][] = "#<a href=\"" . $tag["url"] . "\" target=\"_blank\">" . $tag["term"] . "</a>";
-				$prefix = "#";
-			} elseif ($tag["type"] == TERM_MENTION) {
-				$return['mentions'][] = "@<a href=\"" . $tag["url"] . "\" target=\"_blank\">" . $tag["term"] . "</a>";
-				$prefix = "@";
+				$return['hashtags'][] = '#<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
+				$prefix = '#';
+			} elseif ($tag['type'] == TERM_MENTION) {
+				$return['mentions'][] = '@<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
+				$prefix = '@';
 			}
 
-			$return['tags'][] = $prefix . "<a href=\"" . $tag["url"] . "\" target=\"_blank\">" . $tag["term"] . "</a>";
+			$return['tags'][] = $prefix . '<a href="' . $tag['url'] . '" target="_blank">' . $tag['term'] . '</a>';
 		}
 		DBA::close($taglist);
 
diff --git a/src/Model/User.php b/src/Model/User.php
index 0f397aadc2..aef4bcbfc2 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -9,6 +9,7 @@ use DivineOmega\PasswordExposed;
 use Exception;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
@@ -732,7 +733,7 @@ class User
 			Dear %1$s,
 				Thank you for registering at %2$s. Your account has been created.
 		',
-			$preamble, $user['username'], $sitename
+			$user['username'], $sitename
 		));
 		$body = Strings::deindent(L10n::t('
 			The login details are as follows:
@@ -782,7 +783,7 @@ class User
 	public static function remove($uid)
 	{
 		if (!$uid) {
-			return;
+			return false;
 		}
 
 		$a = get_app();
@@ -791,28 +792,24 @@ class User
 
 		$user = DBA::selectFirst('user', [], ['uid' => $uid]);
 
-		Addon::callHooks('remove_user', $user);
+		Hook::callAll('remove_user', $user);
 
 		// save username (actually the nickname as it is guaranteed
 		// unique), so it cannot be re-registered in the future.
 		DBA::insert('userd', ['username' => $user['nickname']]);
 
 		// The user and related data will be deleted in "cron_expire_and_remove_users" (cronjobs.php)
-		DBA::update('user', ['account_removed' => true, 'account_expires_on' => DateTimeFormat::utc(DateTimeFormat::utcNow() . " + 7 day")], ['uid' => $uid]);
-		Worker::add(PRIORITY_HIGH, "Notifier", "removeme", $uid);
+		DBA::update('user', ['account_removed' => true, 'account_expires_on' => DateTimeFormat::utc('now + 7 day')], ['uid' => $uid]);
+		Worker::add(PRIORITY_HIGH, 'Notifier', 'removeme', $uid);
 
 		// Send an update to the directory
 		$self = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
-		Worker::add(PRIORITY_LOW, "Directory", $self['url']);
+		Worker::add(PRIORITY_LOW, 'Directory', $self['url']);
 
 		// Remove the user relevant data
-		Worker::add(PRIORITY_LOW, "RemoveUser", $uid);
+		Worker::add(PRIORITY_LOW, 'RemoveUser', $uid);
 
-		if ($uid == local_user()) {
-			unset($_SESSION['authenticated']);
-			unset($_SESSION['uid']);
-			$a->internalRedirect();
-		}
+		return true;
 	}
 
 	/**
diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 80e9c73b63..ec7e896925 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -570,12 +570,12 @@ class Contact extends BaseModule
 			/// @todo Only show the following link with DFRN when the remote version supports it
 			$follow = '';
 			$follow_text = '';
-			if (in_array($contact['rel'], [Model\Contact::FRIEND, Model\Contact::SHARING])) {
+			if ($contact['uid'] && in_array($contact['rel'], [Model\Contact::FRIEND, Model\Contact::SHARING])) {
 				if (in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
 					$follow = $a->getBaseURL(true) . '/unfollow?url=' . urlencode($contact['url']);
 					$follow_text = L10n::t('Disconnect/Unfollow');
 				}
-			} else {
+			} elseif(!$contact['pending']) {
 				$follow = $a->getBaseURL(true) . '/follow?url=' . urlencode($contact['url']);
 				$follow_text = L10n::t('Connect/Follow');
 			}
diff --git a/src/Network/CurlResult.php b/src/Network/CurlResult.php
index dd98853ae8..b2587799d1 100644
--- a/src/Network/CurlResult.php
+++ b/src/Network/CurlResult.php
@@ -4,6 +4,7 @@ namespace Friendica\Network;
 
 use Friendica\Core\Logger;
 use Friendica\Network\HTTPException\InternalServerErrorException;
+use Friendica\Util\Network;
 
 /**
  * A content class for Curl call results
@@ -159,28 +160,22 @@ class CurlResult
 		}
 
 		if ($this->returnCode == 301 || $this->returnCode == 302 || $this->returnCode == 303 || $this->returnCode== 307) {
-			$new_location_info = (!array_key_exists('redirect_url', $this->info) ? '' : @parse_url($this->info['redirect_url']));
-			$old_location_info = (!array_key_exists('url', $this->info) ? '' : @parse_url($this->info['url']));
-
-			$this->redirectUrl = $new_location_info;
-
-			if (empty($new_location_info['path']) && !empty($new_location_info['host'])) {
-				$this->redirectUrl = $new_location_info['scheme'] . '://' . $new_location_info['host'] . $old_location_info['path'];
+			$redirect_parts = parse_url(defaults($this->info, 'redirect_url', ''));
+			if (preg_match('/(Location:|URI:)(.*?)\n/i', $this->header, $matches)) {
+				$redirect_parts = array_merge($redirect_parts, parse_url(trim(array_pop($matches))));
 			}
 
-			$matches = [];
+			$parts = parse_url(defaults($this->info, 'url', ''));
 
-			if (preg_match('/(Location:|URI:)(.*?)\n/i', $this->header, $matches)) {
-				$this->redirectUrl = trim(array_pop($matches));
-			}
-			if (strpos($this->redirectUrl, '/') === 0) {
-				$this->redirectUrl = $old_location_info["scheme"] . "://" . $old_location_info["host"] . $this->redirectUrl;
+			/// @todo Checking the corresponding RFC which parts of a redirect can be ommitted.
+			$components = ['scheme', 'host', 'path', 'query', 'fragment'];
+			foreach ($components as $component) {
+				if (empty($redirect_parts[$component]) && !empty($parts[$component])) {
+					$redirect_parts[$component] = $parts[$component];
+				}
 			}
-			$old_location_query = @parse_url($this->url, PHP_URL_QUERY);
 
-			if ($old_location_query != '') {
-				$this->redirectUrl .= '?' . $old_location_query;
-			}
+			$this->redirectUrl = Network::unparseURL($redirect_parts);
 
 			$this->isRedirectUrl = filter_var($this->redirectUrl, FILTER_VALIDATE_URL) !== false;
 		} else {
diff --git a/src/Object/OEmbed.php b/src/Object/OEmbed.php
index 20f27ae0bf..bd336f7583 100644
--- a/src/Object/OEmbed.php
+++ b/src/Object/OEmbed.php
@@ -42,6 +42,17 @@ class OEmbed
 		}
 
 		foreach ($properties as $key => $value) {
+			if (in_array($key, ['thumbnail_width', 'thumbnail_height', 'width', 'height'])) {
+				// These values should be numbers, so ensure that they really are numbers.
+				$value = (int)$value;
+			} elseif ($key != 'html') {
+				// Avoid being able to inject some ugly stuff through these fields.
+				$value = htmlentities($value);
+			} else {
+				/// @todo Add a way to sanitize the html as well, possibly with an <iframe>?
+				$value = mb_convert_encoding($value, 'HTML-ENTITIES', mb_detect_encoding($value));
+			}
+
 			if (property_exists(__CLASS__, $key)) {
 				$this->{$key} = $value;
 			}
diff --git a/src/Object/Post.php b/src/Object/Post.php
index 8b17a3b85e..e7a9e6b020 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -270,34 +270,36 @@ class Post extends BaseObject
 		$tagger = '';
 
 		if ($this->isToplevel()) {
-			$thread = Item::selectFirstThreadForUser(local_user(), ['ignored'], ['iid' => $item['id']]);
-			if (DBA::isResult($thread)) {
-				$ignore = [
-					'do'        => L10n::t("ignore thread"),
-					'undo'      => L10n::t("unignore thread"),
-					'toggle'    => L10n::t("toggle ignore status"),
-					'classdo'   => $thread['ignored'] ? "hidden" : "",
-					'classundo' => $thread['ignored'] ? "" : "hidden",
-					'ignored'   => L10n::t('ignored'),
-				];
-			}
+			if(local_user()) {
+				$thread = Item::selectFirstThreadForUser(local_user(), ['ignored'], ['iid' => $item['id']]);
+				if (DBA::isResult($thread)) {
+					$ignore = [
+						'do'        => L10n::t("ignore thread"),
+						'undo'      => L10n::t("unignore thread"),
+						'toggle'    => L10n::t("toggle ignore status"),
+						'classdo'   => $thread['ignored'] ? "hidden" : "",
+						'classundo' => $thread['ignored'] ? "" : "hidden",
+						'ignored'   => L10n::t('ignored'),
+					];
+				}
 
-			if ($conv->getProfileOwner() == local_user() && ($item['uid'] != 0)) {
-				$isstarred = (($item['starred']) ? "starred" : "unstarred");
-
-				$star = [
-					'do'        => L10n::t("add star"),
-					'undo'      => L10n::t("remove star"),
-					'toggle'    => L10n::t("toggle star status"),
-					'classdo'   => $item['starred'] ? "hidden" : "",
-					'classundo' => $item['starred'] ? "" : "hidden",
-					'starred'   => L10n::t('starred'),
-				];
-
-				$tagger = [
-					'add'   => L10n::t("add tag"),
-					'class' => "",
-				];
+				if ($conv->getProfileOwner() == local_user() && ($item['uid'] != 0)) {
+					$isstarred = (($item['starred']) ? "starred" : "unstarred");
+
+					$star = [
+						'do'        => L10n::t("add star"),
+						'undo'      => L10n::t("remove star"),
+						'toggle'    => L10n::t("toggle star status"),
+						'classdo'   => $item['starred'] ? "hidden" : "",
+						'classundo' => $item['starred'] ? "" : "hidden",
+						'starred'   => L10n::t('starred'),
+					];
+
+					$tagger = [
+						'add'   => L10n::t("add tag"),
+						'class' => "",
+					];
+				}
 			}
 		} else {
 			$indent = 'comment';
diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 686ac8be32..c074e49f6c 100644
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -309,6 +309,16 @@ class Receiver
 
 		}
 
+		// Don't trust the source if "actor" differs from "attributedTo". The content could be forged.
+		if ($trust_source && ($type == 'as:Create') && is_array($activity['as:object'])) {
+			$actor = JsonLD::fetchElement($activity, 'as:actor');
+			$attributed_to = JsonLD::fetchElement($activity['as:object'], 'as:attributedTo');
+			$trust_source = ($actor == $attributed_to);
+			if (!$trust_source) {
+				Logger::log('Not trusting actor: ' . $actor . '. It differs from attributedTo: ' . $attributed_to, Logger::DEBUG);
+			}
+		}
+
 		// $trust_source is called by reference and is set to true if the content was retrieved successfully
 		$object_data = self::prepareObjectData($activity, $uid, $trust_source);
 		if (empty($object_data)) {
diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index 64b98e17e7..22c8a3518e 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -27,6 +27,7 @@ use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Diaspora;
 use Friendica\Core\Cache;
 use Friendica\Util\Map;
+use Friendica\Util\Network;
 
 require_once 'include/api.php';
 
@@ -446,6 +447,10 @@ class Transmitter
 
 		$contacts = DBA::select('contact', ['url'], $condition);
 		while ($contact = DBA::fetch($contacts)) {
+			if (Network::isUrlBlocked($contact['url'])) {
+				continue;
+			}
+
 			$profile = APContact::getByURL($contact['url'], false);
 			if (!empty($profile)) {
 				if (empty($profile['sharedinbox']) || $personal) {
@@ -493,6 +498,10 @@ class Transmitter
 			$blindcopy = in_array($element, ['bto', 'bcc']);
 
 			foreach ($permissions[$element] as $receiver) {
+				if (Network::isUrlBlocked($receiver)) {
+					continue;
+				}
+
 				if ($receiver == $item_profile['followers']) {
 					$inboxes = array_merge($inboxes, self::fetchTargetInboxesforUser($uid, $personal));
 				} else {
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index ff50811838..b67b7c021f 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -16,7 +16,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
@@ -690,7 +689,7 @@ class DFRN
 			XML::addElement($doc, $author, "poco:displayName", $profile["name"]);
 			XML::addElement($doc, $author, "poco:updated", $namdate);
 
-			if (trim($profile["dob"]) > '0001-01-01') {
+			if (trim($profile["dob"]) > DBA::NULL_DATE) {
 				XML::addElement($doc, $author, "poco:birthday", "0000-".date("m-d", strtotime($profile["dob"])));
 			}
 
@@ -1510,43 +1509,6 @@ class DFRN
 		return intval($res->status);
 	}
 
-	/**
-	 * @brief Add new birthday event for this person
-	 *
-	 * @param array  $contact  Contact record
-	 * @param string $birthday Birthday of the contact
-	 * @return void
-	 * @todo Add array type-hint for $contact
-	 */
-	private static function birthdayEvent($contact, $birthday)
-	{
-		// Check for duplicates
-		$condition = ['uid' => $contact['uid'], 'cid' => $contact['id'],
-			'start' => DateTimeFormat::utc($birthday), 'type' => 'birthday'];
-		if (DBA::exists('event', $condition)) {
-			return;
-		}
-
-		Logger::log('updating birthday: ' . $birthday . ' for contact ' . $contact['id']);
-
-		$bdtext = L10n::t('%s\'s birthday', $contact['name']);
-		$bdtext2 = L10n::t('Happy Birthday %s', ' [url=' . $contact['url'] . ']' . $contact['name'] . '[/url]');
-
-		$r = q(
-			"INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`)
-			VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
-			intval($contact['uid']),
-			intval($contact['id']),
-			DBA::escape(DateTimeFormat::utcNow()),
-			DBA::escape(DateTimeFormat::utcNow()),
-			DBA::escape(DateTimeFormat::utc($birthday)),
-			DBA::escape(DateTimeFormat::utc($birthday . ' + 1 day ')),
-			DBA::escape($bdtext),
-			DBA::escape($bdtext2),
-			DBA::escape('birthday')
-		);
-	}
-
 	/**
 	 * @brief Fetch the author data from head or entry items
 	 *
@@ -1722,9 +1684,9 @@ class DFRN
 			// "poco:birthday" is the birthday in the format "yyyy-mm-dd"
 			$value = XML::getFirstNodeValue($xpath, $element . "/poco:birthday/text()", $context);
 
-			if (!in_array($value, ["", "0000-00-00", "0001-01-01"])) {
+			if (!in_array($value, ["", "0000-00-00", DBA::NULL_DATE])) {
 				$bdyear = date("Y");
-				$value = str_replace("0000", $bdyear, $value);
+				$value = str_replace(["0000", "0001"], $bdyear, $value);
 
 				if (strtotime($value) < time()) {
 					$value = str_replace($bdyear, $bdyear + 1, $value);
@@ -1737,7 +1699,7 @@ class DFRN
 			$contact = array_merge($contact_old, $poco);
 
 			if ($contact_old["bdyear"] != $contact["bdyear"]) {
-				self::birthdayEvent($contact, $birthday);
+				Event::createBirthday($contact, $birthday);
 			}
 
 			// Get all field names
diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index d63b57b8c9..5939e5ce1a 100644
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -350,7 +350,7 @@ class Feed {
 					$tags .= ', ';
 				}
 
-				$taglink = "#[url=" . System::baseUrl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url]";
+				$taglink = "#[url=" . System::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url]";
 				$tags .= $taglink;
 			}
 
diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 875880a936..45000d7700 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -634,15 +634,15 @@ class OStatus
 		if ($categories) {
 			foreach ($categories as $category) {
 				foreach ($category->attributes as $attributes) {
-					if ($attributes->name == "term") {
+					if ($attributes->name == 'term') {
 						$term = $attributes->textContent;
-						if (!empty($item["tag"])) {
-							$item["tag"] .= ',';
+						if (!empty($item['tag'])) {
+							$item['tag'] .= ',';
 						} else {
-							$item["tag"] = '';
+							$item['tag'] = '';
 						}
 
-						$item["tag"] .= "#[url=".System::baseUrl()."/search?tag=".$term."]".$term."[/url]";
+						$item['tag'] .= '#[url=' . System::baseUrl() . '/search?tag=' . $term . ']' . $term . '[/url]';
 					}
 				}
 			}
diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index 3ae0be140d..0d56bfa5d1 100644
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -19,6 +19,7 @@ use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
 use Friendica\Util\Strings;
+use Friendica\Util\Network;
 
 require_once 'include/items.php';
 
@@ -158,6 +159,10 @@ class Delivery extends BaseObject
 			return;
 		}
 
+		if (Network::isUrlBlocked($contact['url'])) {
+			return;
+		}
+
 		// Transmit via Diaspora if the thread had started as Diaspora post
 		// This is done since the uri wouldn't match (Diaspora doesn't transmit it)
 		if (isset($parent) && ($parent['network'] == Protocol::DIASPORA) && ($contact['network'] == Protocol::DFRN)) {
diff --git a/util/messages.po b/util/messages.po
index 31408d2a54..8ec12aef9e 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-31 09:45+0100\n"
+"POT-Creation-Date: 2018-11-24 07:51+0100\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,718 +18,718 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 
-#: include/api.php:1141
+#: include/api.php:1142
 #, php-format
 msgid "Daily posting limit of %d post reached. The post was rejected."
 msgid_plural "Daily posting limit of %d posts reached. The post was rejected."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/api.php:1155
+#: include/api.php:1156
 #, php-format
 msgid "Weekly posting limit of %d post reached. The post was rejected."
 msgid_plural "Weekly posting limit of %d posts reached. The post was rejected."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/api.php:1169
+#: include/api.php:1170
 #, php-format
 msgid "Monthly posting limit of %d post reached. The post was rejected."
 msgstr ""
 
-#: include/api.php:4319 mod/photos.php:92 mod/photos.php:200 mod/photos.php:733
-#: mod/photos.php:1166 mod/photos.php:1183 mod/photos.php:1678
-#: mod/profile_photo.php:86 mod/profile_photo.php:95 mod/profile_photo.php:104
-#: mod/profile_photo.php:213 mod/profile_photo.php:302
-#: mod/profile_photo.php:312 src/Model/User.php:650 src/Model/User.php:658
-#: src/Model/User.php:666
+#: include/api.php:4335 mod/photos.php:96 mod/photos.php:204 mod/photos.php:737
+#: mod/photos.php:1170 mod/photos.php:1187 mod/photos.php:1680
+#: mod/profile_photo.php:88 mod/profile_photo.php:97 mod/profile_photo.php:106
+#: mod/profile_photo.php:215 mod/profile_photo.php:304
+#: mod/profile_photo.php:314 src/Model/User.php:651 src/Model/User.php:659
+#: src/Model/User.php:667
 msgid "Profile Photos"
 msgstr ""
 
-#: include/conversation.php:153 include/conversation.php:289
-#: include/text.php:1351
+#: include/conversation.php:156 include/conversation.php:292
+#: src/Model/Item.php:3263
 msgid "event"
 msgstr ""
 
-#: include/conversation.php:156 include/conversation.php:166
-#: include/conversation.php:292 include/conversation.php:301
-#: mod/subthread.php:88 mod/tagger.php:70
+#: include/conversation.php:159 include/conversation.php:169
+#: include/conversation.php:295 include/conversation.php:304
+#: mod/subthread.php:90 mod/tagger.php:72
 msgid "status"
 msgstr ""
 
-#: include/conversation.php:161 include/conversation.php:297
-#: include/text.php:1353 mod/subthread.php:88 mod/tagger.php:70
+#: include/conversation.php:164 include/conversation.php:300
+#: mod/subthread.php:90 mod/tagger.php:72 src/Model/Item.php:3265
 msgid "photo"
 msgstr ""
 
-#: include/conversation.php:173
+#: include/conversation.php:176
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: include/conversation.php:175
+#: include/conversation.php:178
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: include/conversation.php:177
+#: include/conversation.php:180
 #, php-format
 msgid "%1$s attends %2$s's %3$s"
 msgstr ""
 
-#: include/conversation.php:179
+#: include/conversation.php:182
 #, php-format
 msgid "%1$s doesn't attend %2$s's %3$s"
 msgstr ""
 
-#: include/conversation.php:181
+#: include/conversation.php:184
 #, php-format
 msgid "%1$s attends maybe %2$s's %3$s"
 msgstr ""
 
-#: include/conversation.php:216
+#: include/conversation.php:219
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr ""
 
-#: include/conversation.php:257
+#: include/conversation.php:260
 #, php-format
 msgid "%1$s poked %2$s"
 msgstr ""
 
-#: include/conversation.php:311 mod/tagger.php:108
+#: include/conversation.php:314 mod/tagger.php:110
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: include/conversation.php:333
+#: include/conversation.php:336
 msgid "post/item"
 msgstr ""
 
-#: include/conversation.php:334
+#: include/conversation.php:337
 #, php-format
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: include/conversation.php:548 mod/photos.php:1507 mod/profiles.php:354
+#: include/conversation.php:551 mod/photos.php:1511 mod/profiles.php:356
 msgid "Likes"
 msgstr ""
 
-#: include/conversation.php:548 mod/photos.php:1507 mod/profiles.php:358
+#: include/conversation.php:551 mod/photos.php:1511 mod/profiles.php:360
 msgid "Dislikes"
 msgstr ""
 
-#: include/conversation.php:549 include/conversation.php:1480
-#: mod/photos.php:1508
+#: include/conversation.php:552 include/conversation.php:1483
+#: mod/photos.php:1512
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/conversation.php:549 mod/photos.php:1508
+#: include/conversation.php:552 mod/photos.php:1512
 msgid "Not attending"
 msgstr ""
 
-#: include/conversation.php:549 mod/photos.php:1508
+#: include/conversation.php:552 mod/photos.php:1512
 msgid "Might attend"
 msgstr ""
 
-#: include/conversation.php:629 mod/photos.php:1564 src/Object/Post.php:196
+#: include/conversation.php:632 mod/photos.php:1568 src/Object/Post.php:206
 msgid "Select"
 msgstr ""
 
-#: include/conversation.php:630 mod/admin.php:1926 mod/photos.php:1565
-#: mod/settings.php:739 src/Module/Contact.php:822 src/Module/Contact.php:1097
+#: include/conversation.php:633 mod/admin.php:1956 mod/photos.php:1569
+#: mod/settings.php:741 src/Module/Contact.php:832 src/Module/Contact.php:1107
 msgid "Delete"
 msgstr ""
 
-#: include/conversation.php:664 src/Object/Post.php:369 src/Object/Post.php:370
+#: include/conversation.php:667 src/Object/Post.php:379 src/Object/Post.php:380
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: include/conversation.php:676 src/Object/Post.php:357
+#: include/conversation.php:679 src/Object/Post.php:367
 msgid "Categories:"
 msgstr ""
 
-#: include/conversation.php:677 src/Object/Post.php:358
+#: include/conversation.php:680 src/Object/Post.php:368
 msgid "Filed under:"
 msgstr ""
 
-#: include/conversation.php:684 src/Object/Post.php:383
+#: include/conversation.php:687 src/Object/Post.php:393
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: include/conversation.php:699
+#: include/conversation.php:702
 msgid "View in context"
 msgstr ""
 
-#: include/conversation.php:701 include/conversation.php:1148
-#: mod/editpost.php:106 mod/message.php:262 mod/message.php:425
-#: mod/photos.php:1480 mod/wallmessage.php:139 src/Object/Post.php:408
+#: include/conversation.php:704 include/conversation.php:1151
+#: mod/editpost.php:109 mod/message.php:264 mod/message.php:427
+#: mod/photos.php:1484 mod/wallmessage.php:141 src/Object/Post.php:418
 msgid "Please wait"
 msgstr ""
 
-#: include/conversation.php:765
+#: include/conversation.php:768
 msgid "remove"
 msgstr ""
 
-#: include/conversation.php:769
+#: include/conversation.php:772
 msgid "Delete Selected Items"
 msgstr ""
 
-#: include/conversation.php:869 view/theme/frio/theme.php:367
+#: include/conversation.php:872 view/theme/frio/theme.php:369
 msgid "Follow Thread"
 msgstr ""
 
-#: include/conversation.php:870 src/Model/Contact.php:949
+#: include/conversation.php:873 src/Model/Contact.php:950
 msgid "View Status"
 msgstr ""
 
-#: include/conversation.php:871 include/conversation.php:887
-#: mod/allfriends.php:75 mod/directory.php:165 mod/dirfind.php:226
-#: mod/match.php:89 mod/suggest.php:85 src/Model/Contact.php:889
-#: src/Model/Contact.php:942 src/Model/Contact.php:950
+#: include/conversation.php:874 include/conversation.php:890
+#: mod/allfriends.php:76 mod/directory.php:167 mod/dirfind.php:228
+#: mod/match.php:91 mod/suggest.php:86 src/Model/Contact.php:890
+#: src/Model/Contact.php:943 src/Model/Contact.php:951
 msgid "View Profile"
 msgstr ""
 
-#: include/conversation.php:872 src/Model/Contact.php:951
+#: include/conversation.php:875 src/Model/Contact.php:952
 msgid "View Photos"
 msgstr ""
 
-#: include/conversation.php:873 src/Model/Contact.php:943
-#: src/Model/Contact.php:952
+#: include/conversation.php:876 src/Model/Contact.php:944
+#: src/Model/Contact.php:953
 msgid "Network Posts"
 msgstr ""
 
-#: include/conversation.php:874 src/Model/Contact.php:944
-#: src/Model/Contact.php:953
+#: include/conversation.php:877 src/Model/Contact.php:945
+#: src/Model/Contact.php:954
 msgid "View Contact"
 msgstr ""
 
-#: include/conversation.php:875 src/Model/Contact.php:955
+#: include/conversation.php:878 src/Model/Contact.php:956
 msgid "Send PM"
 msgstr ""
 
-#: include/conversation.php:879 src/Model/Contact.php:956
+#: include/conversation.php:882 src/Model/Contact.php:957
 msgid "Poke"
 msgstr ""
 
-#: include/conversation.php:884 mod/allfriends.php:76 mod/dirfind.php:227
-#: mod/follow.php:145 mod/match.php:90 mod/suggest.php:86
-#: view/theme/vier/theme.php:199 src/Content/Widget.php:61
-#: src/Model/Contact.php:945 src/Module/Contact.php:578
+#: include/conversation.php:887 mod/allfriends.php:77 mod/dirfind.php:229
+#: mod/follow.php:147 mod/match.php:92 mod/suggest.php:87
+#: view/theme/vier/theme.php:201 src/Content/Widget.php:65
+#: src/Model/Contact.php:946 src/Module/Contact.php:580
 msgid "Connect/Follow"
 msgstr ""
 
-#: include/conversation.php:1002
+#: include/conversation.php:1005
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: include/conversation.php:1005
+#: include/conversation.php:1008
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: include/conversation.php:1008
+#: include/conversation.php:1011
 #, php-format
 msgid "%s attends."
 msgstr ""
 
-#: include/conversation.php:1011
+#: include/conversation.php:1014
 #, php-format
 msgid "%s doesn't attend."
 msgstr ""
 
-#: include/conversation.php:1014
+#: include/conversation.php:1017
 #, php-format
 msgid "%s attends maybe."
 msgstr ""
 
-#: include/conversation.php:1025
+#: include/conversation.php:1028
 msgid "and"
 msgstr ""
 
-#: include/conversation.php:1031
+#: include/conversation.php:1034
 #, php-format
 msgid "and %d other people"
 msgstr ""
 
-#: include/conversation.php:1040
+#: include/conversation.php:1043
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this"
 msgstr ""
 
-#: include/conversation.php:1041
+#: include/conversation.php:1044
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: include/conversation.php:1044
+#: include/conversation.php:1047
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this"
 msgstr ""
 
-#: include/conversation.php:1045
+#: include/conversation.php:1048
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: include/conversation.php:1048
+#: include/conversation.php:1051
 #, php-format
 msgid "<span  %1$s>%2$d people</span> attend"
 msgstr ""
 
-#: include/conversation.php:1049
+#: include/conversation.php:1052
 #, php-format
 msgid "%s attend."
 msgstr ""
 
-#: include/conversation.php:1052
+#: include/conversation.php:1055
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't attend"
 msgstr ""
 
-#: include/conversation.php:1053
+#: include/conversation.php:1056
 #, php-format
 msgid "%s don't attend."
 msgstr ""
 
-#: include/conversation.php:1056
+#: include/conversation.php:1059
 #, php-format
 msgid "<span  %1$s>%2$d people</span> attend maybe"
 msgstr ""
 
-#: include/conversation.php:1057
+#: include/conversation.php:1060
 #, php-format
 msgid "%s attend maybe."
 msgstr ""
 
-#: include/conversation.php:1087
+#: include/conversation.php:1090
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: include/conversation.php:1088 src/Object/Post.php:811
+#: include/conversation.php:1091 src/Object/Post.php:822
 msgid "Please enter a image/video/audio/webpage URL:"
 msgstr ""
 
-#: include/conversation.php:1089
+#: include/conversation.php:1092
 msgid "Tag term:"
 msgstr ""
 
-#: include/conversation.php:1090 mod/filer.php:34
+#: include/conversation.php:1093 mod/filer.php:37
 msgid "Save to Folder:"
 msgstr ""
 
-#: include/conversation.php:1091
+#: include/conversation.php:1094
 msgid "Where are you right now?"
 msgstr ""
 
-#: include/conversation.php:1092
+#: include/conversation.php:1095
 msgid "Delete item(s)?"
 msgstr ""
 
-#: include/conversation.php:1124
+#: include/conversation.php:1127
 msgid "New Post"
 msgstr ""
 
-#: include/conversation.php:1127
+#: include/conversation.php:1130
 msgid "Share"
 msgstr ""
 
-#: include/conversation.php:1128 mod/editpost.php:92 mod/message.php:260
-#: mod/message.php:422 mod/wallmessage.php:137
+#: include/conversation.php:1131 mod/editpost.php:95 mod/message.php:262
+#: mod/message.php:424 mod/wallmessage.php:139
 msgid "Upload photo"
 msgstr ""
 
-#: include/conversation.php:1129 mod/editpost.php:93
+#: include/conversation.php:1132 mod/editpost.php:96
 msgid "upload photo"
 msgstr ""
 
-#: include/conversation.php:1130 mod/editpost.php:94
+#: include/conversation.php:1133 mod/editpost.php:97
 msgid "Attach file"
 msgstr ""
 
-#: include/conversation.php:1131 mod/editpost.php:95
+#: include/conversation.php:1134 mod/editpost.php:98
 msgid "attach file"
 msgstr ""
 
-#: include/conversation.php:1132 src/Object/Post.php:803
+#: include/conversation.php:1135 src/Object/Post.php:814
 msgid "Bold"
 msgstr ""
 
-#: include/conversation.php:1133 src/Object/Post.php:804
+#: include/conversation.php:1136 src/Object/Post.php:815
 msgid "Italic"
 msgstr ""
 
-#: include/conversation.php:1134 src/Object/Post.php:805
+#: include/conversation.php:1137 src/Object/Post.php:816
 msgid "Underline"
 msgstr ""
 
-#: include/conversation.php:1135 src/Object/Post.php:806
+#: include/conversation.php:1138 src/Object/Post.php:817
 msgid "Quote"
 msgstr ""
 
-#: include/conversation.php:1136 src/Object/Post.php:807
+#: include/conversation.php:1139 src/Object/Post.php:818
 msgid "Code"
 msgstr ""
 
-#: include/conversation.php:1137 src/Object/Post.php:808
+#: include/conversation.php:1140 src/Object/Post.php:819
 msgid "Image"
 msgstr ""
 
-#: include/conversation.php:1138 src/Object/Post.php:809
+#: include/conversation.php:1141 src/Object/Post.php:820
 msgid "Link"
 msgstr ""
 
-#: include/conversation.php:1139 src/Object/Post.php:810
+#: include/conversation.php:1142 src/Object/Post.php:821
 msgid "Link or Media"
 msgstr ""
 
-#: include/conversation.php:1140 mod/editpost.php:102
+#: include/conversation.php:1143 mod/editpost.php:105
 msgid "Set your location"
 msgstr ""
 
-#: include/conversation.php:1141 mod/editpost.php:103
+#: include/conversation.php:1144 mod/editpost.php:106
 msgid "set location"
 msgstr ""
 
-#: include/conversation.php:1142 mod/editpost.php:104
+#: include/conversation.php:1145 mod/editpost.php:107
 msgid "Clear browser location"
 msgstr ""
 
-#: include/conversation.php:1143 mod/editpost.php:105
+#: include/conversation.php:1146 mod/editpost.php:108
 msgid "clear location"
 msgstr ""
 
-#: include/conversation.php:1145 mod/editpost.php:120
+#: include/conversation.php:1148 mod/editpost.php:123
 msgid "Set title"
 msgstr ""
 
-#: include/conversation.php:1147 mod/editpost.php:122
+#: include/conversation.php:1150 mod/editpost.php:125
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: include/conversation.php:1149 mod/editpost.php:107
+#: include/conversation.php:1152 mod/editpost.php:110
 msgid "Permission settings"
 msgstr ""
 
-#: include/conversation.php:1150 mod/editpost.php:137
+#: include/conversation.php:1153 mod/editpost.php:140
 msgid "permissions"
 msgstr ""
 
-#: include/conversation.php:1159 mod/editpost.php:117
+#: include/conversation.php:1162 mod/editpost.php:120
 msgid "Public post"
 msgstr ""
 
-#: include/conversation.php:1163 mod/editpost.php:128 mod/events.php:555
-#: mod/photos.php:1498 mod/photos.php:1537 mod/photos.php:1597
-#: src/Object/Post.php:812
+#: include/conversation.php:1166 mod/editpost.php:131 mod/events.php:557
+#: mod/photos.php:1502 mod/photos.php:1541 mod/photos.php:1601
+#: src/Object/Post.php:823
 msgid "Preview"
 msgstr ""
 
-#: include/conversation.php:1167 include/items.php:400 mod/fbrowser.php:104
-#: mod/fbrowser.php:135 mod/dfrn_request.php:656 mod/editpost.php:131
-#: mod/follow.php:163 mod/message.php:153 mod/photos.php:256 mod/photos.php:328
-#: mod/settings.php:679 mod/settings.php:705 mod/suggest.php:43
-#: mod/tagrm.php:19 mod/tagrm.php:112 mod/unfollow.php:132 mod/videos.php:141
-#: src/Module/Contact.php:450
+#: include/conversation.php:1170 include/items.php:402 mod/dfrn_request.php:658
+#: mod/editpost.php:134 mod/fbrowser.php:105 mod/fbrowser.php:136
+#: mod/follow.php:165 mod/message.php:155 mod/photos.php:260 mod/photos.php:332
+#: mod/settings.php:681 mod/settings.php:707 mod/suggest.php:44
+#: mod/tagrm.php:20 mod/tagrm.php:113 mod/unfollow.php:134 mod/videos.php:142
+#: src/Module/Contact.php:452
 msgid "Cancel"
 msgstr ""
 
-#: include/conversation.php:1172
+#: include/conversation.php:1175
 msgid "Post to Groups"
 msgstr ""
 
-#: include/conversation.php:1173
+#: include/conversation.php:1176
 msgid "Post to Contacts"
 msgstr ""
 
-#: include/conversation.php:1174
+#: include/conversation.php:1177
 msgid "Private post"
 msgstr ""
 
-#: include/conversation.php:1179 mod/editpost.php:135 src/Model/Profile.php:358
+#: include/conversation.php:1182 mod/editpost.php:138 src/Model/Profile.php:361
 msgid "Message"
 msgstr ""
 
-#: include/conversation.php:1180 mod/editpost.php:136
+#: include/conversation.php:1183 mod/editpost.php:139
 msgid "Browser"
 msgstr ""
 
-#: include/conversation.php:1451
+#: include/conversation.php:1454
 msgid "View all"
 msgstr ""
 
-#: include/conversation.php:1474
+#: include/conversation.php:1477
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/conversation.php:1477
+#: include/conversation.php:1480
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/conversation.php:1483
+#: include/conversation.php:1486
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/conversation.php:1486 src/Content/ContactSelector.php:147
+#: include/conversation.php:1489 src/Content/ContactSelector.php:148
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/enotify.php:53
+#: include/enotify.php:55
 msgid "Friendica Notification"
 msgstr ""
 
-#: include/enotify.php:56
+#: include/enotify.php:58
 msgid "Thank You,"
 msgstr ""
 
-#: include/enotify.php:59
+#: include/enotify.php:61
 #, php-format
 msgid "%1$s, %2$s Administrator"
 msgstr ""
 
-#: include/enotify.php:61
+#: include/enotify.php:63
 #, php-format
 msgid "%s Administrator"
 msgstr ""
 
-#: include/enotify.php:124
+#: include/enotify.php:126
 #, php-format
 msgid "[Friendica:Notify] New mail received at %s"
 msgstr ""
 
-#: include/enotify.php:126
+#: include/enotify.php:128
 #, php-format
 msgid "%1$s sent you a new private message at %2$s."
 msgstr ""
 
-#: include/enotify.php:127
+#: include/enotify.php:129
 msgid "a private message"
 msgstr ""
 
-#: include/enotify.php:127
+#: include/enotify.php:129
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: include/enotify.php:129
+#: include/enotify.php:131
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: include/enotify.php:163
+#: include/enotify.php:165
 #, php-format
 msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
 msgstr ""
 
-#: include/enotify.php:171
+#: include/enotify.php:173
 #, php-format
 msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
 msgstr ""
 
-#: include/enotify.php:181
+#: include/enotify.php:183
 #, php-format
 msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
 msgstr ""
 
-#: include/enotify.php:193
+#: include/enotify.php:195
 #, php-format
 msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: include/enotify.php:195
+#: include/enotify.php:197
 #, php-format
 msgid "%s commented on an item/conversation you have been following."
 msgstr ""
 
-#: include/enotify.php:198 include/enotify.php:213 include/enotify.php:228
-#: include/enotify.php:243 include/enotify.php:262 include/enotify.php:278
+#: include/enotify.php:200 include/enotify.php:215 include/enotify.php:230
+#: include/enotify.php:245 include/enotify.php:264 include/enotify.php:280
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: include/enotify.php:205
+#: include/enotify.php:207
 #, php-format
 msgid "[Friendica:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: include/enotify.php:207
+#: include/enotify.php:209
 #, php-format
 msgid "%1$s posted to your profile wall at %2$s"
 msgstr ""
 
-#: include/enotify.php:208
+#: include/enotify.php:210
 #, php-format
 msgid "%1$s posted to [url=%2$s]your wall[/url]"
 msgstr ""
 
-#: include/enotify.php:220
+#: include/enotify.php:222
 #, php-format
 msgid "[Friendica:Notify] %s tagged you"
 msgstr ""
 
-#: include/enotify.php:222
+#: include/enotify.php:224
 #, php-format
 msgid "%1$s tagged you at %2$s"
 msgstr ""
 
-#: include/enotify.php:223
+#: include/enotify.php:225
 #, php-format
 msgid "%1$s [url=%2$s]tagged you[/url]."
 msgstr ""
 
-#: include/enotify.php:235
+#: include/enotify.php:237
 #, php-format
 msgid "[Friendica:Notify] %s shared a new post"
 msgstr ""
 
-#: include/enotify.php:237
+#: include/enotify.php:239
 #, php-format
 msgid "%1$s shared a new post at %2$s"
 msgstr ""
 
-#: include/enotify.php:238
+#: include/enotify.php:240
 #, php-format
 msgid "%1$s [url=%2$s]shared a post[/url]."
 msgstr ""
 
-#: include/enotify.php:250
+#: include/enotify.php:252
 #, php-format
 msgid "[Friendica:Notify] %1$s poked you"
 msgstr ""
 
-#: include/enotify.php:252
+#: include/enotify.php:254
 #, php-format
 msgid "%1$s poked you at %2$s"
 msgstr ""
 
-#: include/enotify.php:253
+#: include/enotify.php:255
 #, php-format
 msgid "%1$s [url=%2$s]poked you[/url]."
 msgstr ""
 
-#: include/enotify.php:270
+#: include/enotify.php:272
 #, php-format
 msgid "[Friendica:Notify] %s tagged your post"
 msgstr ""
 
-#: include/enotify.php:272
+#: include/enotify.php:274
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr ""
 
-#: include/enotify.php:273
+#: include/enotify.php:275
 #, php-format
 msgid "%1$s tagged [url=%2$s]your post[/url]"
 msgstr ""
 
-#: include/enotify.php:285
+#: include/enotify.php:287
 msgid "[Friendica:Notify] Introduction received"
 msgstr ""
 
-#: include/enotify.php:287
+#: include/enotify.php:289
 #, php-format
 msgid "You've received an introduction from '%1$s' at %2$s"
 msgstr ""
 
-#: include/enotify.php:288
+#: include/enotify.php:290
 #, php-format
 msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
 msgstr ""
 
-#: include/enotify.php:293 include/enotify.php:339
+#: include/enotify.php:295 include/enotify.php:341
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr ""
 
-#: include/enotify.php:295
+#: include/enotify.php:297
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr ""
 
-#: include/enotify.php:302
+#: include/enotify.php:304
 msgid "[Friendica:Notify] A new person is sharing with you"
 msgstr ""
 
-#: include/enotify.php:304 include/enotify.php:305
+#: include/enotify.php:306 include/enotify.php:307
 #, php-format
 msgid "%1$s is sharing with you at %2$s"
 msgstr ""
 
-#: include/enotify.php:312
+#: include/enotify.php:314
 msgid "[Friendica:Notify] You have a new follower"
 msgstr ""
 
-#: include/enotify.php:314 include/enotify.php:315
+#: include/enotify.php:316 include/enotify.php:317
 #, php-format
 msgid "You have a new follower at %2$s : %1$s"
 msgstr ""
 
-#: include/enotify.php:328
+#: include/enotify.php:330
 msgid "[Friendica:Notify] Friend suggestion received"
 msgstr ""
 
-#: include/enotify.php:330
+#: include/enotify.php:332
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr ""
 
-#: include/enotify.php:331
+#: include/enotify.php:333
 #, php-format
 msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
 msgstr ""
 
-#: include/enotify.php:337
+#: include/enotify.php:339
 msgid "Name:"
 msgstr ""
 
-#: include/enotify.php:338
+#: include/enotify.php:340
 msgid "Photo:"
 msgstr ""
 
-#: include/enotify.php:341
+#: include/enotify.php:343
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: include/enotify.php:349 include/enotify.php:364
+#: include/enotify.php:351 include/enotify.php:366
 msgid "[Friendica:Notify] Connection accepted"
 msgstr ""
 
-#: include/enotify.php:351 include/enotify.php:366
+#: include/enotify.php:353 include/enotify.php:368
 #, php-format
 msgid "'%1$s' has accepted your connection request at %2$s"
 msgstr ""
 
-#: include/enotify.php:352 include/enotify.php:367
+#: include/enotify.php:354 include/enotify.php:369
 #, php-format
 msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
 msgstr ""
 
-#: include/enotify.php:357
+#: include/enotify.php:359
 msgid ""
 "You are now mutual friends and may exchange status updates, photos, and "
 "email without restriction."
 msgstr ""
 
-#: include/enotify.php:359
+#: include/enotify.php:361
 #, php-format
 msgid "Please visit %s if you wish to make any changes to this relationship."
 msgstr ""
 
-#: include/enotify.php:372
+#: include/enotify.php:374
 #, php-format
 msgid ""
 "'%1$s' has chosen to accept you a fan, which restricts some forms of "
@@ -738,37 +738,37 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: include/enotify.php:374
+#: include/enotify.php:376
 #, php-format
 msgid ""
 "'%1$s' may choose to extend this into a two-way or more permissive "
 "relationship in the future."
 msgstr ""
 
-#: include/enotify.php:376
+#: include/enotify.php:378
 #, php-format
 msgid "Please visit %s  if you wish to make any changes to this relationship."
 msgstr ""
 
-#: include/enotify.php:386 mod/removeme.php:47
+#: include/enotify.php:388 mod/removeme.php:49
 msgid "[Friendica System Notify]"
 msgstr ""
 
-#: include/enotify.php:386
+#: include/enotify.php:388
 msgid "registration request"
 msgstr ""
 
-#: include/enotify.php:388
+#: include/enotify.php:390
 #, php-format
 msgid "You've received a registration request from '%1$s' at %2$s"
 msgstr ""
 
-#: include/enotify.php:389
+#: include/enotify.php:391
 #, php-format
 msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
 msgstr ""
 
-#: include/enotify.php:394
+#: include/enotify.php:396
 #, php-format
 msgid ""
 "Full Name:\t%s\n"
@@ -776,936 +776,831 @@ msgid ""
 "Login Name:\t%s (%s)"
 msgstr ""
 
-#: include/enotify.php:400
+#: include/enotify.php:402
 #, php-format
 msgid "Please visit %s to approve or reject the request."
 msgstr ""
 
-#: include/items.php:357 mod/admin.php:292 mod/admin.php:1984
-#: mod/admin.php:2230 mod/display.php:73 mod/display.php:251
-#: mod/display.php:347 mod/notice.php:21 mod/viewsrc.php:22
+#: include/items.php:359 mod/notice.php:21 mod/viewsrc.php:22 mod/admin.php:295
+#: mod/admin.php:2014 mod/admin.php:2260 mod/display.php:75 mod/display.php:253
+#: mod/display.php:349
 msgid "Item not found."
 msgstr ""
 
-#: include/items.php:395
+#: include/items.php:397
 msgid "Do you really want to delete this item?"
 msgstr ""
 
-#: include/items.php:397 mod/api.php:111 mod/dfrn_request.php:646
-#: mod/follow.php:152 mod/message.php:150 mod/profiles.php:540
-#: mod/profiles.php:543 mod/profiles.php:565 mod/register.php:237
-#: mod/settings.php:1098 mod/settings.php:1104 mod/settings.php:1111
-#: mod/settings.php:1115 mod/settings.php:1119 mod/settings.php:1123
-#: mod/settings.php:1127 mod/settings.php:1131 mod/settings.php:1151
-#: mod/settings.php:1152 mod/settings.php:1153 mod/settings.php:1154
-#: mod/settings.php:1155 mod/suggest.php:40 src/Module/Contact.php:447
+#: include/items.php:399 mod/api.php:112 mod/dfrn_request.php:648
+#: mod/follow.php:154 mod/message.php:152 mod/profiles.php:542
+#: mod/profiles.php:545 mod/profiles.php:567 mod/register.php:239
+#: mod/settings.php:1100 mod/settings.php:1106 mod/settings.php:1113
+#: mod/settings.php:1117 mod/settings.php:1121 mod/settings.php:1125
+#: mod/settings.php:1129 mod/settings.php:1133 mod/settings.php:1153
+#: mod/settings.php:1154 mod/settings.php:1155 mod/settings.php:1156
+#: mod/settings.php:1157 mod/suggest.php:41 src/Module/Contact.php:449
 msgid "Yes"
 msgstr ""
 
-#: include/items.php:414 mod/allfriends.php:23 mod/api.php:36 mod/api.php:41
-#: mod/attach.php:39 mod/cal.php:303 mod/common.php:28 mod/crepair.php:99
-#: mod/delegate.php:29 mod/delegate.php:47 mod/delegate.php:58
-#: mod/dfrn_confirm.php:68 mod/dirfind.php:27 mod/editpost.php:19
-#: mod/events.php:197 mod/follow.php:56 mod/follow.php:120 mod/fsuggest.php:80
-#: mod/group.php:28 mod/invite.php:23 mod/invite.php:109 mod/item.php:167
-#: mod/manage.php:131 mod/message.php:56 mod/message.php:101 mod/network.php:36
-#: mod/nogroup.php:23 mod/notes.php:33 mod/notifications.php:69
-#: mod/ostatus_subscribe.php:17 mod/photos.php:185 mod/photos.php:1060
-#: mod/poke.php:141 mod/profile_photo.php:31 mod/profile_photo.php:178
-#: mod/profile_photo.php:200 mod/profiles.php:181 mod/profiles.php:513
-#: mod/register.php:53 mod/regmod.php:91 mod/repair_ostatus.php:16
-#: mod/settings.php:46 mod/settings.php:152 mod/settings.php:668
-#: mod/suggest.php:61 mod/uimport.php:16 mod/unfollow.php:20
-#: mod/unfollow.php:75 mod/unfollow.php:107 mod/viewcontacts.php:62
-#: mod/wall_attach.php:80 mod/wall_attach.php:83 mod/wall_upload.php:105
-#: mod/wall_upload.php:108 mod/wallmessage.php:17 mod/wallmessage.php:41
-#: mod/wallmessage.php:80 mod/wallmessage.php:104 src/Module/Contact.php:363
-#: src/App.php:1876
+#: include/items.php:449 mod/attach.php:39 mod/nogroup.php:23 mod/notes.php:33
+#: mod/regmod.php:91 mod/repair_ostatus.php:16 mod/allfriends.php:24
+#: mod/api.php:37 mod/api.php:42 mod/cal.php:304 mod/common.php:29
+#: mod/crepair.php:101 mod/delegate.php:31 mod/delegate.php:49
+#: mod/delegate.php:60 mod/dfrn_confirm.php:69 mod/dirfind.php:29
+#: mod/editpost.php:22 mod/events.php:199 mod/follow.php:58 mod/follow.php:122
+#: mod/fsuggest.php:81 mod/group.php:30 mod/invite.php:25 mod/invite.php:111
+#: mod/item.php:169 mod/manage.php:132 mod/message.php:58 mod/message.php:103
+#: mod/network.php:39 mod/notifications.php:70 mod/ostatus_subscribe.php:18
+#: mod/photos.php:189 mod/photos.php:1064 mod/poke.php:144
+#: mod/profile_photo.php:33 mod/profile_photo.php:180 mod/profile_photo.php:202
+#: mod/profiles.php:183 mod/profiles.php:515 mod/register.php:55
+#: mod/settings.php:48 mod/settings.php:154 mod/settings.php:670
+#: mod/suggest.php:62 mod/uimport.php:17 mod/unfollow.php:22
+#: mod/unfollow.php:77 mod/unfollow.php:109 mod/viewcontacts.php:63
+#: mod/wall_attach.php:81 mod/wall_attach.php:84 mod/wall_upload.php:106
+#: mod/wall_upload.php:109 mod/wallmessage.php:19 mod/wallmessage.php:43
+#: mod/wallmessage.php:82 mod/wallmessage.php:106 src/Module/Contact.php:365
+#: src/App.php:1748
 msgid "Permission denied."
 msgstr ""
 
-#: include/items.php:485 src/Content/Feature.php:96
+#: include/items.php:520 src/Content/Feature.php:95
 msgid "Archives"
 msgstr ""
 
-#: include/items.php:491 view/theme/vier/theme.php:256
-#: src/Content/ForumManager.php:135 src/Content/Widget.php:307
-#: src/Object/Post.php:436 src/App.php:785
+#: include/items.php:526 view/theme/vier/theme.php:258
+#: src/Content/ForumManager.php:133 src/Content/Widget.php:308
+#: src/Object/Post.php:447 src/App.php:753
 msgid "show more"
 msgstr ""
 
-#: include/text.php:274
-msgid "Loading more entries..."
+#: mod/localtime.php:19 src/Model/Event.php:38 src/Model/Event.php:839
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: include/text.php:275
-msgid "The end"
+#: mod/localtime.php:33
+msgid "Time Conversion"
 msgstr ""
 
-#: include/text.php:510
-msgid "No contacts"
+#: mod/localtime.php:35
+msgid ""
+"Friendica provides this service for sharing events with other networks and "
+"friends in unknown timezones."
 msgstr ""
 
-#: include/text.php:534
+#: mod/localtime.php:39
 #, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "UTC time: %s"
+msgstr ""
 
-#: include/text.php:547
-msgid "View Contacts"
+#: mod/localtime.php:42
+#, php-format
+msgid "Current timezone: %s"
 msgstr ""
 
-#: include/text.php:632 mod/editpost.php:91 mod/filer.php:35 mod/notes.php:54
-msgid "Save"
+#: mod/localtime.php:46
+#, php-format
+msgid "Converted localtime: %s"
 msgstr ""
 
-#: include/text.php:632
-msgid "Follow"
+#: mod/localtime.php:52
+msgid "Please select your timezone:"
 msgstr ""
 
-#: include/text.php:638 mod/search.php:163 src/Content/Nav.php:194
-msgid "Search"
+#: mod/localtime.php:56 mod/crepair.php:151 mod/events.php:559
+#: mod/fsuggest.php:115 mod/invite.php:154 mod/manage.php:185
+#: mod/message.php:265 mod/message.php:426 mod/photos.php:1093
+#: mod/photos.php:1181 mod/photos.php:1456 mod/photos.php:1501
+#: mod/photos.php:1540 mod/photos.php:1600 mod/poke.php:194
+#: mod/profiles.php:578 view/theme/duepuntozero/config.php:72
+#: view/theme/frio/config.php:119 view/theme/quattro/config.php:74
+#: view/theme/vier/config.php:120 src/Module/Contact.php:600
+#: src/Module/Install.php:189 src/Module/Install.php:224
+#: src/Object/Post.php:813
+msgid "Submit"
 msgstr ""
 
-#: include/text.php:641 src/Content/Nav.php:76
-msgid "@name, !forum, #tags, content"
+#: mod/update_community.php:23 mod/update_display.php:24
+#: mod/update_notes.php:36 mod/update_profile.php:35 mod/update_network.php:33
+#: mod/update_contact.php:23
+msgid "[Embedded content - reload page to view]"
 msgstr ""
 
-#: include/text.php:647 src/Content/Nav.php:197
-msgid "Full Text"
+#: mod/attach.php:16
+msgid "Item not available."
 msgstr ""
 
-#: include/text.php:648 src/Content/Widget/TagCloud.php:54
-#: src/Content/Nav.php:198
-msgid "Tags"
+#: mod/attach.php:26
+msgid "Item was not found."
 msgstr ""
 
-#: include/text.php:649 mod/viewcontacts.php:129 view/theme/frio/theme.php:282
-#: src/Content/Nav.php:199 src/Content/Nav.php:265 src/Model/Profile.php:968
-#: src/Model/Profile.php:971 src/Module/Contact.php:806
-#: src/Module/Contact.php:876
-msgid "Contacts"
+#: mod/hcard.php:19
+msgid "No profile"
 msgstr ""
 
-#: include/text.php:652 view/theme/vier/theme.php:251
-#: src/Content/ForumManager.php:130 src/Content/Nav.php:203
-msgid "Forums"
+#: mod/lockview.php:46 mod/lockview.php:57
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: include/text.php:696
-msgid "poke"
+#: mod/lockview.php:66
+msgid "Visible to:"
 msgstr ""
 
-#: include/text.php:696
-msgid "poked"
+#: mod/newmember.php:11
+msgid "Welcome to Friendica"
 msgstr ""
 
-#: include/text.php:697
-msgid "ping"
+#: mod/newmember.php:12
+msgid "New Member Checklist"
 msgstr ""
 
-#: include/text.php:697
-msgid "pinged"
+#: mod/newmember.php:14
+msgid ""
+"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."
 msgstr ""
 
-#: include/text.php:698
-msgid "prod"
+#: mod/newmember.php:15
+msgid "Getting Started"
 msgstr ""
 
-#: include/text.php:698
-msgid "prodded"
+#: mod/newmember.php:17
+msgid "Friendica Walk-Through"
 msgstr ""
 
-#: include/text.php:699
-msgid "slap"
+#: mod/newmember.php:17
+msgid ""
+"On your <em>Quick Start</em> page - find a brief introduction to your "
+"profile and network tabs, make some new connections, and find some groups to "
+"join."
 msgstr ""
 
-#: include/text.php:699
-msgid "slapped"
+#: mod/newmember.php:19 mod/admin.php:2064 mod/admin.php:2334
+#: mod/settings.php:136 view/theme/frio/theme.php:283 src/Content/Nav.php:260
+msgid "Settings"
 msgstr ""
 
-#: include/text.php:700
-msgid "finger"
+#: mod/newmember.php:21
+msgid "Go to Your Settings"
 msgstr ""
 
-#: include/text.php:700
-msgid "fingered"
+#: mod/newmember.php:21
+msgid ""
+"On your <em>Settings</em> page -  change your initial password. Also make a "
+"note of your Identity Address. This looks just like an email address - and "
+"will be useful in making friends on the free social web."
 msgstr ""
 
-#: include/text.php:701
-msgid "rebuff"
+#: mod/newmember.php:22
+msgid ""
+"Review the other settings, particularly the privacy settings. An unpublished "
+"directory listing is like having an unlisted phone number. In general, you "
+"should probably publish your listing - unless all of your friends and "
+"potential friends know exactly how to find you."
 msgstr ""
 
-#: include/text.php:701
-msgid "rebuffed"
+#: mod/newmember.php:24 mod/profperm.php:117 view/theme/frio/theme.php:274
+#: src/Content/Nav.php:154 src/Model/Profile.php:734 src/Model/Profile.php:867
+#: src/Model/Profile.php:900 src/Module/Contact.php:661
+#: src/Module/Contact.php:874
+msgid "Profile"
 msgstr ""
 
-#: include/text.php:715 mod/settings.php:944 src/Model/Event.php:390
-msgid "Monday"
+#: mod/newmember.php:26 mod/profile_photo.php:250 mod/profiles.php:599
+msgid "Upload Profile Photo"
 msgstr ""
 
-#: include/text.php:715 src/Model/Event.php:391
-msgid "Tuesday"
+#: mod/newmember.php:26
+msgid ""
+"Upload a profile photo if you have not done so already. Studies have shown "
+"that people with real photos of themselves are ten times more likely to make "
+"friends than people who do not."
 msgstr ""
 
-#: include/text.php:715 src/Model/Event.php:392
-msgid "Wednesday"
+#: mod/newmember.php:27
+msgid "Edit Your Profile"
 msgstr ""
 
-#: include/text.php:715 src/Model/Event.php:393
-msgid "Thursday"
+#: mod/newmember.php:27
+msgid ""
+"Edit your <strong>default</strong> profile to your liking. Review the "
+"settings for hiding your list of friends and hiding the profile from unknown "
+"visitors."
 msgstr ""
 
-#: include/text.php:715 src/Model/Event.php:394
-msgid "Friday"
+#: mod/newmember.php:28
+msgid "Profile Keywords"
 msgstr ""
 
-#: include/text.php:715 src/Model/Event.php:395
-msgid "Saturday"
+#: mod/newmember.php:28
+msgid ""
+"Set some public keywords for your default profile which describe your "
+"interests. We may be able to find other people with similar interests and "
+"suggest friendships."
 msgstr ""
 
-#: include/text.php:715 mod/settings.php:944 src/Model/Event.php:389
-msgid "Sunday"
+#: mod/newmember.php:30
+msgid "Connecting"
 msgstr ""
 
-#: include/text.php:719 src/Model/Event.php:410
-msgid "January"
+#: mod/newmember.php:36
+msgid "Importing Emails"
 msgstr ""
 
-#: include/text.php:719 src/Model/Event.php:411
-msgid "February"
+#: mod/newmember.php:36
+msgid ""
+"Enter your email access information on your Connector Settings page if you "
+"wish to import and interact with friends or mailing lists from your email "
+"INBOX"
 msgstr ""
 
-#: include/text.php:719 src/Model/Event.php:412
-msgid "March"
+#: mod/newmember.php:39
+msgid "Go to Your Contacts Page"
 msgstr ""
 
-#: include/text.php:719 src/Model/Event.php:413
-msgid "April"
+#: mod/newmember.php:39
+msgid ""
+"Your Contacts page is your gateway to managing friendships and connecting "
+"with friends on other networks. Typically you enter their address or site "
+"URL in the <em>Add New Contact</em> dialog."
 msgstr ""
 
-#: include/text.php:719 include/text.php:736 src/Model/Event.php:401
-#: src/Model/Event.php:414
-msgid "May"
+#: mod/newmember.php:40
+msgid "Go to Your Site's Directory"
 msgstr ""
 
-#: include/text.php:719 src/Model/Event.php:415
-msgid "June"
+#: mod/newmember.php:40
+msgid ""
+"The Directory page lets you find other people in this network or other "
+"federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
+"their profile page. Provide your own Identity Address if requested."
 msgstr ""
 
-#: include/text.php:719 src/Model/Event.php:416
-msgid "July"
+#: mod/newmember.php:41
+msgid "Finding New People"
 msgstr ""
 
-#: include/text.php:719 src/Model/Event.php:417
-msgid "August"
+#: mod/newmember.php:41
+msgid ""
+"On the side panel of the Contacts page are several tools to find new "
+"friends. We can match people by interest, look up people by name or "
+"interest, and provide suggestions based on network relationships. On a brand "
+"new site, friend suggestions will usually begin to be populated within 24 "
+"hours."
 msgstr ""
 
-#: include/text.php:719 src/Model/Event.php:418
-msgid "September"
+#: mod/newmember.php:43 src/Model/Group.php:406 src/Module/Contact.php:759
+msgid "Groups"
 msgstr ""
 
-#: include/text.php:719 src/Model/Event.php:419
-msgid "October"
+#: mod/newmember.php:45
+msgid "Group Your Contacts"
 msgstr ""
 
-#: include/text.php:719 src/Model/Event.php:420
-msgid "November"
+#: mod/newmember.php:45
+msgid ""
+"Once you have made some friends, organize them into private conversation "
+"groups from the sidebar of your Contacts page and then you can interact with "
+"each group privately on your Network page."
 msgstr ""
 
-#: include/text.php:719 src/Model/Event.php:421
-msgid "December"
+#: mod/newmember.php:48
+msgid "Why Aren't My Posts Public?"
 msgstr ""
 
-#: include/text.php:733 src/Model/Event.php:382
-msgid "Mon"
+#: mod/newmember.php:48
+msgid ""
+"Friendica respects your privacy. By default, your posts will only show up to "
+"people you've added as friends. For more information, see the help section "
+"from the link above."
 msgstr ""
 
-#: include/text.php:733 src/Model/Event.php:383
-msgid "Tue"
+#: mod/newmember.php:52
+msgid "Getting Help"
 msgstr ""
 
-#: include/text.php:733 src/Model/Event.php:384
-msgid "Wed"
+#: mod/newmember.php:54
+msgid "Go to the Help Section"
 msgstr ""
 
-#: include/text.php:733 src/Model/Event.php:385
-msgid "Thu"
+#: mod/newmember.php:54
+msgid ""
+"Our <strong>help</strong> pages may be consulted for detail on other program "
+"features and resources."
 msgstr ""
 
-#: include/text.php:733 src/Model/Event.php:386
-msgid "Fri"
+#: mod/notes.php:42 src/Model/Profile.php:950
+msgid "Personal Notes"
 msgstr ""
 
-#: include/text.php:733 src/Model/Event.php:387
-msgid "Sat"
+#: mod/notes.php:54 mod/editpost.php:94 mod/filer.php:38
+#: src/Content/Text/HTML.php:961
+msgid "Save"
 msgstr ""
 
-#: include/text.php:733 src/Model/Event.php:381
-msgid "Sun"
-msgstr ""
-
-#: include/text.php:736 src/Model/Event.php:397
-msgid "Jan"
-msgstr ""
-
-#: include/text.php:736 src/Model/Event.php:398
-msgid "Feb"
-msgstr ""
-
-#: include/text.php:736 src/Model/Event.php:399
-msgid "Mar"
-msgstr ""
-
-#: include/text.php:736 src/Model/Event.php:400
-msgid "Apr"
-msgstr ""
-
-#: include/text.php:736 src/Model/Event.php:403
-msgid "Jul"
-msgstr ""
-
-#: include/text.php:736 src/Model/Event.php:404
-msgid "Aug"
-msgstr ""
-
-#: include/text.php:736
-msgid "Sep"
-msgstr ""
-
-#: include/text.php:736 src/Model/Event.php:406
-msgid "Oct"
-msgstr ""
-
-#: include/text.php:736 src/Model/Event.php:407
-msgid "Nov"
-msgstr ""
-
-#: include/text.php:736 src/Model/Event.php:408
-msgid "Dec"
-msgstr ""
-
-#: include/text.php:882
-#, php-format
-msgid "Content warning: %s"
-msgstr ""
-
-#: include/text.php:944 mod/videos.php:371
-msgid "View Video"
-msgstr ""
-
-#: include/text.php:961
-msgid "bytes"
-msgstr ""
-
-#: include/text.php:994 include/text.php:1005 include/text.php:1040
-msgid "Click to open/close"
-msgstr ""
-
-#: include/text.php:1155
-msgid "View on separate page"
-msgstr ""
-
-#: include/text.php:1156
-msgid "view on separate page"
-msgstr ""
-
-#: include/text.php:1161 include/text.php:1168 src/Model/Event.php:617
-msgid "link to source"
-msgstr ""
-
-#: include/text.php:1355
-msgid "activity"
-msgstr ""
-
-#: include/text.php:1357 src/Object/Post.php:435 src/Object/Post.php:447
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/text.php:1360
-msgid "post"
-msgstr ""
-
-#: include/text.php:1515
-msgid "Item filed"
-msgstr ""
-
-#: mod/credits.php:18
-msgid "Credits"
-msgstr ""
-
-#: mod/credits.php:19
-msgid ""
-"Friendica is a community project, that would not be possible without the "
-"help of many people. Here is a list of those who have contributed to the "
-"code or the translation of Friendica. Thank you all!"
-msgstr ""
-
-#: mod/maintenance.php:24
-msgid "System down for maintenance"
-msgstr ""
-
-#: mod/localtime.php:19 src/Model/Event.php:36 src/Model/Event.php:837
-msgid "l F d, Y \\@ g:i A"
-msgstr ""
-
-#: mod/localtime.php:33
-msgid "Time Conversion"
-msgstr ""
-
-#: mod/localtime.php:35
-msgid ""
-"Friendica provides this service for sharing events with other networks and "
-"friends in unknown timezones."
+#: mod/probe.php:13 mod/webfinger.php:16 mod/community.php:31
+#: mod/dfrn_request.php:602 mod/directory.php:43 mod/display.php:203
+#: mod/photos.php:945 mod/search.php:106 mod/search.php:112 mod/videos.php:194
+#: mod/viewcontacts.php:51
+msgid "Public access denied."
 msgstr ""
 
-#: mod/localtime.php:39
-#, php-format
-msgid "UTC time: %s"
+#: mod/probe.php:14 mod/webfinger.php:17
+msgid "Only logged in users are permitted to perform a probing."
 msgstr ""
 
-#: mod/localtime.php:42
-#, php-format
-msgid "Current timezone: %s"
+#: mod/regmod.php:55
+msgid "Account approved."
 msgstr ""
 
-#: mod/localtime.php:46
+#: mod/regmod.php:79
 #, php-format
-msgid "Converted localtime: %s"
-msgstr ""
-
-#: mod/localtime.php:52
-msgid "Please select your timezone:"
-msgstr ""
-
-#: mod/localtime.php:56 mod/crepair.php:149 mod/events.php:557
-#: mod/fsuggest.php:114 mod/invite.php:152 mod/manage.php:184
-#: mod/message.php:263 mod/message.php:424 mod/photos.php:1089
-#: mod/photos.php:1177 mod/photos.php:1452 mod/photos.php:1497
-#: mod/photos.php:1536 mod/photos.php:1596 mod/poke.php:191
-#: mod/profiles.php:576 view/theme/duepuntozero/config.php:71
-#: view/theme/frio/config.php:118 view/theme/quattro/config.php:73
-#: view/theme/vier/config.php:119 src/Module/Contact.php:598
-#: src/Module/Install.php:187 src/Module/Install.php:222
-#: src/Object/Post.php:802
-msgid "Submit"
-msgstr ""
-
-#: mod/update_community.php:23 mod/update_display.php:24
-#: mod/update_notes.php:36 mod/update_profile.php:35 mod/update_contacts.php:23
-#: mod/update_network.php:33
-msgid "[Embedded content - reload page to view]"
-msgstr ""
-
-#: mod/fbrowser.php:35 view/theme/frio/theme.php:273 src/Content/Nav.php:154
-#: src/Model/Profile.php:905
-msgid "Photos"
-msgstr ""
-
-#: mod/fbrowser.php:44 mod/fbrowser.php:69 mod/photos.php:200
-#: mod/photos.php:1071 mod/photos.php:1166 mod/photos.php:1183
-#: mod/photos.php:1652 mod/photos.php:1667 src/Model/Photo.php:244
-#: src/Model/Photo.php:253
-msgid "Contact Photos"
-msgstr ""
-
-#: mod/fbrowser.php:106 mod/fbrowser.php:137 mod/profile_photo.php:249
-msgid "Upload"
-msgstr ""
-
-#: mod/fbrowser.php:132
-msgid "Files"
+msgid "Registration revoked for %s"
 msgstr ""
 
-#: mod/oexchange.php:30
-msgid "Post successful."
+#: mod/regmod.php:86
+msgid "Please login."
 msgstr ""
 
-#: mod/uexport.php:44
-msgid "Export account"
+#: mod/repair_ostatus.php:21
+msgid "Resubscribing to OStatus contacts"
 msgstr ""
 
-#: mod/uexport.php:44
-msgid ""
-"Export your account info and contacts. Use this to make a backup of your "
-"account and/or to move it to another server."
+#: mod/repair_ostatus.php:37
+msgid "Error"
 msgstr ""
 
-#: mod/uexport.php:45
-msgid "Export all"
+#: mod/repair_ostatus.php:52 mod/ostatus_subscribe.php:70
+msgid "Done"
 msgstr ""
 
-#: mod/uexport.php:45
-msgid ""
-"Export your accout 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)"
+#: mod/repair_ostatus.php:58 mod/ostatus_subscribe.php:94
+msgid "Keep this window open until done."
 msgstr ""
 
-#: mod/uexport.php:52 mod/settings.php:118
-msgid "Export personal data"
+#: mod/viewsrc.php:13 mod/cal.php:35 mod/cal.php:39 mod/community.php:38
+#: mod/follow.php:21 mod/viewcontacts.php:23 mod/viewcontacts.php:27
+msgid "Access denied."
 msgstr ""
 
-#: mod/admin.php:113
+#: mod/admin.php:116
 msgid "Theme settings updated."
 msgstr ""
 
-#: mod/admin.php:186 src/Content/Nav.php:227
+#: mod/admin.php:189 src/Content/Nav.php:228
 msgid "Information"
 msgstr ""
 
-#: mod/admin.php:187
+#: mod/admin.php:190
 msgid "Overview"
 msgstr ""
 
-#: mod/admin.php:188 mod/admin.php:731
+#: mod/admin.php:191 mod/admin.php:757
 msgid "Federation Statistics"
 msgstr ""
 
-#: mod/admin.php:189
+#: mod/admin.php:192
 msgid "Configuration"
 msgstr ""
 
-#: mod/admin.php:190 mod/admin.php:1454
+#: mod/admin.php:193 mod/admin.php:1482
 msgid "Site"
 msgstr ""
 
-#: mod/admin.php:191 mod/admin.php:1383 mod/admin.php:1916 mod/admin.php:1933
+#: mod/admin.php:194 mod/admin.php:1411 mod/admin.php:1946 mod/admin.php:1963
 msgid "Users"
 msgstr ""
 
-#: mod/admin.php:192 mod/admin.php:2032 mod/admin.php:2092 mod/settings.php:97
+#: mod/admin.php:195 mod/admin.php:2062 mod/admin.php:2122 mod/settings.php:99
 msgid "Addons"
 msgstr ""
 
-#: mod/admin.php:193 mod/admin.php:2302 mod/admin.php:2346
+#: mod/admin.php:196 mod/admin.php:2332 mod/admin.php:2376
 msgid "Themes"
 msgstr ""
 
-#: mod/admin.php:194 mod/settings.php:75
+#: mod/admin.php:197 mod/settings.php:77
 msgid "Additional features"
 msgstr ""
 
-#: mod/admin.php:195 mod/admin.php:319 mod/register.php:290
-#: src/Content/Nav.php:230 src/Module/Tos.php:70
+#: mod/admin.php:198 mod/admin.php:322 mod/register.php:292
+#: src/Content/Nav.php:231 src/Module/Tos.php:71
 msgid "Terms of Service"
 msgstr ""
 
-#: mod/admin.php:196
+#: mod/admin.php:199
 msgid "Database"
 msgstr ""
 
-#: mod/admin.php:197
+#: mod/admin.php:200
 msgid "DB updates"
 msgstr ""
 
-#: mod/admin.php:198 mod/admin.php:774
+#: mod/admin.php:201 mod/admin.php:800
 msgid "Inspect Queue"
 msgstr ""
 
-#: mod/admin.php:199
+#: mod/admin.php:202
 msgid "Inspect Deferred Workers"
 msgstr ""
 
-#: mod/admin.php:200
+#: mod/admin.php:203
 msgid "Inspect worker Queue"
 msgstr ""
 
-#: mod/admin.php:201
+#: mod/admin.php:204
 msgid "Tools"
 msgstr ""
 
-#: mod/admin.php:202
+#: mod/admin.php:205
 msgid "Contact Blocklist"
 msgstr ""
 
-#: mod/admin.php:203 mod/admin.php:381
+#: mod/admin.php:206 mod/admin.php:384
 msgid "Server Blocklist"
 msgstr ""
 
-#: mod/admin.php:204 mod/admin.php:539
+#: mod/admin.php:207 mod/admin.php:542
 msgid "Delete Item"
 msgstr ""
 
-#: mod/admin.php:205 mod/admin.php:206 mod/admin.php:2421
+#: mod/admin.php:208 mod/admin.php:209 mod/admin.php:2451
 msgid "Logs"
 msgstr ""
 
-#: mod/admin.php:207 mod/admin.php:2488
+#: mod/admin.php:210 mod/admin.php:2518
 msgid "View Logs"
 msgstr ""
 
-#: mod/admin.php:209
+#: mod/admin.php:212
 msgid "Diagnostics"
 msgstr ""
 
-#: mod/admin.php:210
+#: mod/admin.php:213
 msgid "PHP Info"
 msgstr ""
 
-#: mod/admin.php:211
+#: mod/admin.php:214
 msgid "probe address"
 msgstr ""
 
-#: mod/admin.php:212
+#: mod/admin.php:215
 msgid "check webfinger"
 msgstr ""
 
-#: mod/admin.php:232 src/Content/Nav.php:270
+#: mod/admin.php:235 src/Content/Nav.php:271
 msgid "Admin"
 msgstr ""
 
-#: mod/admin.php:233
+#: mod/admin.php:236
 msgid "Addon Features"
 msgstr ""
 
-#: mod/admin.php:234
+#: mod/admin.php:237
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: mod/admin.php:318 mod/admin.php:380 mod/admin.php:496 mod/admin.php:538
-#: mod/admin.php:730 mod/admin.php:773 mod/admin.php:824 mod/admin.php:942
-#: mod/admin.php:1453 mod/admin.php:1915 mod/admin.php:2031 mod/admin.php:2091
-#: mod/admin.php:2301 mod/admin.php:2345 mod/admin.php:2420 mod/admin.php:2487
+#: mod/admin.php:321 mod/admin.php:383 mod/admin.php:499 mod/admin.php:541
+#: mod/admin.php:756 mod/admin.php:799 mod/admin.php:850 mod/admin.php:968
+#: mod/admin.php:1481 mod/admin.php:1945 mod/admin.php:2061 mod/admin.php:2121
+#: mod/admin.php:2331 mod/admin.php:2375 mod/admin.php:2450 mod/admin.php:2517
 msgid "Administration"
 msgstr ""
 
-#: mod/admin.php:320
+#: mod/admin.php:323
 msgid "Display Terms of Service"
 msgstr ""
 
-#: mod/admin.php:320
+#: mod/admin.php:323
 msgid ""
 "Enable the Terms of Service page. If this is enabled a link to the terms "
 "will be added to the registration form and the general information page."
 msgstr ""
 
-#: mod/admin.php:321
+#: mod/admin.php:324
 msgid "Display Privacy Statement"
 msgstr ""
 
-#: mod/admin.php:321
+#: mod/admin.php:324
 #, php-format
 msgid ""
 "Show some informations regarding the needed information to operate the node "
 "according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."
 msgstr ""
 
-#: mod/admin.php:322
+#: mod/admin.php:325
 msgid "Privacy Statement Preview"
 msgstr ""
 
-#: mod/admin.php:324
+#: mod/admin.php:327
 msgid "The Terms of Service"
 msgstr ""
 
-#: mod/admin.php:324
+#: mod/admin.php:327
 msgid ""
 "Enter the Terms of Service for your node here. You can use BBCode. Headers "
 "of sections should be [h2] and below."
 msgstr ""
 
-#: mod/admin.php:326 mod/admin.php:1455 mod/admin.php:2093 mod/admin.php:2347
-#: mod/admin.php:2422 mod/admin.php:2569 mod/delegate.php:172
-#: mod/settings.php:678 mod/settings.php:785 mod/settings.php:873
-#: mod/settings.php:962 mod/settings.php:1187
+#: mod/admin.php:329 mod/admin.php:1483 mod/admin.php:2123 mod/admin.php:2377
+#: mod/admin.php:2452 mod/admin.php:2599 mod/delegate.php:174
+#: mod/settings.php:680 mod/settings.php:787 mod/settings.php:875
+#: mod/settings.php:964 mod/settings.php:1189
 msgid "Save Settings"
 msgstr ""
 
-#: mod/admin.php:372 mod/admin.php:390 mod/dfrn_request.php:346
-#: mod/friendica.php:113 src/Model/Contact.php:1597
+#: mod/admin.php:375 mod/admin.php:393 mod/dfrn_request.php:348
+#: mod/friendica.php:122 src/Model/Contact.php:1603
 msgid "Blocked domain"
 msgstr ""
 
-#: mod/admin.php:372
+#: mod/admin.php:375
 msgid "The blocked domain"
 msgstr ""
 
-#: mod/admin.php:373 mod/admin.php:391 mod/friendica.php:113
+#: mod/admin.php:376 mod/admin.php:394 mod/friendica.php:122
 msgid "Reason for the block"
 msgstr ""
 
-#: mod/admin.php:373 mod/admin.php:386
+#: mod/admin.php:376 mod/admin.php:389
 msgid "The reason why you blocked this domain."
 msgstr ""
 
-#: mod/admin.php:374
+#: mod/admin.php:377
 msgid "Delete domain"
 msgstr ""
 
-#: mod/admin.php:374
+#: mod/admin.php:377
 msgid "Check to delete this entry from the blocklist"
 msgstr ""
 
-#: mod/admin.php:382
+#: mod/admin.php:385
 msgid ""
 "This page can be used to define a black list of servers from the federated "
 "network that are not allowed to interact with your node. For all entered "
 "domains you should also give a reason why you have blocked the remote server."
 msgstr ""
 
-#: mod/admin.php:383
+#: mod/admin.php:386
 msgid ""
 "The list of blocked servers will be made publically available on the /"
 "friendica page so that your users and people investigating communication "
 "problems can find the reason easily."
 msgstr ""
 
-#: mod/admin.php:384
+#: mod/admin.php:387
 msgid "Add new entry to block list"
 msgstr ""
 
-#: mod/admin.php:385
+#: mod/admin.php:388
 msgid "Server Domain"
 msgstr ""
 
-#: mod/admin.php:385
+#: mod/admin.php:388
 msgid ""
 "The domain of the new server to add to the block list. Do not include the "
 "protocol."
 msgstr ""
 
-#: mod/admin.php:386
+#: mod/admin.php:389
 msgid "Block reason"
 msgstr ""
 
-#: mod/admin.php:387
+#: mod/admin.php:390
 msgid "Add Entry"
 msgstr ""
 
-#: mod/admin.php:388
+#: mod/admin.php:391
 msgid "Save changes to the blocklist"
 msgstr ""
 
-#: mod/admin.php:389
+#: mod/admin.php:392
 msgid "Current Entries in the Blocklist"
 msgstr ""
 
-#: mod/admin.php:392
+#: mod/admin.php:395
 msgid "Delete entry from blocklist"
 msgstr ""
 
-#: mod/admin.php:395
+#: mod/admin.php:398
 msgid "Delete entry from blocklist?"
 msgstr ""
 
-#: mod/admin.php:421
+#: mod/admin.php:424
 msgid "Server added to blocklist."
 msgstr ""
 
-#: mod/admin.php:437
+#: mod/admin.php:440
 msgid "Site blocklist updated."
 msgstr ""
 
-#: mod/admin.php:460 src/Core/Console/GlobalCommunityBlock.php:68
+#: mod/admin.php:463 src/Core/Console/GlobalCommunityBlock.php:68
 msgid "The contact has been blocked from the node"
 msgstr ""
 
-#: mod/admin.php:462 src/Core/Console/GlobalCommunityBlock.php:65
+#: mod/admin.php:465 src/Core/Console/GlobalCommunityBlock.php:65
 #, php-format
 msgid "Could not find any contact entry for this URL (%s)"
 msgstr ""
 
-#: mod/admin.php:469
+#: mod/admin.php:472
 #, php-format
 msgid "%s contact unblocked"
 msgid_plural "%s contacts unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mod/admin.php:497
+#: mod/admin.php:500
 msgid "Remote Contact Blocklist"
 msgstr ""
 
-#: mod/admin.php:498
+#: mod/admin.php:501
 msgid ""
 "This page allows you to prevent any message from a remote contact to reach "
 "your node."
 msgstr ""
 
-#: mod/admin.php:499
+#: mod/admin.php:502
 msgid "Block Remote Contact"
 msgstr ""
 
-#: mod/admin.php:500 mod/admin.php:1918
+#: mod/admin.php:503 mod/admin.php:1948
 msgid "select all"
 msgstr ""
 
-#: mod/admin.php:501
+#: mod/admin.php:504
 msgid "select none"
 msgstr ""
 
-#: mod/admin.php:502 mod/admin.php:1927 src/Module/Contact.php:625
-#: src/Module/Contact.php:819 src/Module/Contact.php:1072
+#: mod/admin.php:505 mod/admin.php:1957 src/Module/Contact.php:627
+#: src/Module/Contact.php:829 src/Module/Contact.php:1082
 msgid "Block"
 msgstr ""
 
-#: mod/admin.php:503 mod/admin.php:1929 src/Module/Contact.php:625
-#: src/Module/Contact.php:819 src/Module/Contact.php:1072
+#: mod/admin.php:506 mod/admin.php:1959 src/Module/Contact.php:627
+#: src/Module/Contact.php:829 src/Module/Contact.php:1082
 msgid "Unblock"
 msgstr ""
 
-#: mod/admin.php:504
+#: mod/admin.php:507
 msgid "No remote contact is blocked from this node."
 msgstr ""
 
-#: mod/admin.php:506
+#: mod/admin.php:509
 msgid "Blocked Remote Contacts"
 msgstr ""
 
-#: mod/admin.php:507
+#: mod/admin.php:510
 msgid "Block New Remote Contact"
 msgstr ""
 
-#: mod/admin.php:508
+#: mod/admin.php:511
 msgid "Photo"
 msgstr ""
 
-#: mod/admin.php:508 mod/admin.php:1910 mod/admin.php:1921 mod/admin.php:1935
-#: mod/admin.php:1951 mod/crepair.php:159 mod/settings.php:680
-#: mod/settings.php:706
+#: mod/admin.php:511 mod/admin.php:1940 mod/admin.php:1951 mod/admin.php:1965
+#: mod/admin.php:1981 mod/crepair.php:161 mod/settings.php:682
+#: mod/settings.php:708
 msgid "Name"
 msgstr ""
 
-#: mod/admin.php:508 mod/profiles.php:393
+#: mod/admin.php:511 mod/profiles.php:395
 msgid "Address"
 msgstr ""
 
-#: mod/admin.php:508 mod/admin.php:518 mod/follow.php:168
-#: mod/notifications.php:176 mod/notifications.php:260 mod/unfollow.php:137
-#: src/Module/Contact.php:644
+#: mod/admin.php:511 mod/admin.php:521 mod/follow.php:170
+#: mod/notifications.php:177 mod/notifications.php:261 mod/unfollow.php:139
+#: src/Module/Contact.php:646
 msgid "Profile URL"
 msgstr ""
 
-#: mod/admin.php:516
+#: mod/admin.php:519
 #, php-format
 msgid "%s total blocked contact"
 msgid_plural "%s total blocked contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mod/admin.php:518
+#: mod/admin.php:521
 msgid "URL of the remote contact to block."
 msgstr ""
 
-#: mod/admin.php:540
+#: mod/admin.php:543
 msgid "Delete this Item"
 msgstr ""
 
-#: mod/admin.php:541
+#: mod/admin.php:544
 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 ""
 
-#: mod/admin.php:542
+#: mod/admin.php:545
 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 ""
 
-#: mod/admin.php:543
+#: mod/admin.php:546
 msgid "GUID"
 msgstr ""
 
-#: mod/admin.php:543
+#: mod/admin.php:546
 msgid "The GUID of the item you want to delete."
 msgstr ""
 
-#: mod/admin.php:577
+#: mod/admin.php:580
 msgid "Item marked for deletion."
 msgstr ""
 
-#: mod/admin.php:648
+#: mod/admin.php:651
 msgid "unknown"
 msgstr ""
 
-#: mod/admin.php:724
+#: mod/admin.php:750
 msgid ""
 "This page offers you some numbers to the known part of the federated social "
 "network your Friendica node is part of. These numbers are not complete but "
 "only reflect the part of the network your node is aware of."
 msgstr ""
 
-#: mod/admin.php:725
+#: mod/admin.php:751
 msgid ""
 "The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
 "will improve the data displayed here."
 msgstr ""
 
-#: mod/admin.php:737
+#: mod/admin.php:763
 #, php-format
 msgid ""
 "Currently this node is aware of %d nodes with %d registered users from the "
 "following platforms:"
 msgstr ""
 
-#: mod/admin.php:776 mod/admin.php:827
+#: mod/admin.php:802 mod/admin.php:853
 msgid "ID"
 msgstr ""
 
-#: mod/admin.php:777
+#: mod/admin.php:803
 msgid "Recipient Name"
 msgstr ""
 
-#: mod/admin.php:778
+#: mod/admin.php:804
 msgid "Recipient Profile"
 msgstr ""
 
-#: mod/admin.php:779 view/theme/frio/theme.php:278
-#: src/Core/NotificationsManager.php:180 src/Content/Nav.php:235
+#: mod/admin.php:805 view/theme/frio/theme.php:280
+#: src/Core/NotificationsManager.php:180 src/Content/Nav.php:236
 msgid "Network"
 msgstr ""
 
-#: mod/admin.php:780 mod/admin.php:829
+#: mod/admin.php:806 mod/admin.php:855
 msgid "Created"
 msgstr ""
 
-#: mod/admin.php:781
+#: mod/admin.php:807
 msgid "Last Tried"
 msgstr ""
 
-#: mod/admin.php:782
+#: mod/admin.php:808
 msgid ""
 "This page lists the content of the queue for outgoing postings. These are "
 "postings the initial delivery failed for. They will be resend later and "
 "eventually deleted if the delivery fails permanently."
 msgstr ""
 
-#: mod/admin.php:803
+#: mod/admin.php:829
 msgid "Inspect Deferred Worker Queue"
 msgstr ""
 
-#: mod/admin.php:804
+#: mod/admin.php:830
 msgid ""
 "This page lists the deferred worker jobs. This are jobs that couldn't be "
 "executed at the first time."
 msgstr ""
 
-#: mod/admin.php:807
+#: mod/admin.php:833
 msgid "Inspect Worker Queue"
 msgstr ""
 
-#: mod/admin.php:808
+#: mod/admin.php:834
 msgid ""
 "This page lists the currently queued worker jobs. These jobs are handled by "
 "the worker cronjob you've set up during install."
 msgstr ""
 
-#: mod/admin.php:828
+#: mod/admin.php:854
 msgid "Job Parameters"
 msgstr ""
 
-#: mod/admin.php:830
+#: mod/admin.php:856
 msgid "Priority"
 msgstr ""
 
-#: mod/admin.php:855
+#: mod/admin.php:881
 #, php-format
 msgid ""
 "Your DB still runs with MyISAM tables. You should change the engine type to "
@@ -1716,32 +1611,32 @@ msgid ""
 "automatic conversion.<br />"
 msgstr ""
 
-#: mod/admin.php:862
+#: mod/admin.php:888
 #, 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 ""
 
-#: mod/admin.php:872
+#: mod/admin.php:898
 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 ""
 
-#: mod/admin.php:878
+#: mod/admin.php:904
 msgid "The worker was never executed. Please check your database structure!"
 msgstr ""
 
-#: mod/admin.php:881
+#: mod/admin.php:907
 #, php-format
 msgid ""
 "The last worker execution was on %s UTC. This is older than one hour. Please "
 "check your crontab settings."
 msgstr ""
 
-#: mod/admin.php:887
+#: mod/admin.php:913
 #, php-format
 msgid ""
 "Friendica's configuration now is stored in config/local.ini.php, please copy "
@@ -1750,7 +1645,7 @@ msgid ""
 "transition."
 msgstr ""
 
-#: mod/admin.php:894
+#: mod/admin.php:920
 #, php-format
 msgid ""
 "<a href=\"%s\">%s</a> is not reachable on your system. This is a severe "
@@ -1758,502 +1653,502 @@ msgid ""
 "href=\"%s\">the installation page</a> for help."
 msgstr ""
 
-#: mod/admin.php:900
+#: mod/admin.php:926
 msgid "Normal Account"
 msgstr ""
 
-#: mod/admin.php:901
+#: mod/admin.php:927
 msgid "Automatic Follower Account"
 msgstr ""
 
-#: mod/admin.php:902
+#: mod/admin.php:928
 msgid "Public Forum Account"
 msgstr ""
 
-#: mod/admin.php:903
+#: mod/admin.php:929
 msgid "Automatic Friend Account"
 msgstr ""
 
-#: mod/admin.php:904
+#: mod/admin.php:930
 msgid "Blog Account"
 msgstr ""
 
-#: mod/admin.php:905
+#: mod/admin.php:931
 msgid "Private Forum Account"
 msgstr ""
 
-#: mod/admin.php:928
+#: mod/admin.php:954
 msgid "Message queues"
 msgstr ""
 
-#: mod/admin.php:934
+#: mod/admin.php:960
 msgid "Server Settings"
 msgstr ""
 
-#: mod/admin.php:943
+#: mod/admin.php:969
 msgid "Summary"
 msgstr ""
 
-#: mod/admin.php:945
+#: mod/admin.php:971
 msgid "Registered users"
 msgstr ""
 
-#: mod/admin.php:947
+#: mod/admin.php:973
 msgid "Pending registrations"
 msgstr ""
 
-#: mod/admin.php:948
+#: mod/admin.php:974
 msgid "Version"
 msgstr ""
 
-#: mod/admin.php:953
+#: mod/admin.php:979
 msgid "Active addons"
 msgstr ""
 
-#: mod/admin.php:985
+#: mod/admin.php:1011
 msgid "Can not parse base url. Must have at least <scheme>://<domain>"
 msgstr ""
 
-#: mod/admin.php:1318
+#: mod/admin.php:1346
 msgid "Site settings updated."
 msgstr ""
 
-#: mod/admin.php:1345 mod/settings.php:906
+#: mod/admin.php:1373 mod/settings.php:908
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: mod/admin.php:1374
+#: mod/admin.php:1402
 msgid "No community page for local users"
 msgstr ""
 
-#: mod/admin.php:1375
+#: mod/admin.php:1403
 msgid "No community page"
 msgstr ""
 
-#: mod/admin.php:1376
+#: mod/admin.php:1404
 msgid "Public postings from users of this site"
 msgstr ""
 
-#: mod/admin.php:1377
+#: mod/admin.php:1405
 msgid "Public postings from the federated network"
 msgstr ""
 
-#: mod/admin.php:1378
+#: mod/admin.php:1406
 msgid "Public postings from local users and the federated network"
 msgstr ""
 
-#: mod/admin.php:1382 mod/admin.php:1549 mod/admin.php:1559
-#: src/Module/Contact.php:550
+#: mod/admin.php:1410 mod/admin.php:1578 mod/admin.php:1588
+#: src/Module/Contact.php:552
 msgid "Disabled"
 msgstr ""
 
-#: mod/admin.php:1384
+#: mod/admin.php:1412
 msgid "Users, Global Contacts"
 msgstr ""
 
-#: mod/admin.php:1385
+#: mod/admin.php:1413
 msgid "Users, Global Contacts/fallback"
 msgstr ""
 
-#: mod/admin.php:1389
+#: mod/admin.php:1417
 msgid "One month"
 msgstr ""
 
-#: mod/admin.php:1390
+#: mod/admin.php:1418
 msgid "Three months"
 msgstr ""
 
-#: mod/admin.php:1391
+#: mod/admin.php:1419
 msgid "Half a year"
 msgstr ""
 
-#: mod/admin.php:1392
+#: mod/admin.php:1420
 msgid "One year"
 msgstr ""
 
-#: mod/admin.php:1397
+#: mod/admin.php:1425
 msgid "Multi user instance"
 msgstr ""
 
-#: mod/admin.php:1423
+#: mod/admin.php:1451
 msgid "Closed"
 msgstr ""
 
-#: mod/admin.php:1424
+#: mod/admin.php:1452
 msgid "Requires approval"
 msgstr ""
 
-#: mod/admin.php:1425
+#: mod/admin.php:1453
 msgid "Open"
 msgstr ""
 
-#: mod/admin.php:1429
+#: mod/admin.php:1457
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: mod/admin.php:1430
+#: mod/admin.php:1458
 msgid "Force all links to use SSL"
 msgstr ""
 
-#: mod/admin.php:1431
+#: mod/admin.php:1459
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: mod/admin.php:1435
+#: mod/admin.php:1463
 msgid "Don't check"
 msgstr ""
 
-#: mod/admin.php:1436
+#: mod/admin.php:1464
 msgid "check the stable version"
 msgstr ""
 
-#: mod/admin.php:1437
+#: mod/admin.php:1465
 msgid "check the development version"
 msgstr ""
 
-#: mod/admin.php:1456
+#: mod/admin.php:1484
 msgid "Republish users to directory"
 msgstr ""
 
-#: mod/admin.php:1457 mod/register.php:266
+#: mod/admin.php:1485 mod/register.php:268
 msgid "Registration"
 msgstr ""
 
-#: mod/admin.php:1458
+#: mod/admin.php:1486
 msgid "File upload"
 msgstr ""
 
-#: mod/admin.php:1459
+#: mod/admin.php:1487
 msgid "Policies"
 msgstr ""
 
-#: mod/admin.php:1460 mod/events.php:559 src/Model/Profile.php:866
-#: src/Module/Contact.php:897
+#: mod/admin.php:1488 mod/events.php:561 src/Model/Profile.php:869
+#: src/Module/Contact.php:907
 msgid "Advanced"
 msgstr ""
 
-#: mod/admin.php:1461
+#: mod/admin.php:1489
 msgid "Auto Discovered Contact Directory"
 msgstr ""
 
-#: mod/admin.php:1462
+#: mod/admin.php:1490
 msgid "Performance"
 msgstr ""
 
-#: mod/admin.php:1463
+#: mod/admin.php:1491
 msgid "Worker"
 msgstr ""
 
-#: mod/admin.php:1464
+#: mod/admin.php:1492
 msgid "Message Relay"
 msgstr ""
 
-#: mod/admin.php:1465
+#: mod/admin.php:1493
 msgid ""
 "Relocate - WARNING: advanced function. Could make this server unreachable."
 msgstr ""
 
-#: mod/admin.php:1468
+#: mod/admin.php:1496
 msgid "Site name"
 msgstr ""
 
-#: mod/admin.php:1469
+#: mod/admin.php:1497
 msgid "Host name"
 msgstr ""
 
-#: mod/admin.php:1470
+#: mod/admin.php:1498
 msgid "Sender Email"
 msgstr ""
 
-#: mod/admin.php:1470
+#: mod/admin.php:1498
 msgid ""
 "The email address your server shall use to send notification emails from."
 msgstr ""
 
-#: mod/admin.php:1471
+#: mod/admin.php:1499
 msgid "Banner/Logo"
 msgstr ""
 
-#: mod/admin.php:1472
+#: mod/admin.php:1500
 msgid "Shortcut icon"
 msgstr ""
 
-#: mod/admin.php:1472
+#: mod/admin.php:1500
 msgid "Link to an icon that will be used for browsers."
 msgstr ""
 
-#: mod/admin.php:1473
+#: mod/admin.php:1501
 msgid "Touch icon"
 msgstr ""
 
-#: mod/admin.php:1473
+#: mod/admin.php:1501
 msgid "Link to an icon that will be used for tablets and mobiles."
 msgstr ""
 
-#: mod/admin.php:1474
+#: mod/admin.php:1502
 msgid "Additional Info"
 msgstr ""
 
-#: mod/admin.php:1474
+#: mod/admin.php:1502
 #, php-format
 msgid ""
 "For public servers: you can add additional information here that will be "
 "listed at %s/servers."
 msgstr ""
 
-#: mod/admin.php:1475
+#: mod/admin.php:1503
 msgid "System language"
 msgstr ""
 
-#: mod/admin.php:1476
+#: mod/admin.php:1504
 msgid "System theme"
 msgstr ""
 
-#: mod/admin.php:1476
+#: mod/admin.php:1504
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: mod/admin.php:1477
+#: mod/admin.php:1505
 msgid "Mobile system theme"
 msgstr ""
 
-#: mod/admin.php:1477
+#: mod/admin.php:1505
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: mod/admin.php:1478
+#: mod/admin.php:1506
 msgid "SSL link policy"
 msgstr ""
 
-#: mod/admin.php:1478
+#: mod/admin.php:1506
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: mod/admin.php:1479
+#: mod/admin.php:1507
 msgid "Force SSL"
 msgstr ""
 
-#: mod/admin.php:1479
+#: mod/admin.php:1507
 msgid ""
 "Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
 "to endless loops."
 msgstr ""
 
-#: mod/admin.php:1480
+#: mod/admin.php:1508
 msgid "Hide help entry from navigation menu"
 msgstr ""
 
-#: mod/admin.php:1480
+#: mod/admin.php:1508
 msgid ""
 "Hides the menu entry for the Help pages from the navigation menu. You can "
 "still access it calling /help directly."
 msgstr ""
 
-#: mod/admin.php:1481
+#: mod/admin.php:1509
 msgid "Single user instance"
 msgstr ""
 
-#: mod/admin.php:1481
+#: mod/admin.php:1509
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr ""
 
-#: mod/admin.php:1482
+#: mod/admin.php:1510
 msgid "Maximum image size"
 msgstr ""
 
-#: mod/admin.php:1482
+#: mod/admin.php:1510
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: mod/admin.php:1483
+#: mod/admin.php:1511
 msgid "Maximum image length"
 msgstr ""
 
-#: mod/admin.php:1483
+#: mod/admin.php:1511
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr ""
 
-#: mod/admin.php:1484
+#: mod/admin.php:1512
 msgid "JPEG image quality"
 msgstr ""
 
-#: mod/admin.php:1484
+#: mod/admin.php:1512
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr ""
 
-#: mod/admin.php:1486
+#: mod/admin.php:1514
 msgid "Register policy"
 msgstr ""
 
-#: mod/admin.php:1487
+#: mod/admin.php:1515
 msgid "Maximum Daily Registrations"
 msgstr ""
 
-#: mod/admin.php:1487
+#: mod/admin.php:1515
 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 ""
 
-#: mod/admin.php:1488
+#: mod/admin.php:1516
 msgid "Register text"
 msgstr ""
 
-#: mod/admin.php:1488
+#: mod/admin.php:1516
 msgid ""
 "Will be displayed prominently on the registration page. You can use BBCode "
 "here."
 msgstr ""
 
-#: mod/admin.php:1489
+#: mod/admin.php:1517
 msgid "Forbidden Nicknames"
 msgstr ""
 
-#: mod/admin.php:1489
+#: mod/admin.php:1517
 msgid ""
 "Comma separated list of nicknames that are forbidden from registration. "
 "Preset is a list of role names according RFC 2142."
 msgstr ""
 
-#: mod/admin.php:1490
+#: mod/admin.php:1518
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: mod/admin.php:1490
+#: mod/admin.php:1518
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: mod/admin.php:1491
+#: mod/admin.php:1519
 msgid "Allowed friend domains"
 msgstr ""
 
-#: mod/admin.php:1491
+#: mod/admin.php:1519
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: mod/admin.php:1492
+#: mod/admin.php:1520
 msgid "Allowed email domains"
 msgstr ""
 
-#: mod/admin.php:1492
+#: mod/admin.php:1520
 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 ""
 
-#: mod/admin.php:1493
+#: mod/admin.php:1521
 msgid "No OEmbed rich content"
 msgstr ""
 
-#: mod/admin.php:1493
+#: mod/admin.php:1521
 msgid ""
 "Don't show the rich content (e.g. embedded PDF), except from the domains "
 "listed below."
 msgstr ""
 
-#: mod/admin.php:1494
+#: mod/admin.php:1522
 msgid "Allowed OEmbed domains"
 msgstr ""
 
-#: mod/admin.php:1494
+#: mod/admin.php:1522
 msgid ""
 "Comma separated list of domains which oembed content is allowed to be "
 "displayed. Wildcards are accepted."
 msgstr ""
 
-#: mod/admin.php:1495
+#: mod/admin.php:1523
 msgid "Block public"
 msgstr ""
 
-#: mod/admin.php:1495
+#: mod/admin.php:1523
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
-#: mod/admin.php:1496
+#: mod/admin.php:1524
 msgid "Force publish"
 msgstr ""
 
-#: mod/admin.php:1496
+#: mod/admin.php:1524
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: mod/admin.php:1496
+#: mod/admin.php:1524
 msgid "Enabling this may violate privacy laws like the GDPR"
 msgstr ""
 
-#: mod/admin.php:1497
+#: mod/admin.php:1525
 msgid "Global directory URL"
 msgstr ""
 
-#: mod/admin.php:1497
+#: mod/admin.php:1525
 msgid ""
 "URL to the global directory. If this is not set, the global directory is "
 "completely unavailable to the application."
 msgstr ""
 
-#: mod/admin.php:1498
+#: mod/admin.php:1526
 msgid "Private posts by default for new users"
 msgstr ""
 
-#: mod/admin.php:1498
+#: mod/admin.php:1526
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr ""
 
-#: mod/admin.php:1499
+#: mod/admin.php:1527
 msgid "Don't include post content in email notifications"
 msgstr ""
 
-#: mod/admin.php:1499
+#: mod/admin.php:1527
 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 ""
 
-#: mod/admin.php:1500
+#: mod/admin.php:1528
 msgid "Disallow public access to addons listed in the apps menu."
 msgstr ""
 
-#: mod/admin.php:1500
+#: mod/admin.php:1528
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
 msgstr ""
 
-#: mod/admin.php:1501
+#: mod/admin.php:1529
 msgid "Don't embed private images in posts"
 msgstr ""
 
-#: mod/admin.php:1501
+#: mod/admin.php:1529
 msgid ""
 "Don't replace locally-hosted private photos in posts with an embedded copy "
 "of the image. This means that contacts who receive posts containing private "
 "photos will have to authenticate and load each image, which may take a while."
 msgstr ""
 
-#: mod/admin.php:1502
+#: mod/admin.php:1530
 msgid "Explicit Content"
 msgstr ""
 
-#: mod/admin.php:1502
+#: mod/admin.php:1530
 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 "
@@ -2262,210 +2157,210 @@ msgid ""
 "will be shown at the user registration page."
 msgstr ""
 
-#: mod/admin.php:1503
+#: mod/admin.php:1531
 msgid "Allow Users to set remote_self"
 msgstr ""
 
-#: mod/admin.php:1503
+#: mod/admin.php:1531
 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 ""
 
-#: mod/admin.php:1504
+#: mod/admin.php:1532
 msgid "Block multiple registrations"
 msgstr ""
 
-#: mod/admin.php:1504
+#: mod/admin.php:1532
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: mod/admin.php:1505
+#: mod/admin.php:1533
 msgid "OpenID support"
 msgstr ""
 
-#: mod/admin.php:1505
+#: mod/admin.php:1533
 msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: mod/admin.php:1506
+#: mod/admin.php:1534
 msgid "Fullname check"
 msgstr ""
 
-#: mod/admin.php:1506
+#: mod/admin.php:1534
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""
 
-#: mod/admin.php:1507
+#: mod/admin.php:1535
 msgid "Community pages for visitors"
 msgstr ""
 
-#: mod/admin.php:1507
+#: mod/admin.php:1535
 msgid ""
 "Which community pages should be available for visitors. Local users always "
 "see both pages."
 msgstr ""
 
-#: mod/admin.php:1508
+#: mod/admin.php:1536
 msgid "Posts per user on community page"
 msgstr ""
 
-#: mod/admin.php:1508
+#: mod/admin.php:1536
 msgid ""
 "The maximum number of posts per user on the community page. (Not valid for "
 "'Global Community')"
 msgstr ""
 
-#: mod/admin.php:1509
+#: mod/admin.php:1537
 msgid "Enable OStatus support"
 msgstr ""
 
-#: mod/admin.php:1509
+#: mod/admin.php:1537
 msgid ""
 "Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr ""
 
-#: mod/admin.php:1510
+#: mod/admin.php:1538
 msgid "Only import OStatus/ActivityPub threads from our contacts"
 msgstr ""
 
-#: mod/admin.php:1510
+#: mod/admin.php:1538
 msgid ""
 "Normally we import every content from our OStatus and ActivityPub contacts. "
 "With this option we only store threads that are started by a contact that is "
 "known on our system."
 msgstr ""
 
-#: mod/admin.php:1511
+#: mod/admin.php:1539
 msgid "OStatus support can only be enabled if threading is enabled."
 msgstr ""
 
-#: mod/admin.php:1513
+#: mod/admin.php:1541
 msgid ""
 "Diaspora support can't be enabled because Friendica was installed into a sub "
 "directory."
 msgstr ""
 
-#: mod/admin.php:1514
+#: mod/admin.php:1542
 msgid "Enable Diaspora support"
 msgstr ""
 
-#: mod/admin.php:1514
+#: mod/admin.php:1542
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: mod/admin.php:1515
+#: mod/admin.php:1543
 msgid "Only allow Friendica contacts"
 msgstr ""
 
-#: mod/admin.php:1515
+#: mod/admin.php:1543
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 
-#: mod/admin.php:1516
+#: mod/admin.php:1544
 msgid "Verify SSL"
 msgstr ""
 
-#: mod/admin.php:1516
+#: mod/admin.php:1544
 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 ""
 
-#: mod/admin.php:1517
+#: mod/admin.php:1545
 msgid "Proxy user"
 msgstr ""
 
-#: mod/admin.php:1518
+#: mod/admin.php:1546
 msgid "Proxy URL"
 msgstr ""
 
-#: mod/admin.php:1519
+#: mod/admin.php:1547
 msgid "Network timeout"
 msgstr ""
 
-#: mod/admin.php:1519
+#: mod/admin.php:1547
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: mod/admin.php:1520
+#: mod/admin.php:1548
 msgid "Maximum Load Average"
 msgstr ""
 
-#: mod/admin.php:1520
+#: mod/admin.php:1548
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: mod/admin.php:1521
+#: mod/admin.php:1549
 msgid "Maximum Load Average (Frontend)"
 msgstr ""
 
-#: mod/admin.php:1521
+#: mod/admin.php:1549
 msgid "Maximum system load before the frontend quits service - default 50."
 msgstr ""
 
-#: mod/admin.php:1522
+#: mod/admin.php:1550
 msgid "Minimal Memory"
 msgstr ""
 
-#: mod/admin.php:1522
+#: mod/admin.php:1550
 msgid ""
 "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
 "default 0 (deactivated)."
 msgstr ""
 
-#: mod/admin.php:1523
+#: mod/admin.php:1551
 msgid "Maximum table size for optimization"
 msgstr ""
 
-#: mod/admin.php:1523
+#: mod/admin.php:1551
 msgid ""
 "Maximum table size (in MB) for the automatic optimization. Enter -1 to "
 "disable it."
 msgstr ""
 
-#: mod/admin.php:1524
+#: mod/admin.php:1552
 msgid "Minimum level of fragmentation"
 msgstr ""
 
-#: mod/admin.php:1524
+#: mod/admin.php:1552
 msgid ""
 "Minimum fragmenation level to start the automatic optimization - default "
 "value is 30%."
 msgstr ""
 
-#: mod/admin.php:1526
+#: mod/admin.php:1554
 msgid "Periodical check of global contacts"
 msgstr ""
 
-#: mod/admin.php:1526
+#: mod/admin.php:1554
 msgid ""
 "If enabled, the global contacts are checked periodically for missing or "
 "outdated data and the vitality of the contacts and servers."
 msgstr ""
 
-#: mod/admin.php:1527
+#: mod/admin.php:1555
 msgid "Days between requery"
 msgstr ""
 
-#: mod/admin.php:1527
+#: mod/admin.php:1555
 msgid "Number of days after which a server is requeried for his contacts."
 msgstr ""
 
-#: mod/admin.php:1528
+#: mod/admin.php:1556
 msgid "Discover contacts from other servers"
 msgstr ""
 
-#: mod/admin.php:1528
+#: mod/admin.php:1556
 msgid ""
 "Periodically query other servers for contacts. You can choose between "
 "'users': the users on the remote system, 'Global Contacts': active contacts "
@@ -2475,32 +2370,32 @@ msgid ""
 "Global Contacts'."
 msgstr ""
 
-#: mod/admin.php:1529
+#: mod/admin.php:1557
 msgid "Timeframe for fetching global contacts"
 msgstr ""
 
-#: mod/admin.php:1529
+#: mod/admin.php:1557
 msgid ""
 "When the discovery is activated, this value defines the timeframe for the "
 "activity of the global contacts that are fetched from other servers."
 msgstr ""
 
-#: mod/admin.php:1530
+#: mod/admin.php:1558
 msgid "Search the local directory"
 msgstr ""
 
-#: mod/admin.php:1530
+#: mod/admin.php:1558
 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 ""
 
-#: mod/admin.php:1532
+#: mod/admin.php:1560
 msgid "Publish server information"
 msgstr ""
 
-#: mod/admin.php:1532
+#: mod/admin.php:1560
 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 "
@@ -2508,50 +2403,50 @@ msgid ""
 "href='http://the-federation.info/'>the-federation.info</a> for details."
 msgstr ""
 
-#: mod/admin.php:1534
+#: mod/admin.php:1562
 msgid "Check upstream version"
 msgstr ""
 
-#: mod/admin.php:1534
+#: mod/admin.php:1562
 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 ""
 
-#: mod/admin.php:1535
+#: mod/admin.php:1563
 msgid "Suppress Tags"
 msgstr ""
 
-#: mod/admin.php:1535
+#: mod/admin.php:1563
 msgid "Suppress showing a list of hashtags at the end of the posting."
 msgstr ""
 
-#: mod/admin.php:1536
+#: mod/admin.php:1564
 msgid "Clean database"
 msgstr ""
 
-#: mod/admin.php:1536
+#: mod/admin.php:1564
 msgid ""
 "Remove old remote items, orphaned database records and old content from some "
 "other helper tables."
 msgstr ""
 
-#: mod/admin.php:1537
+#: mod/admin.php:1565
 msgid "Lifespan of remote items"
 msgstr ""
 
-#: mod/admin.php:1537
+#: mod/admin.php:1565
 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 ""
 
-#: mod/admin.php:1538
+#: mod/admin.php:1566
 msgid "Lifespan of unclaimed items"
 msgstr ""
 
-#: mod/admin.php:1538
+#: mod/admin.php:1566
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "unclaimed remote items (mostly content from the relay) will be deleted. "
@@ -2559,130 +2454,141 @@ msgid ""
 "items if set to 0."
 msgstr ""
 
-#: mod/admin.php:1539
+#: mod/admin.php:1567
+msgid "Lifespan of raw conversation data"
+msgstr ""
+
+#: mod/admin.php:1567
+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 ""
+
+#: mod/admin.php:1568
 msgid "Path to item cache"
 msgstr ""
 
-#: mod/admin.php:1539
+#: mod/admin.php:1568
 msgid "The item caches buffers generated bbcode and external images."
 msgstr ""
 
-#: mod/admin.php:1540
+#: mod/admin.php:1569
 msgid "Cache duration in seconds"
 msgstr ""
 
-#: mod/admin.php:1540
+#: mod/admin.php:1569
 msgid ""
 "How long should the cache files be hold? Default value is 86400 seconds (One "
 "day). To disable the item cache, set the value to -1."
 msgstr ""
 
-#: mod/admin.php:1541
+#: mod/admin.php:1570
 msgid "Maximum numbers of comments per post"
 msgstr ""
 
-#: mod/admin.php:1541
+#: mod/admin.php:1570
 msgid "How much comments should be shown for each post? Default value is 100."
 msgstr ""
 
-#: mod/admin.php:1542
+#: mod/admin.php:1571
 msgid "Temp path"
 msgstr ""
 
-#: mod/admin.php:1542
+#: mod/admin.php:1571
 msgid ""
 "If you have a restricted system where the webserver can't access the system "
 "temp path, enter another path here."
 msgstr ""
 
-#: mod/admin.php:1543
+#: mod/admin.php:1572
 msgid "Base path to installation"
 msgstr ""
 
-#: mod/admin.php:1543
+#: mod/admin.php:1572
 msgid ""
 "If the system cannot detect the correct path to your installation, enter the "
 "correct path here. This setting should only be set if you are using a "
 "restricted system and symbolic links to your webroot."
 msgstr ""
 
-#: mod/admin.php:1544
+#: mod/admin.php:1573
 msgid "Disable picture proxy"
 msgstr ""
 
-#: mod/admin.php:1544
+#: mod/admin.php:1573
 msgid ""
 "The picture proxy increases performance and privacy. It shouldn't be used on "
 "systems with very low bandwidth."
 msgstr ""
 
-#: mod/admin.php:1545
+#: mod/admin.php:1574
 msgid "Only search in tags"
 msgstr ""
 
-#: mod/admin.php:1545
+#: mod/admin.php:1574
 msgid "On large systems the text search can slow down the system extremely."
 msgstr ""
 
-#: mod/admin.php:1547
+#: mod/admin.php:1576
 msgid "New base url"
 msgstr ""
 
-#: mod/admin.php:1547
+#: mod/admin.php:1576
 msgid ""
 "Change base url for this server. Sends relocate message to all Friendica and "
 "Diaspora* contacts of all users."
 msgstr ""
 
-#: mod/admin.php:1549
+#: mod/admin.php:1578
 msgid "RINO Encryption"
 msgstr ""
 
-#: mod/admin.php:1549
+#: mod/admin.php:1578
 msgid "Encryption layer between nodes."
 msgstr ""
 
-#: mod/admin.php:1549
+#: mod/admin.php:1578
 msgid "Enabled"
 msgstr ""
 
-#: mod/admin.php:1551
+#: mod/admin.php:1580
 msgid "Maximum number of parallel workers"
 msgstr ""
 
-#: mod/admin.php:1551
+#: mod/admin.php:1580
 #, php-format
 msgid ""
 "On shared hosters set this to %d. On larger systems, values of %d are great. "
 "Default value is %d."
 msgstr ""
 
-#: mod/admin.php:1552
+#: mod/admin.php:1581
 msgid "Don't use 'proc_open' with the worker"
 msgstr ""
 
-#: mod/admin.php:1552
+#: mod/admin.php:1581
 msgid ""
 "Enable this if your system doesn't allow the use of 'proc_open'. This can "
 "happen on shared hosters. If this is enabled you should increase the "
 "frequency of worker calls in your crontab."
 msgstr ""
 
-#: mod/admin.php:1553
+#: mod/admin.php:1582
 msgid "Enable fastlane"
 msgstr ""
 
-#: mod/admin.php:1553
+#: mod/admin.php:1582
 msgid ""
 "When enabed, the fastlane mechanism starts an additional worker if processes "
 "with higher priority are blocked by processes of lower priority."
 msgstr ""
 
-#: mod/admin.php:1554
+#: mod/admin.php:1583
 msgid "Enable frontend worker"
 msgstr ""
 
-#: mod/admin.php:1554
+#: mod/admin.php:1583
 #, php-format
 msgid ""
 "When enabled the Worker process is triggered when backend access is "
@@ -2692,135 +2598,135 @@ msgid ""
 "on your server."
 msgstr ""
 
-#: mod/admin.php:1556
+#: mod/admin.php:1585
 msgid "Subscribe to relay"
 msgstr ""
 
-#: mod/admin.php:1556
+#: mod/admin.php:1585
 msgid ""
 "Enables the receiving of public posts from the relay. They will be included "
 "in the search, subscribed tags and on the global community page."
 msgstr ""
 
-#: mod/admin.php:1557
+#: mod/admin.php:1586
 msgid "Relay server"
 msgstr ""
 
-#: mod/admin.php:1557
+#: mod/admin.php:1586
 msgid ""
 "Address of the relay server where public posts should be send to. For "
 "example https://relay.diasp.org"
 msgstr ""
 
-#: mod/admin.php:1558
+#: mod/admin.php:1587
 msgid "Direct relay transfer"
 msgstr ""
 
-#: mod/admin.php:1558
+#: mod/admin.php:1587
 msgid ""
 "Enables the direct transfer to other servers without using the relay servers"
 msgstr ""
 
-#: mod/admin.php:1559
+#: mod/admin.php:1588
 msgid "Relay scope"
 msgstr ""
 
-#: mod/admin.php:1559
+#: mod/admin.php:1588
 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 ""
 
-#: mod/admin.php:1559
+#: mod/admin.php:1588
 msgid "all"
 msgstr ""
 
-#: mod/admin.php:1559
+#: mod/admin.php:1588
 msgid "tags"
 msgstr ""
 
-#: mod/admin.php:1560
+#: mod/admin.php:1589
 msgid "Server tags"
 msgstr ""
 
-#: mod/admin.php:1560
+#: mod/admin.php:1589
 msgid "Comma separated list of tags for the 'tags' subscription."
 msgstr ""
 
-#: mod/admin.php:1561
+#: mod/admin.php:1590
 msgid "Allow user tags"
 msgstr ""
 
-#: mod/admin.php:1561
+#: mod/admin.php:1590
 msgid ""
 "If enabled, the tags from the saved searches will used for the 'tags' "
 "subscription in addition to the 'relay_server_tags'."
 msgstr ""
 
-#: mod/admin.php:1564
+#: mod/admin.php:1593
 msgid "Start Relocation"
 msgstr ""
 
-#: mod/admin.php:1590
+#: mod/admin.php:1619
 msgid "Update has been marked successful"
 msgstr ""
 
-#: mod/admin.php:1597
+#: mod/admin.php:1626
 #, php-format
 msgid "Database structure update %s was successfully applied."
 msgstr ""
 
-#: mod/admin.php:1600
+#: mod/admin.php:1630
 #, php-format
 msgid "Executing of database structure update %s failed with error: %s"
 msgstr ""
 
-#: mod/admin.php:1616
+#: mod/admin.php:1646
 #, php-format
 msgid "Executing %s failed with error: %s"
 msgstr ""
 
-#: mod/admin.php:1618
+#: mod/admin.php:1648
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: mod/admin.php:1621
+#: mod/admin.php:1651
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: mod/admin.php:1624
+#: mod/admin.php:1654
 #, php-format
 msgid "There was no additional update function %s that needed to be called."
 msgstr ""
 
-#: mod/admin.php:1647
+#: mod/admin.php:1677
 msgid "No failed updates."
 msgstr ""
 
-#: mod/admin.php:1648
+#: mod/admin.php:1678
 msgid "Check database structure"
 msgstr ""
 
-#: mod/admin.php:1653
+#: mod/admin.php:1683
 msgid "Failed Updates"
 msgstr ""
 
-#: mod/admin.php:1654
+#: mod/admin.php:1684
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
-#: mod/admin.php:1655
+#: mod/admin.php:1685
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: mod/admin.php:1656
+#: mod/admin.php:1686
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: mod/admin.php:1695
+#: mod/admin.php:1725
 #, php-format
 msgid ""
 "\n"
@@ -2828,7 +2734,7 @@ msgid ""
 "\t\t\t\tthe administrator of %2$s has set up an account for you."
 msgstr ""
 
-#: mod/admin.php:1698
+#: mod/admin.php:1728
 #, php-format
 msgid ""
 "\n"
@@ -2867,217 +2773,212 @@ msgid ""
 "\t\t\tThank you and welcome to %4$s."
 msgstr ""
 
-#: mod/admin.php:1735 src/Model/User.php:771
+#: mod/admin.php:1765 src/Model/User.php:772
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
-#: mod/admin.php:1745
+#: mod/admin.php:1775
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mod/admin.php:1751
+#: mod/admin.php:1781
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mod/admin.php:1798
+#: mod/admin.php:1828
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: mod/admin.php:1806
+#: mod/admin.php:1836
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: mod/admin.php:1806
+#: mod/admin.php:1836
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: mod/admin.php:1854 mod/settings.php:1062
+#: mod/admin.php:1884 mod/settings.php:1064
 msgid "Normal Account Page"
 msgstr ""
 
-#: mod/admin.php:1855 mod/settings.php:1066
+#: mod/admin.php:1885 mod/settings.php:1068
 msgid "Soapbox Page"
 msgstr ""
 
-#: mod/admin.php:1856 mod/settings.php:1070
+#: mod/admin.php:1886 mod/settings.php:1072
 msgid "Public Forum"
 msgstr ""
 
-#: mod/admin.php:1857 mod/settings.php:1074
+#: mod/admin.php:1887 mod/settings.php:1076
 msgid "Automatic Friend Page"
 msgstr ""
 
-#: mod/admin.php:1858
+#: mod/admin.php:1888
 msgid "Private Forum"
 msgstr ""
 
-#: mod/admin.php:1861 mod/settings.php:1046
+#: mod/admin.php:1891 mod/settings.php:1048
 msgid "Personal Page"
 msgstr ""
 
-#: mod/admin.php:1862 mod/settings.php:1050
+#: mod/admin.php:1892 mod/settings.php:1052
 msgid "Organisation Page"
 msgstr ""
 
-#: mod/admin.php:1863 mod/settings.php:1054
+#: mod/admin.php:1893 mod/settings.php:1056
 msgid "News Page"
 msgstr ""
 
-#: mod/admin.php:1864 mod/settings.php:1058
+#: mod/admin.php:1894 mod/settings.php:1060
 msgid "Community Forum"
 msgstr ""
 
-#: mod/admin.php:1910 mod/admin.php:1921 mod/admin.php:1935 mod/admin.php:1953
-#: src/Content/ContactSelector.php:83
+#: mod/admin.php:1940 mod/admin.php:1951 mod/admin.php:1965 mod/admin.php:1983
+#: src/Content/ContactSelector.php:84
 msgid "Email"
 msgstr ""
 
-#: mod/admin.php:1910 mod/admin.php:1935
+#: mod/admin.php:1940 mod/admin.php:1965
 msgid "Register date"
 msgstr ""
 
-#: mod/admin.php:1910 mod/admin.php:1935
+#: mod/admin.php:1940 mod/admin.php:1965
 msgid "Last login"
 msgstr ""
 
-#: mod/admin.php:1910 mod/admin.php:1935
+#: mod/admin.php:1940 mod/admin.php:1965
 msgid "Last item"
 msgstr ""
 
-#: mod/admin.php:1910
+#: mod/admin.php:1940
 msgid "Type"
 msgstr ""
 
-#: mod/admin.php:1917
+#: mod/admin.php:1947
 msgid "Add User"
 msgstr ""
 
-#: mod/admin.php:1919
+#: mod/admin.php:1949
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: mod/admin.php:1920
+#: mod/admin.php:1950
 msgid "User waiting for permanent deletion"
 msgstr ""
 
-#: mod/admin.php:1921
+#: mod/admin.php:1951
 msgid "Request date"
 msgstr ""
 
-#: mod/admin.php:1922
+#: mod/admin.php:1952
 msgid "No registrations."
 msgstr ""
 
-#: mod/admin.php:1923
+#: mod/admin.php:1953
 msgid "Note from the user"
 msgstr ""
 
-#: mod/admin.php:1924 mod/notifications.php:180 mod/notifications.php:266
+#: mod/admin.php:1954 mod/notifications.php:181 mod/notifications.php:267
 msgid "Approve"
 msgstr ""
 
-#: mod/admin.php:1925
+#: mod/admin.php:1955
 msgid "Deny"
 msgstr ""
 
-#: mod/admin.php:1928
+#: mod/admin.php:1958
 msgid "User blocked"
 msgstr ""
 
-#: mod/admin.php:1930
+#: mod/admin.php:1960
 msgid "Site admin"
 msgstr ""
 
-#: mod/admin.php:1931
+#: mod/admin.php:1961
 msgid "Account expired"
 msgstr ""
 
-#: mod/admin.php:1934
+#: mod/admin.php:1964
 msgid "New User"
 msgstr ""
 
-#: mod/admin.php:1935
+#: mod/admin.php:1965
 msgid "Delete in"
 msgstr ""
 
-#: mod/admin.php:1940
+#: mod/admin.php:1970
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: mod/admin.php:1941
+#: mod/admin.php:1971
 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 ""
 
-#: mod/admin.php:1951
+#: mod/admin.php:1981
 msgid "Name of the new user."
 msgstr ""
 
-#: mod/admin.php:1952
+#: mod/admin.php:1982
 msgid "Nickname"
 msgstr ""
 
-#: mod/admin.php:1952
+#: mod/admin.php:1982
 msgid "Nickname of the new user."
 msgstr ""
 
-#: mod/admin.php:1953
+#: mod/admin.php:1983
 msgid "Email address of the new user."
 msgstr ""
 
-#: mod/admin.php:1994
+#: mod/admin.php:2024
 #, php-format
 msgid "Addon %s disabled."
 msgstr ""
 
-#: mod/admin.php:1997
+#: mod/admin.php:2027
 #, php-format
 msgid "Addon %s enabled."
 msgstr ""
 
-#: mod/admin.php:2008 mod/admin.php:2257
+#: mod/admin.php:2038 mod/admin.php:2287
 msgid "Disable"
 msgstr ""
 
-#: mod/admin.php:2011 mod/admin.php:2260
+#: mod/admin.php:2041 mod/admin.php:2290
 msgid "Enable"
 msgstr ""
 
-#: mod/admin.php:2033 mod/admin.php:2303
+#: mod/admin.php:2063 mod/admin.php:2333
 msgid "Toggle"
 msgstr ""
 
-#: mod/admin.php:2034 mod/admin.php:2304 mod/newmember.php:19
-#: mod/settings.php:134 view/theme/frio/theme.php:281 src/Content/Nav.php:259
-msgid "Settings"
-msgstr ""
-
-#: mod/admin.php:2041 mod/admin.php:2312
+#: mod/admin.php:2071 mod/admin.php:2342
 msgid "Author: "
 msgstr ""
 
-#: mod/admin.php:2042 mod/admin.php:2313
+#: mod/admin.php:2072 mod/admin.php:2343
 msgid "Maintainer: "
 msgstr ""
 
-#: mod/admin.php:2094
+#: mod/admin.php:2124
 msgid "Reload active addons"
 msgstr ""
 
-#: mod/admin.php:2099
+#: mod/admin.php:2129
 #, php-format
 msgid ""
 "There are currently no addons available on your node. You can find the "
@@ -3085,70 +2986,70 @@ msgid ""
 "the open addon registry at %2$s"
 msgstr ""
 
-#: mod/admin.php:2219
+#: mod/admin.php:2249
 msgid "No themes found."
 msgstr ""
 
-#: mod/admin.php:2294
+#: mod/admin.php:2324
 msgid "Screenshot"
 msgstr ""
 
-#: mod/admin.php:2348
+#: mod/admin.php:2378
 msgid "Reload active themes"
 msgstr ""
 
-#: mod/admin.php:2353
+#: mod/admin.php:2383
 #, php-format
 msgid "No themes found on the system. They should be placed in %1$s"
 msgstr ""
 
-#: mod/admin.php:2354
+#: mod/admin.php:2384
 msgid "[Experimental]"
 msgstr ""
 
-#: mod/admin.php:2355
+#: mod/admin.php:2385
 msgid "[Unsupported]"
 msgstr ""
 
-#: mod/admin.php:2379
+#: mod/admin.php:2409
 msgid "Log settings updated."
 msgstr ""
 
-#: mod/admin.php:2412
+#: mod/admin.php:2442
 msgid "PHP log currently enabled."
 msgstr ""
 
-#: mod/admin.php:2414
+#: mod/admin.php:2444
 msgid "PHP log currently disabled."
 msgstr ""
 
-#: mod/admin.php:2423
+#: mod/admin.php:2453
 msgid "Clear"
 msgstr ""
 
-#: mod/admin.php:2427
+#: mod/admin.php:2457
 msgid "Enable Debugging"
 msgstr ""
 
-#: mod/admin.php:2428
+#: mod/admin.php:2458
 msgid "Log file"
 msgstr ""
 
-#: mod/admin.php:2428
+#: mod/admin.php:2458
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: mod/admin.php:2429
+#: mod/admin.php:2459
 msgid "Log level"
 msgstr ""
 
-#: mod/admin.php:2431
+#: mod/admin.php:2461
 msgid "PHP logging"
 msgstr ""
 
-#: mod/admin.php:2432
+#: mod/admin.php:2462
 msgid ""
 "To temporarily enable logging of PHP errors and warnings you can prepend the "
 "following to the index.php file of your installation. The filename set in "
@@ -3157,1142 +3058,1149 @@ msgid ""
 "'display_errors' is to enable these options, set to '0' to disable them."
 msgstr ""
 
-#: mod/admin.php:2463
+#: mod/admin.php:2493
 #, php-format
 msgid ""
 "Error trying to open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see "
 "if file %1$s exist and is readable."
 msgstr ""
 
-#: mod/admin.php:2467
+#: mod/admin.php:2497
 #, php-format
 msgid ""
 "Couldn't open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see if file "
 "%1$s is readable."
 msgstr ""
 
-#: mod/admin.php:2558 mod/admin.php:2559 mod/settings.php:776
+#: mod/admin.php:2588 mod/admin.php:2589 mod/settings.php:778
 msgid "Off"
 msgstr ""
 
-#: mod/admin.php:2558 mod/admin.php:2559 mod/settings.php:776
+#: mod/admin.php:2588 mod/admin.php:2589 mod/settings.php:778
 msgid "On"
 msgstr ""
 
-#: mod/admin.php:2559
+#: mod/admin.php:2589
 #, php-format
 msgid "Lock feature %s"
 msgstr ""
 
-#: mod/admin.php:2567
+#: mod/admin.php:2597
 msgid "Manage Additional Features"
 msgstr ""
 
-#: mod/allfriends.php:53
+#: mod/allfriends.php:54
 msgid "No friends to display."
 msgstr ""
 
-#: mod/allfriends.php:92 mod/dirfind.php:217 mod/match.php:105
-#: mod/suggest.php:104 src/Content/Widget.php:37 src/Model/Profile.php:306
+#: mod/allfriends.php:93 mod/dirfind.php:219 mod/match.php:107
+#: mod/suggest.php:105 src/Content/Widget.php:41 src/Model/Profile.php:309
 msgid "Connect"
 msgstr ""
 
-#: mod/api.php:86 mod/api.php:108
+#: mod/api.php:87 mod/api.php:109
 msgid "Authorize application connection"
 msgstr ""
 
-#: mod/api.php:87
+#: mod/api.php:88
 msgid "Return to your app and insert this Securty Code:"
 msgstr ""
 
-#: mod/api.php:96
+#: mod/api.php:97
 msgid "Please login to continue."
 msgstr ""
 
-#: mod/api.php:110
+#: mod/api.php:111
 msgid ""
 "Do you want to authorize this application to access your posts and contacts, "
 "and/or create new posts for you?"
 msgstr ""
 
-#: mod/api.php:112 mod/dfrn_request.php:646 mod/follow.php:152
-#: mod/profiles.php:540 mod/profiles.php:544 mod/profiles.php:565
-#: mod/register.php:238 mod/settings.php:1098 mod/settings.php:1104
-#: mod/settings.php:1111 mod/settings.php:1115 mod/settings.php:1119
-#: mod/settings.php:1123 mod/settings.php:1127 mod/settings.php:1131
-#: mod/settings.php:1151 mod/settings.php:1152 mod/settings.php:1153
-#: mod/settings.php:1154 mod/settings.php:1155
+#: mod/api.php:113 mod/dfrn_request.php:648 mod/follow.php:154
+#: mod/profiles.php:542 mod/profiles.php:546 mod/profiles.php:567
+#: mod/register.php:240 mod/settings.php:1100 mod/settings.php:1106
+#: mod/settings.php:1113 mod/settings.php:1117 mod/settings.php:1121
+#: mod/settings.php:1125 mod/settings.php:1129 mod/settings.php:1133
+#: mod/settings.php:1153 mod/settings.php:1154 mod/settings.php:1155
+#: mod/settings.php:1156 mod/settings.php:1157
 msgid "No"
 msgstr ""
 
-#: mod/apps.php:14 src/App.php:1746
+#: mod/apps.php:15 src/App.php:1618
 msgid "You must be logged in to use addons. "
 msgstr ""
 
-#: mod/apps.php:19
+#: mod/apps.php:20
 msgid "Applications"
 msgstr ""
 
-#: mod/apps.php:24
+#: mod/apps.php:25
 msgid "No installed applications."
 msgstr ""
 
-#: mod/attach.php:16
-msgid "Item not available."
-msgstr ""
-
-#: mod/attach.php:26
-msgid "Item was not found."
-msgstr ""
-
-#: mod/babel.php:24
+#: mod/babel.php:25
 msgid "Source input"
 msgstr ""
 
-#: mod/babel.php:30
+#: mod/babel.php:31
 msgid "BBCode::toPlaintext"
 msgstr ""
 
-#: mod/babel.php:36
+#: mod/babel.php:37
 msgid "BBCode::convert (raw HTML)"
 msgstr ""
 
-#: mod/babel.php:41
+#: mod/babel.php:42
 msgid "BBCode::convert"
 msgstr ""
 
-#: mod/babel.php:47
+#: mod/babel.php:48
 msgid "BBCode::convert => HTML::toBBCode"
 msgstr ""
 
-#: mod/babel.php:53
+#: mod/babel.php:54
 msgid "BBCode::toMarkdown"
 msgstr ""
 
-#: mod/babel.php:59
+#: mod/babel.php:60
 msgid "BBCode::toMarkdown => Markdown::convert"
 msgstr ""
 
-#: mod/babel.php:65
+#: mod/babel.php:66
 msgid "BBCode::toMarkdown => Markdown::toBBCode"
 msgstr ""
 
-#: mod/babel.php:71
+#: mod/babel.php:72
 msgid "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"
 msgstr ""
 
-#: mod/babel.php:78
+#: mod/babel.php:79
 msgid "Source input (Diaspora format)"
 msgstr ""
 
-#: mod/babel.php:84
+#: mod/babel.php:85
 msgid "Markdown::convert (raw HTML)"
 msgstr ""
 
-#: mod/babel.php:89
+#: mod/babel.php:90
 msgid "Markdown::convert"
 msgstr ""
 
-#: mod/babel.php:95
+#: mod/babel.php:96
 msgid "Markdown::toBBCode"
 msgstr ""
 
-#: mod/babel.php:102
+#: mod/babel.php:103
 msgid "Raw HTML input"
 msgstr ""
 
-#: mod/babel.php:107
+#: mod/babel.php:108
 msgid "HTML Input"
 msgstr ""
 
-#: mod/babel.php:113
+#: mod/babel.php:114
 msgid "HTML::toBBCode"
 msgstr ""
 
-#: mod/babel.php:119
+#: mod/babel.php:120
 msgid "HTML::toBBCode => BBCode::convert"
 msgstr ""
 
-#: mod/babel.php:124
+#: mod/babel.php:125
 msgid "HTML::toBBCode => BBCode::convert (raw HTML)"
 msgstr ""
 
-#: mod/babel.php:130
+#: mod/babel.php:131
 msgid "HTML::toMarkdown"
 msgstr ""
 
-#: mod/babel.php:136
+#: mod/babel.php:137
 msgid "HTML::toPlaintext"
 msgstr ""
 
-#: mod/babel.php:144
+#: mod/babel.php:145
 msgid "Source text"
 msgstr ""
 
-#: mod/babel.php:145
+#: mod/babel.php:146
 msgid "BBCode"
 msgstr ""
 
-#: mod/babel.php:146
+#: mod/babel.php:147
 msgid "Markdown"
 msgstr ""
 
-#: mod/babel.php:147
+#: mod/babel.php:148
 msgid "HTML"
 msgstr ""
 
-#: mod/bookmarklet.php:24 src/Content/Nav.php:166 src/Module/Login.php:320
+#: mod/bookmarklet.php:25 src/Content/Nav.php:167 src/Module/Login.php:322
 msgid "Login"
 msgstr ""
 
-#: mod/bookmarklet.php:34
+#: mod/bookmarklet.php:35
 msgid "Bad Request"
 msgstr ""
 
-#: mod/bookmarklet.php:56
+#: mod/bookmarklet.php:57
 msgid "The post was created"
 msgstr ""
 
-#: mod/cal.php:34 mod/cal.php:38 mod/community.php:37 mod/follow.php:19
-#: mod/viewcontacts.php:22 mod/viewcontacts.php:26 mod/viewsrc.php:13
-msgid "Access denied."
-msgstr ""
-
-#: mod/cal.php:46 mod/dfrn_poll.php:492 mod/help.php:65 mod/viewcontacts.php:37
-#: src/App.php:1797
+#: mod/cal.php:47 mod/dfrn_poll.php:493 mod/help.php:67 mod/viewcontacts.php:38
+#: src/App.php:1669
 msgid "Page not found."
 msgstr ""
 
-#: mod/cal.php:141 mod/display.php:309 mod/profile.php:188
+#: mod/cal.php:142 mod/display.php:311 mod/profile.php:190
 msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: mod/cal.php:273 mod/events.php:388 view/theme/frio/theme.php:275
-#: view/theme/frio/theme.php:279 src/Content/Nav.php:156
-#: src/Content/Nav.php:222 src/Model/Profile.php:925 src/Model/Profile.php:936
+#: mod/cal.php:274 mod/events.php:390 view/theme/frio/theme.php:277
+#: view/theme/frio/theme.php:281 src/Content/Nav.php:157
+#: src/Content/Nav.php:223 src/Model/Profile.php:928 src/Model/Profile.php:939
 msgid "Events"
 msgstr ""
 
-#: mod/cal.php:274 mod/events.php:389
+#: mod/cal.php:275 mod/events.php:391
 msgid "View"
 msgstr ""
 
-#: mod/cal.php:275 mod/events.php:391
+#: mod/cal.php:276 mod/events.php:393
 msgid "Previous"
 msgstr ""
 
-#: mod/cal.php:276 mod/events.php:392 src/Module/Install.php:133
+#: mod/cal.php:277 mod/events.php:394 src/Module/Install.php:135
 msgid "Next"
 msgstr ""
 
-#: mod/cal.php:279 mod/events.php:397 src/Model/Event.php:423
+#: mod/cal.php:280 mod/events.php:399 src/Model/Event.php:425
 msgid "today"
 msgstr ""
 
-#: mod/cal.php:280 mod/events.php:398 src/Util/Temporal.php:311
-#: src/Model/Event.php:424
+#: mod/cal.php:281 mod/events.php:400 src/Util/Temporal.php:312
+#: src/Model/Event.php:426
 msgid "month"
 msgstr ""
 
-#: mod/cal.php:281 mod/events.php:399 src/Util/Temporal.php:312
-#: src/Model/Event.php:425
+#: mod/cal.php:282 mod/events.php:401 src/Util/Temporal.php:313
+#: src/Model/Event.php:427
 msgid "week"
 msgstr ""
 
-#: mod/cal.php:282 mod/events.php:400 src/Util/Temporal.php:313
-#: src/Model/Event.php:426
+#: mod/cal.php:283 mod/events.php:402 src/Util/Temporal.php:314
+#: src/Model/Event.php:428
 msgid "day"
 msgstr ""
 
-#: mod/cal.php:283 mod/events.php:401
+#: mod/cal.php:284 mod/events.php:403
 msgid "list"
 msgstr ""
 
-#: mod/cal.php:296 src/Core/Console/NewPassword.php:68 src/Model/User.php:258
+#: mod/cal.php:297 src/Core/Console/NewPassword.php:68 src/Model/User.php:259
 msgid "User not found"
 msgstr ""
 
-#: mod/cal.php:312
+#: mod/cal.php:313
 msgid "This calendar format is not supported"
 msgstr ""
 
-#: mod/cal.php:314
+#: mod/cal.php:315
 msgid "No exportable data found"
 msgstr ""
 
-#: mod/cal.php:331
+#: mod/cal.php:332
 msgid "calendar"
 msgstr ""
 
-#: mod/common.php:91
+#: mod/common.php:92
 msgid "No contacts in common."
 msgstr ""
 
-#: mod/common.php:142 src/Module/Contact.php:887
+#: mod/common.php:143 src/Module/Contact.php:897
 msgid "Common Friends"
 msgstr ""
 
-#: mod/community.php:30 mod/dfrn_request.php:600 mod/directory.php:41
-#: mod/display.php:201 mod/photos.php:941 mod/probe.php:13 mod/search.php:106
-#: mod/search.php:112 mod/videos.php:193 mod/viewcontacts.php:50
-#: mod/webfinger.php:16
-msgid "Public access denied."
-msgstr ""
-
-#: mod/community.php:73
+#: mod/community.php:74
 msgid "Community option not available."
 msgstr ""
 
-#: mod/community.php:90
+#: mod/community.php:91
 msgid "Not available."
 msgstr ""
 
-#: mod/community.php:102
+#: mod/community.php:103
 msgid "Local Community"
 msgstr ""
 
-#: mod/community.php:105
+#: mod/community.php:106
 msgid "Posts from local users on this server"
 msgstr ""
 
-#: mod/community.php:113
+#: mod/community.php:114
 msgid "Global Community"
 msgstr ""
 
-#: mod/community.php:116
+#: mod/community.php:117
 msgid "Posts from users of the whole federated network"
 msgstr ""
 
-#: mod/community.php:162 mod/search.php:243
+#: mod/community.php:163 mod/search.php:243
 msgid "No results."
 msgstr ""
 
-#: mod/community.php:206
+#: mod/community.php:207
 msgid ""
 "This community stream shows all public posts received by this node. They may "
 "not reflect the opinions of this node’s users."
 msgstr ""
 
-#: mod/crepair.php:88
-msgid "Contact settings applied."
+#: mod/credits.php:19
+msgid "Credits"
+msgstr ""
+
+#: mod/credits.php:20
+msgid ""
+"Friendica is a community project, that would not be possible without the "
+"help of many people. Here is a list of those who have contributed to the "
+"code or the translation of Friendica. Thank you all!"
 msgstr ""
 
 #: mod/crepair.php:90
-msgid "Contact update failed."
+msgid "Contact settings applied."
 msgstr ""
 
-#: mod/crepair.php:111 mod/dfrn_confirm.php:129 mod/fsuggest.php:30
-#: mod/fsuggest.php:96 mod/redir.php:30 mod/redir.php:128
+#: mod/crepair.php:92
+msgid "Contact update failed."
+msgstr ""
+
+#: mod/crepair.php:113 mod/dfrn_confirm.php:130 mod/fsuggest.php:31
+#: mod/fsuggest.php:97 mod/redir.php:31 mod/redir.php:129
 msgid "Contact not found."
 msgstr ""
 
-#: mod/crepair.php:115
+#: mod/crepair.php:117
 msgid ""
 "<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
 "information your communications with this contact may stop working."
 msgstr ""
 
-#: mod/crepair.php:116
+#: mod/crepair.php:118
 msgid ""
 "Please use your browser 'Back' button <strong>now</strong> if you are "
 "uncertain what to do on this page."
 msgstr ""
 
-#: mod/crepair.php:130 mod/crepair.php:132
+#: mod/crepair.php:132 mod/crepair.php:134
 msgid "No mirroring"
 msgstr ""
 
-#: mod/crepair.php:130
+#: mod/crepair.php:132
 msgid "Mirror as forwarded posting"
 msgstr ""
 
-#: mod/crepair.php:130 mod/crepair.php:132
+#: mod/crepair.php:132 mod/crepair.php:134
 msgid "Mirror as my own posting"
 msgstr ""
 
-#: mod/crepair.php:145
+#: mod/crepair.php:147
 msgid "Return to contact editor"
 msgstr ""
 
-#: mod/crepair.php:147
+#: mod/crepair.php:149
 msgid "Refetch contact data"
 msgstr ""
 
-#: mod/crepair.php:150
+#: mod/crepair.php:152
 msgid "Remote Self"
 msgstr ""
 
-#: mod/crepair.php:153
+#: mod/crepair.php:155
 msgid "Mirror postings from this contact"
 msgstr ""
 
-#: mod/crepair.php:155
+#: mod/crepair.php:157
 msgid ""
 "Mark this contact as remote_self, this will cause friendica to repost new "
 "entries from this contact."
 msgstr ""
 
-#: mod/crepair.php:160
+#: mod/crepair.php:162
 msgid "Account Nickname"
 msgstr ""
 
-#: mod/crepair.php:161
+#: mod/crepair.php:163
 msgid "@Tagname - overrides Name/Nickname"
 msgstr ""
 
-#: mod/crepair.php:162
+#: mod/crepair.php:164
 msgid "Account URL"
 msgstr ""
 
-#: mod/crepair.php:163
+#: mod/crepair.php:165
 msgid "Friend Request URL"
 msgstr ""
 
-#: mod/crepair.php:164
+#: mod/crepair.php:166
 msgid "Friend Confirm URL"
 msgstr ""
 
-#: mod/crepair.php:165
+#: mod/crepair.php:167
 msgid "Notification Endpoint URL"
 msgstr ""
 
-#: mod/crepair.php:166
+#: mod/crepair.php:168
 msgid "Poll/Feed URL"
 msgstr ""
 
-#: mod/crepair.php:167
+#: mod/crepair.php:169
 msgid "New photo from this URL"
 msgstr ""
 
-#: mod/delegate.php:41
+#: mod/delegate.php:43
 msgid "Parent user not found."
 msgstr ""
 
-#: mod/delegate.php:148
+#: mod/delegate.php:150
 msgid "No parent user"
 msgstr ""
 
-#: mod/delegate.php:163
+#: mod/delegate.php:165
 msgid "Parent Password:"
 msgstr ""
 
-#: mod/delegate.php:163
+#: mod/delegate.php:165
 msgid ""
 "Please enter the password of the parent account to legitimize your request."
 msgstr ""
 
-#: mod/delegate.php:168
+#: mod/delegate.php:170
 msgid "Parent User"
 msgstr ""
 
-#: mod/delegate.php:171
+#: mod/delegate.php:173
 msgid ""
 "Parent users have total control about this account, including the account "
 "settings. Please double check whom you give this access."
 msgstr ""
 
-#: mod/delegate.php:173 src/Content/Nav.php:257
+#: mod/delegate.php:175 src/Content/Nav.php:258
 msgid "Delegate Page Management"
 msgstr ""
 
-#: mod/delegate.php:174
+#: mod/delegate.php:176
 msgid "Delegates"
 msgstr ""
 
-#: mod/delegate.php:176
+#: mod/delegate.php:178
 msgid ""
 "Delegates are able to manage all aspects of this account/page except for "
 "basic account settings. Please do not delegate your personal account to "
 "anybody that you do not trust completely."
 msgstr ""
 
-#: mod/delegate.php:177
+#: mod/delegate.php:179
 msgid "Existing Page Delegates"
 msgstr ""
 
-#: mod/delegate.php:179
+#: mod/delegate.php:181
 msgid "Potential Delegates"
 msgstr ""
 
-#: mod/delegate.php:181 mod/tagrm.php:111
+#: mod/delegate.php:183 mod/tagrm.php:112
 msgid "Remove"
 msgstr ""
 
-#: mod/delegate.php:182
+#: mod/delegate.php:184
 msgid "Add"
 msgstr ""
 
-#: mod/delegate.php:183
+#: mod/delegate.php:185
 msgid "No entries."
 msgstr ""
 
-#: mod/dfrn_confirm.php:74 mod/profiles.php:40 mod/profiles.php:150
-#: mod/profiles.php:195 mod/profiles.php:525
+#: mod/dfrn_confirm.php:75 mod/profiles.php:42 mod/profiles.php:152
+#: mod/profiles.php:197 mod/profiles.php:527
 msgid "Profile not found."
 msgstr ""
 
-#: mod/dfrn_confirm.php:130
+#: mod/dfrn_confirm.php:131
 msgid ""
 "This may occasionally happen if contact was requested by both persons and it "
 "has already been approved."
 msgstr ""
 
-#: mod/dfrn_confirm.php:240
+#: mod/dfrn_confirm.php:241
 msgid "Response from remote site was not understood."
 msgstr ""
 
-#: mod/dfrn_confirm.php:247 mod/dfrn_confirm.php:253
+#: mod/dfrn_confirm.php:248 mod/dfrn_confirm.php:254
 msgid "Unexpected response from remote site: "
 msgstr ""
 
-#: mod/dfrn_confirm.php:262
+#: mod/dfrn_confirm.php:263
 msgid "Confirmation completed successfully."
 msgstr ""
 
-#: mod/dfrn_confirm.php:274
+#: mod/dfrn_confirm.php:275
 msgid "Temporary failure. Please wait and try again."
 msgstr ""
 
-#: mod/dfrn_confirm.php:277
+#: mod/dfrn_confirm.php:278
 msgid "Introduction failed or was revoked."
 msgstr ""
 
-#: mod/dfrn_confirm.php:282
+#: mod/dfrn_confirm.php:283
 msgid "Remote site reported: "
 msgstr ""
 
-#: mod/dfrn_confirm.php:383
+#: mod/dfrn_confirm.php:384
 msgid "Unable to set contact photo."
 msgstr ""
 
-#: mod/dfrn_confirm.php:445
+#: mod/dfrn_confirm.php:446
 #, php-format
 msgid "No user record found for '%s' "
 msgstr ""
 
-#: mod/dfrn_confirm.php:455
+#: mod/dfrn_confirm.php:456
 msgid "Our site encryption key is apparently messed up."
 msgstr ""
 
-#: mod/dfrn_confirm.php:466
+#: mod/dfrn_confirm.php:467
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr ""
 
-#: mod/dfrn_confirm.php:482
+#: mod/dfrn_confirm.php:483
 msgid "Contact record was not found for you on our site."
 msgstr ""
 
-#: mod/dfrn_confirm.php:496
+#: mod/dfrn_confirm.php:497
 #, php-format
 msgid "Site public key not available in contact record for URL %s."
 msgstr ""
 
-#: mod/dfrn_confirm.php:512
+#: mod/dfrn_confirm.php:513
 msgid ""
 "The ID provided by your system is a duplicate on our system. It should work "
 "if you try again."
 msgstr ""
 
-#: mod/dfrn_confirm.php:523
+#: mod/dfrn_confirm.php:524
 msgid "Unable to set your contact credentials on our system."
 msgstr ""
 
-#: mod/dfrn_confirm.php:579
+#: mod/dfrn_confirm.php:580
 msgid "Unable to update your contact profile details on our system"
 msgstr ""
 
-#: mod/dfrn_confirm.php:609 mod/dfrn_request.php:562 src/Model/Contact.php:1913
+#: mod/dfrn_confirm.php:610 mod/dfrn_request.php:564 src/Model/Contact.php:1919
 msgid "[Name Withheld]"
 msgstr ""
 
-#: mod/dfrn_poll.php:127 mod/dfrn_poll.php:536
+#: mod/dfrn_poll.php:128 mod/dfrn_poll.php:537
 #, php-format
 msgid "%1$s welcomes %2$s"
 msgstr ""
 
-#: mod/dfrn_request.php:95
+#: mod/dfrn_request.php:97
 msgid "This introduction has already been accepted."
 msgstr ""
 
-#: mod/dfrn_request.php:113 mod/dfrn_request.php:354
+#: mod/dfrn_request.php:115 mod/dfrn_request.php:356
 msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: mod/dfrn_request.php:117 mod/dfrn_request.php:358
+#: mod/dfrn_request.php:119 mod/dfrn_request.php:360
 msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: mod/dfrn_request.php:120 mod/dfrn_request.php:361
+#: mod/dfrn_request.php:122 mod/dfrn_request.php:363
 msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: mod/dfrn_request.php:124 mod/dfrn_request.php:365
+#: mod/dfrn_request.php:126 mod/dfrn_request.php:367
 #, php-format
 msgid "%d required parameter was not found at the given location"
 msgid_plural "%d required parameters were not found at the given location"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mod/dfrn_request.php:162
+#: mod/dfrn_request.php:164
 msgid "Introduction complete."
 msgstr ""
 
-#: mod/dfrn_request.php:198
+#: mod/dfrn_request.php:200
 msgid "Unrecoverable protocol error."
 msgstr ""
 
-#: mod/dfrn_request.php:225
+#: mod/dfrn_request.php:227
 msgid "Profile unavailable."
 msgstr ""
 
-#: mod/dfrn_request.php:247
+#: mod/dfrn_request.php:249
 #, php-format
 msgid "%s has received too many connection requests today."
 msgstr ""
 
-#: mod/dfrn_request.php:248
+#: mod/dfrn_request.php:250
 msgid "Spam protection measures have been invoked."
 msgstr ""
 
-#: mod/dfrn_request.php:249
+#: mod/dfrn_request.php:251
 msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 
-#: mod/dfrn_request.php:275
+#: mod/dfrn_request.php:277
 msgid "Invalid locator"
 msgstr ""
 
-#: mod/dfrn_request.php:311
+#: mod/dfrn_request.php:313
 msgid "You have already introduced yourself here."
 msgstr ""
 
-#: mod/dfrn_request.php:314
+#: mod/dfrn_request.php:316
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: mod/dfrn_request.php:334
+#: mod/dfrn_request.php:336
 msgid "Invalid profile URL."
 msgstr ""
 
-#: mod/dfrn_request.php:340 src/Model/Contact.php:1592
+#: mod/dfrn_request.php:342 src/Model/Contact.php:1598
 msgid "Disallowed profile URL."
 msgstr ""
 
-#: mod/dfrn_request.php:413 src/Module/Contact.php:238
+#: mod/dfrn_request.php:415 src/Module/Contact.php:240
 msgid "Failed to update contact record."
 msgstr ""
 
-#: mod/dfrn_request.php:433
+#: mod/dfrn_request.php:435
 msgid "Your introduction has been sent."
 msgstr ""
 
-#: mod/dfrn_request.php:471
+#: mod/dfrn_request.php:473
 msgid ""
 "Remote subscription can't be done for your network. Please subscribe "
 "directly on your system."
 msgstr ""
 
-#: mod/dfrn_request.php:487
+#: mod/dfrn_request.php:489
 msgid "Please login to confirm introduction."
 msgstr ""
 
-#: mod/dfrn_request.php:495
+#: mod/dfrn_request.php:497
 msgid ""
 "Incorrect identity currently logged in. Please login to <strong>this</"
 "strong> profile."
 msgstr ""
 
-#: mod/dfrn_request.php:509 mod/dfrn_request.php:526
+#: mod/dfrn_request.php:511 mod/dfrn_request.php:528
 msgid "Confirm"
 msgstr ""
 
-#: mod/dfrn_request.php:521
+#: mod/dfrn_request.php:523
 msgid "Hide this contact"
 msgstr ""
 
-#: mod/dfrn_request.php:524
+#: mod/dfrn_request.php:526
 #, php-format
 msgid "Welcome home %s."
 msgstr ""
 
-#: mod/dfrn_request.php:525
+#: mod/dfrn_request.php:527
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
-#: mod/dfrn_request.php:635
+#: mod/dfrn_request.php:637
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr ""
 
-#: mod/dfrn_request.php:638
+#: mod/dfrn_request.php:640
 #, 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 site and join us today</a>."
 msgstr ""
 
-#: mod/dfrn_request.php:643
+#: mod/dfrn_request.php:645
 msgid "Friend/Connection Request"
 msgstr ""
 
-#: mod/dfrn_request.php:644
+#: mod/dfrn_request.php:646
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@gnusocial.de"
 msgstr ""
 
-#: mod/dfrn_request.php:645 mod/follow.php:151
+#: mod/dfrn_request.php:647 mod/follow.php:153
 msgid "Please answer the following:"
 msgstr ""
 
-#: mod/dfrn_request.php:646 mod/follow.php:152
+#: mod/dfrn_request.php:648 mod/follow.php:154
 #, php-format
 msgid "Does %s know you?"
 msgstr ""
 
-#: mod/dfrn_request.php:647 mod/follow.php:153
+#: mod/dfrn_request.php:649 mod/follow.php:155
 msgid "Add a personal note:"
 msgstr ""
 
-#: mod/dfrn_request.php:649 src/Content/ContactSelector.php:80
+#: mod/dfrn_request.php:651
 msgid "Friendica"
 msgstr ""
 
-#: mod/dfrn_request.php:650
+#: mod/dfrn_request.php:652
 msgid "GNU Social (Pleroma, Mastodon)"
 msgstr ""
 
-#: mod/dfrn_request.php:651
+#: mod/dfrn_request.php:653
 msgid "Diaspora (Socialhome, Hubzilla)"
 msgstr ""
 
-#: mod/dfrn_request.php:652
+#: mod/dfrn_request.php:654
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search "
 "bar."
 msgstr ""
 
-#: mod/dfrn_request.php:653 mod/follow.php:159 mod/unfollow.php:128
+#: mod/dfrn_request.php:655 mod/follow.php:161 mod/unfollow.php:130
 msgid "Your Identity Address:"
 msgstr ""
 
-#: mod/dfrn_request.php:655 mod/follow.php:64 mod/unfollow.php:131
+#: mod/dfrn_request.php:657 mod/follow.php:66 mod/unfollow.php:133
 msgid "Submit Request"
 msgstr ""
 
-#: mod/directory.php:152 mod/events.php:545 mod/notifications.php:250
-#: src/Model/Event.php:68 src/Model/Event.php:95 src/Model/Event.php:432
-#: src/Model/Event.php:923 src/Model/Profile.php:431 src/Module/Contact.php:648
+#: mod/directory.php:154 mod/events.php:547 mod/notifications.php:251
+#: src/Model/Event.php:70 src/Model/Event.php:97 src/Model/Event.php:434
+#: src/Model/Event.php:925 src/Model/Profile.php:434 src/Module/Contact.php:650
 msgid "Location:"
 msgstr ""
 
-#: mod/directory.php:157 mod/notifications.php:256 src/Model/Profile.php:434
-#: src/Model/Profile.php:746
+#: mod/directory.php:159 mod/notifications.php:257 src/Model/Profile.php:437
+#: src/Model/Profile.php:749
 msgid "Gender:"
 msgstr ""
 
-#: mod/directory.php:158 src/Model/Profile.php:435 src/Model/Profile.php:770
+#: mod/directory.php:160 src/Model/Profile.php:438 src/Model/Profile.php:773
 msgid "Status:"
 msgstr ""
 
-#: mod/directory.php:159 src/Model/Profile.php:436 src/Model/Profile.php:787
+#: mod/directory.php:161 src/Model/Profile.php:439 src/Model/Profile.php:790
 msgid "Homepage:"
 msgstr ""
 
-#: mod/directory.php:160 mod/notifications.php:252 src/Model/Profile.php:437
-#: src/Model/Profile.php:807 src/Module/Contact.php:652
+#: mod/directory.php:162 mod/notifications.php:253 src/Model/Profile.php:440
+#: src/Model/Profile.php:810 src/Module/Contact.php:654
 msgid "About:"
 msgstr ""
 
-#: mod/directory.php:208 view/theme/vier/theme.php:206
-#: src/Content/Widget.php:68
+#: mod/directory.php:210 view/theme/vier/theme.php:208
+#: src/Content/Widget.php:72
 msgid "Global Directory"
 msgstr ""
 
-#: mod/directory.php:210
+#: mod/directory.php:212
 msgid "Find on this site"
 msgstr ""
 
-#: mod/directory.php:212
+#: mod/directory.php:214
 msgid "Results for:"
 msgstr ""
 
-#: mod/directory.php:214
+#: mod/directory.php:216
 msgid "Site Directory"
 msgstr ""
 
-#: mod/directory.php:215 view/theme/vier/theme.php:201
-#: src/Content/Widget.php:63 src/Module/Contact.php:812
+#: mod/directory.php:217 view/theme/vier/theme.php:203
+#: src/Content/Widget.php:67 src/Module/Contact.php:822
 msgid "Find"
 msgstr ""
 
-#: mod/directory.php:219
+#: mod/directory.php:221
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: mod/dirfind.php:53
+#: mod/dirfind.php:55
 #, php-format
 msgid "People Search - %s"
 msgstr ""
 
-#: mod/dirfind.php:64
+#: mod/dirfind.php:66
 #, php-format
 msgid "Forum Search - %s"
 msgstr ""
 
-#: mod/dirfind.php:259 mod/match.php:123
+#: mod/dirfind.php:261 mod/match.php:125
 msgid "No matches"
 msgstr ""
 
-#: mod/editpost.php:26 mod/editpost.php:36
+#: mod/editpost.php:29 mod/editpost.php:39
 msgid "Item not found"
 msgstr ""
 
-#: mod/editpost.php:43
+#: mod/editpost.php:46
 msgid "Edit post"
 msgstr ""
 
-#: mod/editpost.php:96 mod/message.php:261 mod/message.php:423
-#: mod/wallmessage.php:138
+#: mod/editpost.php:99 mod/message.php:263 mod/message.php:425
+#: mod/wallmessage.php:140
 msgid "Insert web link"
 msgstr ""
 
-#: mod/editpost.php:97
+#: mod/editpost.php:100
 msgid "web link"
 msgstr ""
 
-#: mod/editpost.php:98
+#: mod/editpost.php:101
 msgid "Insert video link"
 msgstr ""
 
-#: mod/editpost.php:99
+#: mod/editpost.php:102
 msgid "video link"
 msgstr ""
 
-#: mod/editpost.php:100
+#: mod/editpost.php:103
 msgid "Insert audio link"
 msgstr ""
 
-#: mod/editpost.php:101
+#: mod/editpost.php:104
 msgid "audio link"
 msgstr ""
 
-#: mod/editpost.php:116 src/Core/ACL.php:304
+#: mod/editpost.php:119 src/Core/ACL.php:305
 msgid "CC: email addresses"
 msgstr ""
 
-#: mod/editpost.php:123 src/Core/ACL.php:305
+#: mod/editpost.php:126 src/Core/ACL.php:306
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: mod/events.php:107 mod/events.php:109
+#: mod/events.php:109 mod/events.php:111
 msgid "Event can not end before it has started."
 msgstr ""
 
-#: mod/events.php:116 mod/events.php:118
+#: mod/events.php:118 mod/events.php:120
 msgid "Event title and start time are required."
 msgstr ""
 
-#: mod/events.php:390
+#: mod/events.php:392
 msgid "Create New Event"
 msgstr ""
 
-#: mod/events.php:513
+#: mod/events.php:515
 msgid "Event details"
 msgstr ""
 
-#: mod/events.php:514
+#: mod/events.php:516
 msgid "Starting date and Title are required."
 msgstr ""
 
-#: mod/events.php:515 mod/events.php:520
+#: mod/events.php:517 mod/events.php:522
 msgid "Event Starts:"
 msgstr ""
 
-#: mod/events.php:515 mod/events.php:547 mod/profiles.php:606
+#: mod/events.php:517 mod/events.php:549 mod/profiles.php:608
 msgid "Required"
 msgstr ""
 
-#: mod/events.php:528 mod/events.php:553
+#: mod/events.php:530 mod/events.php:555
 msgid "Finish date/time is not known or not relevant"
 msgstr ""
 
-#: mod/events.php:530 mod/events.php:535
+#: mod/events.php:532 mod/events.php:537
 msgid "Event Finishes:"
 msgstr ""
 
-#: mod/events.php:541 mod/events.php:554
+#: mod/events.php:543 mod/events.php:556
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: mod/events.php:543
+#: mod/events.php:545
 msgid "Description:"
 msgstr ""
 
-#: mod/events.php:547 mod/events.php:549
+#: mod/events.php:549 mod/events.php:551
 msgid "Title:"
 msgstr ""
 
-#: mod/events.php:550 mod/events.php:551
+#: mod/events.php:552 mod/events.php:553
 msgid "Share this event"
 msgstr ""
 
-#: mod/events.php:558 src/Model/Profile.php:865
+#: mod/events.php:560 src/Model/Profile.php:868
 msgid "Basic"
 msgstr ""
 
-#: mod/events.php:560 mod/photos.php:1107 mod/photos.php:1448
-#: src/Core/ACL.php:307
+#: mod/events.php:562 mod/photos.php:1111 mod/photos.php:1452
+#: src/Core/ACL.php:308
 msgid "Permissions"
 msgstr ""
 
-#: mod/events.php:576
+#: mod/events.php:578
 msgid "Failed to remove event"
 msgstr ""
 
-#: mod/events.php:578
+#: mod/events.php:580
 msgid "Event removed"
 msgstr ""
 
-#: mod/feedtest.php:21
+#: mod/fbrowser.php:36 view/theme/frio/theme.php:275 src/Content/Nav.php:155
+#: src/Model/Profile.php:908
+msgid "Photos"
+msgstr ""
+
+#: mod/fbrowser.php:45 mod/fbrowser.php:70 mod/photos.php:204
+#: mod/photos.php:1075 mod/photos.php:1170 mod/photos.php:1187
+#: mod/photos.php:1654 mod/photos.php:1669 src/Model/Photo.php:244
+#: src/Model/Photo.php:253
+msgid "Contact Photos"
+msgstr ""
+
+#: mod/fbrowser.php:107 mod/fbrowser.php:138 mod/profile_photo.php:251
+msgid "Upload"
+msgstr ""
+
+#: mod/fbrowser.php:133
+msgid "Files"
+msgstr ""
+
+#: mod/feedtest.php:22
 msgid "You must be logged in to use this module"
 msgstr ""
 
-#: mod/feedtest.php:48
+#: mod/feedtest.php:49
 msgid "Source URL"
 msgstr ""
 
-#: mod/fetch.php:20 mod/fetch.php:47 mod/fetch.php:54 mod/help.php:62
-#: src/App.php:1794
+#: mod/fetch.php:21 mod/fetch.php:48 mod/fetch.php:55 mod/help.php:64
+#: src/App.php:1666
 msgid "Not Found"
 msgstr ""
 
-#: mod/filer.php:34
+#: mod/filer.php:37
 msgid "- select -"
 msgstr ""
 
-#: mod/follow.php:45
+#: mod/follow.php:47
 msgid "The contact could not be added."
 msgstr ""
 
-#: mod/follow.php:75
+#: mod/follow.php:77
 msgid "You already added this contact."
 msgstr ""
 
-#: mod/follow.php:85
+#: mod/follow.php:87
 msgid "Diaspora support isn't enabled. Contact can't be added."
 msgstr ""
 
-#: mod/follow.php:92
+#: mod/follow.php:94
 msgid "OStatus support is disabled. Contact can't be added."
 msgstr ""
 
-#: mod/follow.php:99
+#: mod/follow.php:101
 msgid "The network type couldn't be detected. Contact can't be added."
 msgstr ""
 
-#: mod/follow.php:179 mod/notifications.php:254 src/Model/Profile.php:795
-#: src/Module/Contact.php:654
+#: mod/follow.php:181 mod/notifications.php:255 src/Model/Profile.php:798
+#: src/Module/Contact.php:656
 msgid "Tags:"
 msgstr ""
 
-#: mod/follow.php:191 mod/unfollow.php:147 src/Model/Profile.php:892
-#: src/Module/Contact.php:859
+#: mod/follow.php:193 mod/unfollow.php:149 src/Model/Profile.php:895
+#: src/Module/Contact.php:869
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: mod/friendica.php:70
+#: mod/friendica.php:79
 #, php-format
 msgid ""
 "This is Friendica, version %s that is running at the web location %s. The "
 "database version is %s, the post update version is %s."
 msgstr ""
 
-#: mod/friendica.php:76
+#: mod/friendica.php:85
 msgid ""
 "Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
 "about the Friendica project."
 msgstr ""
 
-#: mod/friendica.php:80
+#: mod/friendica.php:89
 msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: mod/friendica.php:80
+#: mod/friendica.php:89
 msgid "the bugtracker at github"
 msgstr ""
 
-#: mod/friendica.php:83
+#: mod/friendica.php:92
 msgid ""
 "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
 msgstr ""
 
-#: mod/friendica.php:88
+#: mod/friendica.php:97
 msgid "Installed addons/apps:"
 msgstr ""
 
-#: mod/friendica.php:102
+#: mod/friendica.php:111
 msgid "No installed addons/apps"
 msgstr ""
 
-#: mod/friendica.php:107
+#: mod/friendica.php:116
 #, php-format
 msgid "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
 msgstr ""
 
-#: mod/friendica.php:112
+#: mod/friendica.php:121
 msgid "On this server the following remote servers are blocked."
 msgstr ""
 
-#: mod/fsuggest.php:72
+#: mod/fsuggest.php:73
 msgid "Friend suggestion sent."
 msgstr ""
 
-#: mod/fsuggest.php:101
+#: mod/fsuggest.php:102
 msgid "Suggest Friends"
 msgstr ""
 
-#: mod/fsuggest.php:103
+#: mod/fsuggest.php:104
 #, php-format
 msgid "Suggest a friend for %s"
 msgstr ""
 
-#: mod/group.php:38
+#: mod/group.php:40
 msgid "Group created."
 msgstr ""
 
-#: mod/group.php:44
+#: mod/group.php:46
 msgid "Could not create group."
 msgstr ""
 
-#: mod/group.php:58 mod/group.php:185
+#: mod/group.php:60 mod/group.php:187
 msgid "Group not found."
 msgstr ""
 
-#: mod/group.php:72
+#: mod/group.php:74
 msgid "Group name changed."
 msgstr ""
 
-#: mod/group.php:85 mod/profperm.php:29 src/App.php:1875
+#: mod/group.php:87 mod/profperm.php:30 src/App.php:1747
 msgid "Permission denied"
 msgstr ""
 
-#: mod/group.php:103
+#: mod/group.php:105
 msgid "Save Group"
 msgstr ""
 
-#: mod/group.php:104
+#: mod/group.php:106
 msgid "Filter"
 msgstr ""
 
-#: mod/group.php:109
+#: mod/group.php:111
 msgid "Create a group of contacts/friends."
 msgstr ""
 
-#: mod/group.php:110 mod/group.php:134 mod/group.php:227
-#: src/Model/Group.php:413
+#: mod/group.php:112 mod/group.php:136 mod/group.php:229
+#: src/Model/Group.php:414
 msgid "Group Name: "
 msgstr ""
 
-#: mod/group.php:125 src/Model/Group.php:410
+#: mod/group.php:127 src/Model/Group.php:411
 msgid "Contacts not in any group"
 msgstr ""
 
-#: mod/group.php:157
+#: mod/group.php:159
 msgid "Group removed."
 msgstr ""
 
-#: mod/group.php:159
+#: mod/group.php:161
 msgid "Unable to remove group."
 msgstr ""
 
-#: mod/group.php:220
+#: mod/group.php:222
 msgid "Delete Group"
 msgstr ""
 
-#: mod/group.php:231
+#: mod/group.php:233
 msgid "Edit Group Name"
 msgstr ""
 
-#: mod/group.php:242
+#: mod/group.php:244
 msgid "Members"
 msgstr ""
 
-#: mod/group.php:244 src/Module/Contact.php:709
+#: mod/group.php:246 src/Module/Contact.php:711
 msgid "All Contacts"
 msgstr ""
 
-#: mod/group.php:245 mod/network.php:653
+#: mod/group.php:247 mod/network.php:659
 msgid "Group is empty"
 msgstr ""
 
-#: mod/group.php:258
+#: mod/group.php:260
 msgid "Remove contact from group"
 msgstr ""
 
-#: mod/group.php:276 mod/profperm.php:118
+#: mod/group.php:278 mod/profperm.php:119
 msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: mod/group.php:290
+#: mod/group.php:292
 msgid "Add contact to group"
 msgstr ""
 
-#: mod/hcard.php:19
-msgid "No profile"
-msgstr ""
-
-#: mod/help.php:49
+#: mod/help.php:51
 msgid "Help:"
 msgstr ""
 
-#: mod/help.php:56 view/theme/vier/theme.php:295 src/Content/Nav.php:186
+#: mod/help.php:58 view/theme/vier/theme.php:297 src/Content/Nav.php:187
 msgid "Help"
 msgstr ""
 
-#: mod/home.php:39
+#: mod/home.php:40
 #, php-format
 msgid "Welcome to %s"
 msgstr ""
 
-#: mod/invite.php:36
+#: mod/invite.php:38
 msgid "Total invitation limit exceeded."
 msgstr ""
 
-#: mod/invite.php:58
+#: mod/invite.php:60
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr ""
 
-#: mod/invite.php:85
+#: mod/invite.php:87
 msgid "Please join us on Friendica"
 msgstr ""
 
-#: mod/invite.php:94
+#: mod/invite.php:96
 msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr ""
 
-#: mod/invite.php:98
+#: mod/invite.php:100
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr ""
 
-#: mod/invite.php:102
+#: mod/invite.php:104
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
 msgstr[0] ""
 msgstr[1] ""
 
-#: mod/invite.php:120
+#: mod/invite.php:122
 msgid "You have no more invitations available"
 msgstr ""
 
-#: mod/invite.php:128
+#: mod/invite.php:130
 #, php-format
 msgid ""
 "Visit %s for a list of public sites that you can join. Friendica members on "
@@ -4300,14 +4208,14 @@ msgid ""
 "other social networks."
 msgstr ""
 
-#: mod/invite.php:130
+#: mod/invite.php:132
 #, php-format
 msgid ""
 "To accept this invitation, please visit and register at %s or any other "
 "public Friendica website."
 msgstr ""
 
-#: mod/invite.php:131
+#: mod/invite.php:133
 #, php-format
 msgid ""
 "Friendica sites all inter-connect to create a huge privacy-enhanced social "
@@ -4316,110 +4224,97 @@ msgid ""
 "sites you can join."
 msgstr ""
 
-#: mod/invite.php:135
+#: mod/invite.php:137
 msgid ""
 "Our apologies. This system is not currently configured to connect with other "
 "public sites or invite members."
 msgstr ""
 
-#: mod/invite.php:139
+#: mod/invite.php:141
 msgid ""
 "Friendica sites all inter-connect to create a huge privacy-enhanced social "
 "web that is owned and controlled by its members. They can also connect with "
 "many traditional social networks."
 msgstr ""
 
-#: mod/invite.php:138
+#: mod/invite.php:140
 #, php-format
 msgid "To accept this invitation, please visit and register at %s."
 msgstr ""
 
-#: mod/invite.php:145
+#: mod/invite.php:147
 msgid "Send invitations"
 msgstr ""
 
-#: mod/invite.php:146
+#: mod/invite.php:148
 msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: mod/invite.php:147 mod/message.php:257 mod/message.php:418
-#: mod/wallmessage.php:135
+#: mod/invite.php:149 mod/message.php:259 mod/message.php:420
+#: mod/wallmessage.php:137
 msgid "Your message:"
 msgstr ""
 
-#: mod/invite.php:147
+#: mod/invite.php:149
 msgid ""
 "You are cordially invited to join me and other close friends on Friendica - "
 "and help us to create a better social web."
 msgstr ""
 
-#: mod/invite.php:149
+#: mod/invite.php:151
 msgid "You will need to supply this invitation code: $invite_code"
 msgstr ""
 
-#: mod/invite.php:149
+#: mod/invite.php:151
 msgid ""
 "Once you have registered, please connect with me via my profile page at:"
 msgstr ""
 
-#: mod/invite.php:151
+#: mod/invite.php:153
 msgid ""
 "For more information about the Friendica project and why we feel it is "
 "important, please visit http://friendi.ca"
 msgstr ""
 
-#: mod/item.php:118
+#: mod/item.php:120
 msgid "Unable to locate original post."
 msgstr ""
 
-#: mod/item.php:286
+#: mod/item.php:288
 msgid "Empty post discarded."
 msgstr ""
 
-#: mod/item.php:465 mod/wall_upload.php:241 src/Object/Image.php:968
-#: src/Object/Image.php:984 src/Object/Image.php:992 src/Object/Image.php:1017
-msgid "Wall Photos"
-msgstr ""
-
-#: mod/item.php:805
+#: mod/item.php:810
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: mod/item.php:807
+#: mod/item.php:812
 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""
 
-#: mod/item.php:808
+#: mod/item.php:813
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 
-#: mod/item.php:812
+#: mod/item.php:817
 #, php-format
 msgid "%s posted an update."
 msgstr ""
 
-#: mod/lockview.php:46 mod/lockview.php:57
-msgid "Remote privacy information not available."
-msgstr ""
-
-#: mod/lockview.php:66
-msgid "Visible to:"
-msgstr ""
-
-#: mod/lostpass.php:28
+#: mod/lostpass.php:30
 msgid "No valid account found."
 msgstr ""
 
-#: mod/lostpass.php:40
+#: mod/lostpass.php:42
 msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: mod/lostpass.php:46
+#: mod/lostpass.php:48
 #, php-format
 msgid ""
 "\n"
@@ -4437,7 +4332,7 @@ msgid ""
 "\t\tissued this request."
 msgstr ""
 
-#: mod/lostpass.php:57
+#: mod/lostpass.php:59
 #, php-format
 msgid ""
 "\n"
@@ -4455,66 +4350,66 @@ msgid ""
 "\t\tLogin Name:\t%3$s"
 msgstr ""
 
-#: mod/lostpass.php:76
+#: mod/lostpass.php:78
 #, php-format
 msgid "Password reset requested at %s"
 msgstr ""
 
-#: mod/lostpass.php:92
+#: mod/lostpass.php:94
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr ""
 
-#: mod/lostpass.php:105
+#: mod/lostpass.php:107
 msgid "Request has expired, please make a new one."
 msgstr ""
 
-#: mod/lostpass.php:120
+#: mod/lostpass.php:122
 msgid "Forgot your Password?"
 msgstr ""
 
-#: mod/lostpass.php:121
+#: mod/lostpass.php:123
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr ""
 
-#: mod/lostpass.php:122 src/Module/Login.php:322
+#: mod/lostpass.php:124 src/Module/Login.php:324
 msgid "Nickname or Email: "
 msgstr ""
 
-#: mod/lostpass.php:123
+#: mod/lostpass.php:125
 msgid "Reset"
 msgstr ""
 
-#: mod/lostpass.php:139 src/Module/Login.php:334
+#: mod/lostpass.php:141 src/Module/Login.php:336
 msgid "Password Reset"
 msgstr ""
 
-#: mod/lostpass.php:140
+#: mod/lostpass.php:142
 msgid "Your password has been reset as requested."
 msgstr ""
 
-#: mod/lostpass.php:141
+#: mod/lostpass.php:143
 msgid "Your new password is"
 msgstr ""
 
-#: mod/lostpass.php:142
+#: mod/lostpass.php:144
 msgid "Save or copy your new password - and then"
 msgstr ""
 
-#: mod/lostpass.php:143
+#: mod/lostpass.php:145
 msgid "click here to login"
 msgstr ""
 
-#: mod/lostpass.php:144
+#: mod/lostpass.php:146
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr ""
 
-#: mod/lostpass.php:152
+#: mod/lostpass.php:154
 #, php-format
 msgid ""
 "\n"
@@ -4525,7 +4420,7 @@ msgid ""
 "\t\t"
 msgstr ""
 
-#: mod/lostpass.php:158
+#: mod/lostpass.php:160
 #, php-format
 msgid ""
 "\n"
@@ -4540,167 +4435,171 @@ msgid ""
 "\t\t"
 msgstr ""
 
-#: mod/lostpass.php:174
+#: mod/lostpass.php:176
 #, php-format
 msgid "Your password has been changed at %s"
 msgstr ""
 
-#: mod/manage.php:180
-msgid "Manage Identities and/or Pages"
+#: mod/maintenance.php:26
+msgid "System down for maintenance"
 msgstr ""
 
 #: mod/manage.php:181
+msgid "Manage Identities and/or Pages"
+msgstr ""
+
+#: mod/manage.php:182
 msgid ""
 "Toggle between different identities or community/group pages which share "
 "your account details or which you have been granted \"manage\" permissions"
 msgstr ""
 
-#: mod/manage.php:182
+#: mod/manage.php:183
 msgid "Select an identity to manage: "
 msgstr ""
 
-#: mod/match.php:49
+#: mod/match.php:51
 msgid "No keywords to match. Please add keywords to your default profile."
 msgstr ""
 
-#: mod/match.php:104
+#: mod/match.php:106
 msgid "is interested in:"
 msgstr ""
 
-#: mod/match.php:118
+#: mod/match.php:120
 msgid "Profile Match"
 msgstr ""
 
-#: mod/message.php:33 mod/message.php:116 src/Content/Nav.php:251
+#: mod/message.php:35 mod/message.php:118 src/Content/Nav.php:252
 msgid "New Message"
 msgstr ""
 
-#: mod/message.php:70 mod/wallmessage.php:58
+#: mod/message.php:72 mod/wallmessage.php:60
 msgid "No recipient selected."
 msgstr ""
 
-#: mod/message.php:74
+#: mod/message.php:76
 msgid "Unable to locate contact information."
 msgstr ""
 
-#: mod/message.php:77 mod/wallmessage.php:64
+#: mod/message.php:79 mod/wallmessage.php:66
 msgid "Message could not be sent."
 msgstr ""
 
-#: mod/message.php:80 mod/wallmessage.php:67
+#: mod/message.php:82 mod/wallmessage.php:69
 msgid "Message collection failure."
 msgstr ""
 
-#: mod/message.php:83 mod/wallmessage.php:70
+#: mod/message.php:85 mod/wallmessage.php:72
 msgid "Message sent."
 msgstr ""
 
-#: mod/message.php:110 mod/notifications.php:46 mod/notifications.php:184
-#: mod/notifications.php:232
+#: mod/message.php:112 mod/notifications.php:47 mod/notifications.php:185
+#: mod/notifications.php:233
 msgid "Discard"
 msgstr ""
 
-#: mod/message.php:123 view/theme/frio/theme.php:280 src/Content/Nav.php:248
+#: mod/message.php:125 view/theme/frio/theme.php:282 src/Content/Nav.php:249
 msgid "Messages"
 msgstr ""
 
-#: mod/message.php:148
+#: mod/message.php:150
 msgid "Do you really want to delete this message?"
 msgstr ""
 
-#: mod/message.php:166
+#: mod/message.php:168
 msgid "Conversation not found."
 msgstr ""
 
-#: mod/message.php:171
+#: mod/message.php:173
 msgid "Message deleted."
 msgstr ""
 
-#: mod/message.php:176 mod/message.php:191
+#: mod/message.php:178 mod/message.php:193
 msgid "Conversation removed."
 msgstr ""
 
-#: mod/message.php:205 mod/message.php:345 mod/wallmessage.php:121
+#: mod/message.php:207 mod/message.php:347 mod/wallmessage.php:123
 msgid "Please enter a link URL:"
 msgstr ""
 
-#: mod/message.php:248 mod/wallmessage.php:126
+#: mod/message.php:250 mod/wallmessage.php:128
 msgid "Send Private Message"
 msgstr ""
 
-#: mod/message.php:249 mod/message.php:413 mod/wallmessage.php:128
+#: mod/message.php:251 mod/message.php:415 mod/wallmessage.php:130
 msgid "To:"
 msgstr ""
 
-#: mod/message.php:253 mod/message.php:415 mod/wallmessage.php:129
+#: mod/message.php:255 mod/message.php:417 mod/wallmessage.php:131
 msgid "Subject:"
 msgstr ""
 
-#: mod/message.php:291
+#: mod/message.php:293
 msgid "No messages."
 msgstr ""
 
-#: mod/message.php:332
+#: mod/message.php:334
 msgid "Message not available."
 msgstr ""
 
-#: mod/message.php:389
+#: mod/message.php:391
 msgid "Delete message"
 msgstr ""
 
-#: mod/message.php:391 mod/message.php:492
+#: mod/message.php:393 mod/message.php:494
 msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: mod/message.php:406 mod/message.php:489
+#: mod/message.php:408 mod/message.php:491
 msgid "Delete conversation"
 msgstr ""
 
-#: mod/message.php:408
+#: mod/message.php:410
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr ""
 
-#: mod/message.php:412
+#: mod/message.php:414
 msgid "Send Reply"
 msgstr ""
 
-#: mod/message.php:463
+#: mod/message.php:465
 #, php-format
 msgid "Unknown sender - %s"
 msgstr ""
 
-#: mod/message.php:465
+#: mod/message.php:467
 #, php-format
 msgid "You and %s"
 msgstr ""
 
-#: mod/message.php:467
+#: mod/message.php:469
 #, php-format
 msgid "%s and You"
 msgstr ""
 
-#: mod/message.php:495
+#: mod/message.php:497
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mod/network.php:198 mod/search.php:40
+#: mod/network.php:192 mod/search.php:40
 msgid "Remove term"
 msgstr ""
 
-#: mod/network.php:205 mod/search.php:49 src/Content/Feature.php:100
+#: mod/network.php:199 mod/search.php:49
 msgid "Saved Searches"
 msgstr ""
 
-#: mod/network.php:206 src/Model/Group.php:404
+#: mod/network.php:200 src/Model/Group.php:405
 msgid "add"
 msgstr ""
 
-#: mod/network.php:561
+#: mod/network.php:567
 #, php-format
 msgid ""
 "Warning: This group contains %s member from a network that doesn't allow non "
@@ -4711,1270 +4610,1057 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: mod/network.php:564
+#: mod/network.php:570
 msgid "Messages in this group won't be send to these receivers."
 msgstr ""
 
-#: mod/network.php:632
+#: mod/network.php:638
 msgid "No such group"
 msgstr ""
 
-#: mod/network.php:657
+#: mod/network.php:663
 #, php-format
 msgid "Group: %s"
 msgstr ""
 
-#: mod/network.php:683
+#: mod/network.php:689
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: mod/network.php:686
+#: mod/network.php:692
 msgid "Invalid contact."
 msgstr ""
 
-#: mod/network.php:964
+#: mod/network.php:970
 msgid "Commented Order"
 msgstr ""
 
-#: mod/network.php:967
+#: mod/network.php:973
 msgid "Sort by Comment Date"
 msgstr ""
 
-#: mod/network.php:972
+#: mod/network.php:978
 msgid "Posted Order"
 msgstr ""
 
-#: mod/network.php:975
+#: mod/network.php:981
 msgid "Sort by Post Date"
 msgstr ""
 
-#: mod/network.php:983 mod/profiles.php:593
+#: mod/network.php:988 mod/profiles.php:595
 #: src/Core/NotificationsManager.php:187
 msgid "Personal"
 msgstr ""
 
-#: mod/network.php:986
+#: mod/network.php:991
 msgid "Posts that mention or involve you"
 msgstr ""
 
-#: mod/network.php:994
+#: mod/network.php:998
 msgid "New"
 msgstr ""
 
-#: mod/network.php:997
+#: mod/network.php:1001
 msgid "Activity Stream - by date"
 msgstr ""
 
-#: mod/network.php:1005
+#: mod/network.php:1009
 msgid "Shared Links"
 msgstr ""
 
-#: mod/network.php:1008
+#: mod/network.php:1012
 msgid "Interesting Links"
 msgstr ""
 
-#: mod/network.php:1016
+#: mod/network.php:1019
 msgid "Starred"
 msgstr ""
 
-#: mod/network.php:1019
+#: mod/network.php:1022
 msgid "Favourite Posts"
 msgstr ""
 
-#: mod/newmember.php:11
-msgid "Welcome to Friendica"
+#: mod/notifications.php:38
+msgid "Invalid request identifier."
 msgstr ""
 
-#: mod/newmember.php:12
-msgid "New Member Checklist"
+#: mod/notifications.php:60 mod/notifications.php:184 mod/notifications.php:269
+#: src/Module/Contact.php:628 src/Module/Contact.php:830
+#: src/Module/Contact.php:1090
+msgid "Ignore"
 msgstr ""
 
-#: mod/newmember.php:14
-msgid ""
-"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."
+#: mod/notifications.php:93 src/Content/Nav.php:244
+msgid "Notifications"
 msgstr ""
 
-#: mod/newmember.php:15
-msgid "Getting Started"
+#: mod/notifications.php:105
+msgid "Network Notifications"
 msgstr ""
 
-#: mod/newmember.php:17
-msgid "Friendica Walk-Through"
+#: mod/notifications.php:110 mod/notify.php:82
+msgid "System Notifications"
 msgstr ""
 
-#: mod/newmember.php:17
-msgid ""
-"On your <em>Quick Start</em> page - find a brief introduction to your "
-"profile and network tabs, make some new connections, and find some groups to "
-"join."
+#: mod/notifications.php:115
+msgid "Personal Notifications"
 msgstr ""
 
-#: mod/newmember.php:21
-msgid "Go to Your Settings"
+#: mod/notifications.php:120
+msgid "Home Notifications"
 msgstr ""
 
-#: mod/newmember.php:21
-msgid ""
-"On your <em>Settings</em> page -  change your initial password. Also make a "
-"note of your Identity Address. This looks just like an email address - and "
-"will be useful in making friends on the free social web."
+#: mod/notifications.php:140
+msgid "Show unread"
 msgstr ""
 
-#: mod/newmember.php:22
-msgid ""
-"Review the other settings, particularly the privacy settings. An unpublished "
-"directory listing is like having an unlisted phone number. In general, you "
-"should probably publish your listing - unless all of your friends and "
-"potential friends know exactly how to find you."
+#: mod/notifications.php:140
+msgid "Show all"
 msgstr ""
 
-#: mod/newmember.php:24 mod/profperm.php:116 view/theme/frio/theme.php:272
-#: src/Content/Nav.php:153 src/Model/Profile.php:731 src/Model/Profile.php:864
-#: src/Model/Profile.php:897 src/Module/Contact.php:659
-#: src/Module/Contact.php:864
-msgid "Profile"
+#: mod/notifications.php:151
+msgid "Show Ignored Requests"
 msgstr ""
 
-#: mod/newmember.php:26 mod/profile_photo.php:248 mod/profiles.php:597
-msgid "Upload Profile Photo"
+#: mod/notifications.php:151
+msgid "Hide Ignored Requests"
 msgstr ""
 
-#: mod/newmember.php:26
-msgid ""
-"Upload a profile photo if you have not done so already. Studies have shown "
-"that people with real photos of themselves are ten times more likely to make "
-"friends than people who do not."
+#: mod/notifications.php:164 mod/notifications.php:241
+msgid "Notification type:"
 msgstr ""
 
-#: mod/newmember.php:27
-msgid "Edit Your Profile"
+#: mod/notifications.php:167
+msgid "Suggested by:"
 msgstr ""
 
-#: mod/newmember.php:27
-msgid ""
-"Edit your <strong>default</strong> profile to your liking. Review the "
-"settings for hiding your list of friends and hiding the profile from unknown "
-"visitors."
+#: mod/notifications.php:179 mod/notifications.php:258
+#: src/Module/Contact.php:636
+msgid "Hide this contact from others"
 msgstr ""
 
-#: mod/newmember.php:28
-msgid "Profile Keywords"
+#: mod/notifications.php:201
+msgid "Claims to be known to you: "
 msgstr ""
 
-#: mod/newmember.php:28
-msgid ""
-"Set some public keywords for your default profile which describe your "
-"interests. We may be able to find other people with similar interests and "
-"suggest friendships."
+#: mod/notifications.php:202
+msgid "yes"
 msgstr ""
 
-#: mod/newmember.php:30
-msgid "Connecting"
+#: mod/notifications.php:202
+msgid "no"
 msgstr ""
 
-#: mod/newmember.php:36
-msgid "Importing Emails"
+#: mod/notifications.php:203 mod/notifications.php:207
+msgid "Shall your connection be bidirectional or not?"
 msgstr ""
 
-#: mod/newmember.php:36
+#: mod/notifications.php:204 mod/notifications.php:208
+#, php-format
 msgid ""
-"Enter your email access information on your Connector Settings page if you "
-"wish to import and interact with friends or mailing lists from your email "
-"INBOX"
+"Accepting %s as a friend allows %s to subscribe to your posts, and you will "
+"also receive updates from them in your news feed."
 msgstr ""
 
-#: mod/newmember.php:39
-msgid "Go to Your Contacts Page"
+#: mod/notifications.php:205
+#, php-format
+msgid ""
+"Accepting %s as a subscriber allows them to subscribe to your posts, but you "
+"will not receive updates from them in your news feed."
 msgstr ""
 
-#: mod/newmember.php:39
+#: mod/notifications.php:209
+#, php-format
 msgid ""
-"Your Contacts page is your gateway to managing friendships and connecting "
-"with friends on other networks. Typically you enter their address or site "
-"URL in the <em>Add New Contact</em> dialog."
+"Accepting %s as a sharer allows them to subscribe to your posts, but you "
+"will not receive updates from them in your news feed."
 msgstr ""
 
-#: mod/newmember.php:40
-msgid "Go to Your Site's Directory"
+#: mod/notifications.php:220
+msgid "Friend"
 msgstr ""
 
-#: mod/newmember.php:40
-msgid ""
-"The Directory page lets you find other people in this network or other "
-"federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
-"their profile page. Provide your own Identity Address if requested."
+#: mod/notifications.php:221
+msgid "Sharer"
 msgstr ""
 
-#: mod/newmember.php:41
-msgid "Finding New People"
+#: mod/notifications.php:221
+msgid "Subscriber"
 msgstr ""
 
-#: mod/newmember.php:41
-msgid ""
-"On the side panel of the Contacts page are several tools to find new "
-"friends. We can match people by interest, look up people by name or "
-"interest, and provide suggestions based on network relationships. On a brand "
-"new site, friend suggestions will usually begin to be populated within 24 "
-"hours."
+#: mod/notifications.php:264 src/Model/Profile.php:537
+#: src/Module/Contact.php:93
+msgid "Network:"
 msgstr ""
 
-#: mod/newmember.php:43 src/Model/Group.php:405
-msgid "Groups"
+#: mod/notifications.php:277
+msgid "No introductions."
 msgstr ""
 
-#: mod/newmember.php:45
-msgid "Group Your Contacts"
+#: mod/notifications.php:311
+#, php-format
+msgid "No more %s notifications."
 msgstr ""
 
-#: mod/newmember.php:45
-msgid ""
-"Once you have made some friends, organize them into private conversation "
-"groups from the sidebar of your Contacts page and then you can interact with "
-"each group privately on your Network page."
+#: mod/notify.php:78
+msgid "No more system notifications."
 msgstr ""
 
-#: mod/newmember.php:48
-msgid "Why Aren't My Posts Public?"
+#: mod/oexchange.php:32
+msgid "Post successful."
 msgstr ""
 
-#: mod/newmember.php:48
+#: mod/openid.php:32
+msgid "OpenID protocol error. No ID returned."
+msgstr ""
+
+#: mod/openid.php:68
 msgid ""
-"Friendica respects your privacy. By default, your posts will only show up to "
-"people you've added as friends. For more information, see the help section "
-"from the link above."
+"Account not found and OpenID registration is not permitted on this site."
 msgstr ""
 
-#: mod/newmember.php:52
-msgid "Getting Help"
+#: mod/openid.php:118 src/Module/Login.php:94 src/Module/Login.php:144
+msgid "Login failed."
 msgstr ""
 
-#: mod/newmember.php:54
-msgid "Go to the Help Section"
+#: mod/ostatus_subscribe.php:23
+msgid "Subscribing to OStatus contacts"
 msgstr ""
 
-#: mod/newmember.php:54
-msgid ""
-"Our <strong>help</strong> pages may be consulted for detail on other program "
-"features and resources."
-msgstr ""
-
-#: mod/notes.php:42 src/Model/Profile.php:947
-msgid "Personal Notes"
-msgstr ""
-
-#: mod/notifications.php:37
-msgid "Invalid request identifier."
-msgstr ""
-
-#: mod/notifications.php:59 mod/notifications.php:183 mod/notifications.php:268
-#: src/Module/Contact.php:626 src/Module/Contact.php:820
-#: src/Module/Contact.php:1080
-msgid "Ignore"
-msgstr ""
-
-#: mod/notifications.php:92 src/Content/Nav.php:243
-msgid "Notifications"
-msgstr ""
-
-#: mod/notifications.php:104
-msgid "Network Notifications"
-msgstr ""
-
-#: mod/notifications.php:109 mod/notify.php:81
-msgid "System Notifications"
-msgstr ""
-
-#: mod/notifications.php:114
-msgid "Personal Notifications"
-msgstr ""
-
-#: mod/notifications.php:119
-msgid "Home Notifications"
-msgstr ""
-
-#: mod/notifications.php:139
-msgid "Show unread"
-msgstr ""
-
-#: mod/notifications.php:139
-msgid "Show all"
-msgstr ""
-
-#: mod/notifications.php:150
-msgid "Show Ignored Requests"
-msgstr ""
-
-#: mod/notifications.php:150
-msgid "Hide Ignored Requests"
-msgstr ""
-
-#: mod/notifications.php:163 mod/notifications.php:240
-msgid "Notification type:"
-msgstr ""
-
-#: mod/notifications.php:166
-msgid "Suggested by:"
-msgstr ""
-
-#: mod/notifications.php:178 mod/notifications.php:257
-#: src/Module/Contact.php:634
-msgid "Hide this contact from others"
-msgstr ""
-
-#: mod/notifications.php:200
-msgid "Claims to be known to you: "
-msgstr ""
-
-#: mod/notifications.php:201
-msgid "yes"
-msgstr ""
-
-#: mod/notifications.php:201
-msgid "no"
-msgstr ""
-
-#: mod/notifications.php:202 mod/notifications.php:206
-msgid "Shall your connection be bidirectional or not?"
-msgstr ""
-
-#: mod/notifications.php:203 mod/notifications.php:207
-#, php-format
-msgid ""
-"Accepting %s as a friend allows %s to subscribe to your posts, and you will "
-"also receive updates from them in your news feed."
-msgstr ""
-
-#: mod/notifications.php:204
-#, php-format
-msgid ""
-"Accepting %s as a subscriber allows them to subscribe to your posts, but you "
-"will not receive updates from them in your news feed."
-msgstr ""
-
-#: mod/notifications.php:208
-#, php-format
-msgid ""
-"Accepting %s as a sharer allows them to subscribe to your posts, but you "
-"will not receive updates from them in your news feed."
-msgstr ""
-
-#: mod/notifications.php:219
-msgid "Friend"
-msgstr ""
-
-#: mod/notifications.php:220
-msgid "Sharer"
-msgstr ""
-
-#: mod/notifications.php:220
-msgid "Subscriber"
-msgstr ""
-
-#: mod/notifications.php:263 src/Model/Profile.php:534
-#: src/Module/Contact.php:91
-msgid "Network:"
-msgstr ""
-
-#: mod/notifications.php:276
-msgid "No introductions."
-msgstr ""
-
-#: mod/notifications.php:310
-#, php-format
-msgid "No more %s notifications."
-msgstr ""
-
-#: mod/notify.php:77
-msgid "No more system notifications."
-msgstr ""
-
-#: mod/openid.php:31
-msgid "OpenID protocol error. No ID returned."
-msgstr ""
-
-#: mod/openid.php:67
-msgid ""
-"Account not found and OpenID registration is not permitted on this site."
-msgstr ""
-
-#: mod/openid.php:117 src/Module/Login.php:92 src/Module/Login.php:142
-msgid "Login failed."
-msgstr ""
-
-#: mod/ostatus_subscribe.php:22
-msgid "Subscribing to OStatus contacts"
-msgstr ""
-
-#: mod/ostatus_subscribe.php:34
+#: mod/ostatus_subscribe.php:35
 msgid "No contact provided."
 msgstr ""
 
-#: mod/ostatus_subscribe.php:41
+#: mod/ostatus_subscribe.php:42
 msgid "Couldn't fetch information for contact."
 msgstr ""
 
-#: mod/ostatus_subscribe.php:51
+#: mod/ostatus_subscribe.php:52
 msgid "Couldn't fetch friends for contact."
 msgstr ""
 
-#: mod/ostatus_subscribe.php:65 mod/repair_ostatus.php:52
-msgid "Done"
-msgstr ""
-
-#: mod/ostatus_subscribe.php:79
+#: mod/ostatus_subscribe.php:84
 msgid "success"
 msgstr ""
 
-#: mod/ostatus_subscribe.php:81
+#: mod/ostatus_subscribe.php:86
 msgid "failed"
 msgstr ""
 
-#: mod/ostatus_subscribe.php:84 src/Object/Post.php:271
+#: mod/ostatus_subscribe.php:89 src/Object/Post.php:282
 msgid "ignored"
 msgstr ""
 
-#: mod/ostatus_subscribe.php:89 mod/repair_ostatus.php:58
-msgid "Keep this window open until done."
-msgstr ""
-
-#: mod/photos.php:114 src/Model/Profile.php:908
+#: mod/photos.php:118 src/Model/Profile.php:911
 msgid "Photo Albums"
 msgstr ""
 
-#: mod/photos.php:115 mod/photos.php:1708
+#: mod/photos.php:119 mod/photos.php:1710
 msgid "Recent Photos"
 msgstr ""
 
-#: mod/photos.php:118 mod/photos.php:1227 mod/photos.php:1710
+#: mod/photos.php:122 mod/photos.php:1231 mod/photos.php:1712
 msgid "Upload New Photos"
 msgstr ""
 
-#: mod/photos.php:136 mod/settings.php:54
+#: mod/photos.php:140 mod/settings.php:56
 msgid "everybody"
 msgstr ""
 
-#: mod/photos.php:192
+#: mod/photos.php:196
 msgid "Contact information unavailable"
 msgstr ""
 
-#: mod/photos.php:211
+#: mod/photos.php:215
 msgid "Album not found."
 msgstr ""
 
-#: mod/photos.php:240 mod/photos.php:253 mod/photos.php:1178
+#: mod/photos.php:244 mod/photos.php:257 mod/photos.php:1182
 msgid "Delete Album"
 msgstr ""
 
-#: mod/photos.php:251
+#: mod/photos.php:255
 msgid "Do you really want to delete this photo album and all its photos?"
 msgstr ""
 
-#: mod/photos.php:313 mod/photos.php:325 mod/photos.php:1453
+#: mod/photos.php:317 mod/photos.php:329 mod/photos.php:1457
 msgid "Delete Photo"
 msgstr ""
 
-#: mod/photos.php:323
+#: mod/photos.php:327
 msgid "Do you really want to delete this photo?"
 msgstr ""
 
-#: mod/photos.php:680
+#: mod/photos.php:684
 msgid "a photo"
 msgstr ""
 
-#: mod/photos.php:680
+#: mod/photos.php:684
 #, php-format
 msgid "%1$s was tagged in %2$s by %3$s"
 msgstr ""
 
-#: mod/photos.php:776 mod/photos.php:779 mod/photos.php:808
-#: mod/profile_photo.php:153 mod/wall_upload.php:196
+#: mod/photos.php:780 mod/photos.php:783 mod/photos.php:812
+#: mod/profile_photo.php:155 mod/wall_upload.php:197
 #, php-format
 msgid "Image exceeds size limit of %s"
 msgstr ""
 
-#: mod/photos.php:782
+#: mod/photos.php:786
 msgid "Image upload didn't complete, please try again"
 msgstr ""
 
-#: mod/photos.php:785
+#: mod/photos.php:789
 msgid "Image file is missing"
 msgstr ""
 
-#: mod/photos.php:790
+#: mod/photos.php:794
 msgid ""
 "Server can't accept new file upload at this time, please contact your "
 "administrator"
 msgstr ""
 
-#: mod/photos.php:816
+#: mod/photos.php:820
 msgid "Image file is empty."
 msgstr ""
 
-#: mod/photos.php:831 mod/profile_photo.php:162 mod/wall_upload.php:210
+#: mod/photos.php:835 mod/profile_photo.php:164 mod/wall_upload.php:211
 msgid "Unable to process image."
 msgstr ""
 
-#: mod/photos.php:860 mod/profile_photo.php:307 mod/wall_upload.php:249
+#: mod/photos.php:864 mod/profile_photo.php:309 mod/wall_upload.php:250
 msgid "Image upload failed."
 msgstr ""
 
-#: mod/photos.php:948
+#: mod/photos.php:952
 msgid "No photos selected"
 msgstr ""
 
-#: mod/photos.php:1045 mod/videos.php:301
+#: mod/photos.php:1049 mod/videos.php:302
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: mod/photos.php:1099
+#: mod/photos.php:1103
 msgid "Upload Photos"
 msgstr ""
 
-#: mod/photos.php:1103 mod/photos.php:1173
+#: mod/photos.php:1107 mod/photos.php:1177
 msgid "New album name: "
 msgstr ""
 
-#: mod/photos.php:1104
+#: mod/photos.php:1108
 msgid "or select existing album:"
 msgstr ""
 
-#: mod/photos.php:1105
+#: mod/photos.php:1109
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: mod/photos.php:1121 mod/photos.php:1456 mod/settings.php:1222
+#: mod/photos.php:1125 mod/photos.php:1460 mod/settings.php:1224
 msgid "Show to Groups"
 msgstr ""
 
-#: mod/photos.php:1122 mod/photos.php:1457 mod/settings.php:1223
+#: mod/photos.php:1126 mod/photos.php:1461 mod/settings.php:1225
 msgid "Show to Contacts"
 msgstr ""
 
-#: mod/photos.php:1184
+#: mod/photos.php:1188
 msgid "Edit Album"
 msgstr ""
 
-#: mod/photos.php:1189
+#: mod/photos.php:1193
 msgid "Show Newest First"
 msgstr ""
 
-#: mod/photos.php:1191
+#: mod/photos.php:1195
 msgid "Show Oldest First"
 msgstr ""
 
-#: mod/photos.php:1212 mod/photos.php:1693
+#: mod/photos.php:1216 mod/photos.php:1695
 msgid "View Photo"
 msgstr ""
 
-#: mod/photos.php:1253
+#: mod/photos.php:1257
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: mod/photos.php:1255
+#: mod/photos.php:1259
 msgid "Photo not available"
 msgstr ""
 
-#: mod/photos.php:1330
+#: mod/photos.php:1334
 msgid "View photo"
 msgstr ""
 
-#: mod/photos.php:1330
+#: mod/photos.php:1334
 msgid "Edit photo"
 msgstr ""
 
-#: mod/photos.php:1331
+#: mod/photos.php:1335
 msgid "Use as profile photo"
 msgstr ""
 
-#: mod/photos.php:1337 src/Object/Post.php:152
+#: mod/photos.php:1341 src/Object/Post.php:155
 msgid "Private Message"
 msgstr ""
 
-#: mod/photos.php:1357
+#: mod/photos.php:1361
 msgid "View Full Size"
 msgstr ""
 
-#: mod/photos.php:1421
+#: mod/photos.php:1425
 msgid "Tags: "
 msgstr ""
 
-#: mod/photos.php:1424
+#: mod/photos.php:1428
 msgid "[Select tags to remove]"
 msgstr ""
 
-#: mod/photos.php:1439
+#: mod/photos.php:1443
 msgid "New album name"
 msgstr ""
 
-#: mod/photos.php:1440
+#: mod/photos.php:1444
 msgid "Caption"
 msgstr ""
 
-#: mod/photos.php:1441
+#: mod/photos.php:1445
 msgid "Add a Tag"
 msgstr ""
 
-#: mod/photos.php:1441
+#: mod/photos.php:1445
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: mod/photos.php:1442
+#: mod/photos.php:1446
 msgid "Do not rotate"
 msgstr ""
 
-#: mod/photos.php:1443
+#: mod/photos.php:1447
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: mod/photos.php:1444
+#: mod/photos.php:1448
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: mod/photos.php:1478 src/Object/Post.php:300
+#: mod/photos.php:1482 src/Object/Post.php:310
 msgid "I like this (toggle)"
 msgstr ""
 
-#: mod/photos.php:1479 src/Object/Post.php:301
+#: mod/photos.php:1483 src/Object/Post.php:311
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: mod/photos.php:1494 mod/photos.php:1533 mod/photos.php:1593
-#: src/Module/Contact.php:1013 src/Object/Post.php:799
+#: mod/photos.php:1498 mod/photos.php:1537 mod/photos.php:1597
+#: src/Module/Contact.php:1023 src/Object/Post.php:810
 msgid "This is you"
 msgstr ""
 
-#: mod/photos.php:1496 mod/photos.php:1535 mod/photos.php:1595
-#: src/Object/Post.php:405 src/Object/Post.php:801
+#: mod/photos.php:1500 mod/photos.php:1539 mod/photos.php:1599
+#: src/Object/Post.php:415 src/Object/Post.php:812
 msgid "Comment"
 msgstr ""
 
-#: mod/photos.php:1627
+#: mod/photos.php:1629
 msgid "Map"
 msgstr ""
 
-#: mod/photos.php:1699 mod/videos.php:378
+#: mod/photos.php:1701 mod/videos.php:379
 msgid "View Album"
 msgstr ""
 
-#: mod/ping.php:285
+#: mod/ping.php:281
 msgid "{0} wants to be your friend"
 msgstr ""
 
-#: mod/ping.php:301
+#: mod/ping.php:297
 msgid "{0} sent you a message"
 msgstr ""
 
-#: mod/ping.php:317
+#: mod/ping.php:313
 msgid "{0} requested registration"
 msgstr ""
 
-#: mod/poke.php:184
+#: mod/poke.php:187
 msgid "Poke/Prod"
 msgstr ""
 
-#: mod/poke.php:185
+#: mod/poke.php:188
 msgid "poke, prod or do other things to somebody"
 msgstr ""
 
-#: mod/poke.php:186
+#: mod/poke.php:189
 msgid "Recipient"
 msgstr ""
 
-#: mod/poke.php:187
+#: mod/poke.php:190
 msgid "Choose what you wish to do to recipient"
 msgstr ""
 
-#: mod/poke.php:190
+#: mod/poke.php:193
 msgid "Make this post private"
 msgstr ""
 
-#: mod/probe.php:14 mod/webfinger.php:17
-msgid "Only logged in users are permitted to perform a probing."
-msgstr ""
-
-#: mod/profile.php:42 src/Model/Profile.php:129
+#: mod/profile.php:44 src/Model/Profile.php:132
 msgid "Requested profile is not available."
 msgstr ""
 
-#: mod/profile.php:93 mod/profile.php:96 src/Protocol/OStatus.php:1286
+#: mod/profile.php:95 mod/profile.php:98 src/Protocol/OStatus.php:1290
 #, php-format
 msgid "%s's timeline"
 msgstr ""
 
-#: mod/profile.php:94 src/Protocol/OStatus.php:1287
+#: mod/profile.php:96 src/Protocol/OStatus.php:1294
 #, php-format
 msgid "%s's posts"
 msgstr ""
 
-#: mod/profile.php:95 src/Protocol/OStatus.php:1288
+#: mod/profile.php:97 src/Protocol/OStatus.php:1297
 #, php-format
 msgid "%s's comments"
 msgstr ""
 
-#: mod/profile_photo.php:57
+#: mod/profile_photo.php:59
 msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: mod/profile_photo.php:89 mod/profile_photo.php:98 mod/profile_photo.php:107
-#: mod/profile_photo.php:315
+#: mod/profile_photo.php:91 mod/profile_photo.php:100 mod/profile_photo.php:109
+#: mod/profile_photo.php:317
 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr ""
 
-#: mod/profile_photo.php:126
+#: mod/profile_photo.php:128
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr ""
 
-#: mod/profile_photo.php:134
+#: mod/profile_photo.php:136
 msgid "Unable to process image"
 msgstr ""
 
-#: mod/profile_photo.php:246
+#: mod/profile_photo.php:248
 msgid "Upload File:"
 msgstr ""
 
-#: mod/profile_photo.php:247
+#: mod/profile_photo.php:249
 msgid "Select a profile:"
 msgstr ""
 
-#: mod/profile_photo.php:252
+#: mod/profile_photo.php:254
 msgid "or"
 msgstr ""
 
-#: mod/profile_photo.php:253
+#: mod/profile_photo.php:255
 msgid "skip this step"
 msgstr ""
 
-#: mod/profile_photo.php:253
+#: mod/profile_photo.php:255
 msgid "select a photo from your photo albums"
 msgstr ""
 
-#: mod/profile_photo.php:266
+#: mod/profile_photo.php:268
 msgid "Crop Image"
 msgstr ""
 
-#: mod/profile_photo.php:267
+#: mod/profile_photo.php:269
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: mod/profile_photo.php:269
+#: mod/profile_photo.php:271
 msgid "Done Editing"
 msgstr ""
 
-#: mod/profile_photo.php:305
+#: mod/profile_photo.php:307
 msgid "Image uploaded successfully."
 msgstr ""
 
-#: mod/profiles.php:59
+#: mod/profiles.php:61
 msgid "Profile deleted."
 msgstr ""
 
-#: mod/profiles.php:75 mod/profiles.php:111
+#: mod/profiles.php:77 mod/profiles.php:113
 msgid "Profile-"
 msgstr ""
 
-#: mod/profiles.php:94 mod/profiles.php:133
+#: mod/profiles.php:96 mod/profiles.php:135
 msgid "New profile created."
 msgstr ""
 
-#: mod/profiles.php:117
+#: mod/profiles.php:119
 msgid "Profile unavailable to clone."
 msgstr ""
 
-#: mod/profiles.php:205
+#: mod/profiles.php:207
 msgid "Profile Name is required."
 msgstr ""
 
-#: mod/profiles.php:346
+#: mod/profiles.php:348
 msgid "Marital Status"
 msgstr ""
 
-#: mod/profiles.php:350
+#: mod/profiles.php:352
 msgid "Romantic Partner"
 msgstr ""
 
-#: mod/profiles.php:362
+#: mod/profiles.php:364
 msgid "Work/Employment"
 msgstr ""
 
-#: mod/profiles.php:365
+#: mod/profiles.php:367
 msgid "Religion"
 msgstr ""
 
-#: mod/profiles.php:369
+#: mod/profiles.php:371
 msgid "Political Views"
 msgstr ""
 
-#: mod/profiles.php:373
+#: mod/profiles.php:375
 msgid "Gender"
 msgstr ""
 
-#: mod/profiles.php:377
+#: mod/profiles.php:379
 msgid "Sexual Preference"
 msgstr ""
 
-#: mod/profiles.php:381
+#: mod/profiles.php:383
 msgid "XMPP"
 msgstr ""
 
-#: mod/profiles.php:385
+#: mod/profiles.php:387
 msgid "Homepage"
 msgstr ""
 
-#: mod/profiles.php:389 mod/profiles.php:592
+#: mod/profiles.php:391 mod/profiles.php:594
 msgid "Interests"
 msgstr ""
 
-#: mod/profiles.php:400 mod/profiles.php:588
+#: mod/profiles.php:402 mod/profiles.php:590
 msgid "Location"
 msgstr ""
 
-#: mod/profiles.php:483
+#: mod/profiles.php:485
 msgid "Profile updated."
 msgstr ""
 
-#: mod/profiles.php:537
+#: mod/profiles.php:539
 msgid "Hide contacts and friends:"
 msgstr ""
 
-#: mod/profiles.php:542
+#: mod/profiles.php:544
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: mod/profiles.php:562
+#: mod/profiles.php:564
 msgid "Show more profile fields:"
 msgstr ""
 
-#: mod/profiles.php:574
+#: mod/profiles.php:576
 msgid "Profile Actions"
 msgstr ""
 
-#: mod/profiles.php:575
+#: mod/profiles.php:577
 msgid "Edit Profile Details"
 msgstr ""
 
-#: mod/profiles.php:577
+#: mod/profiles.php:579
 msgid "Change Profile Photo"
 msgstr ""
 
-#: mod/profiles.php:579
+#: mod/profiles.php:581
 msgid "View this profile"
 msgstr ""
 
-#: mod/profiles.php:580
+#: mod/profiles.php:582
 msgid "View all profiles"
 msgstr ""
 
-#: mod/profiles.php:581 mod/profiles.php:676 src/Model/Profile.php:407
+#: mod/profiles.php:583 mod/profiles.php:678 src/Model/Profile.php:410
 msgid "Edit visibility"
 msgstr ""
 
-#: mod/profiles.php:582
+#: mod/profiles.php:584
 msgid "Create a new profile using these settings"
 msgstr ""
 
-#: mod/profiles.php:583
+#: mod/profiles.php:585
 msgid "Clone this profile"
 msgstr ""
 
-#: mod/profiles.php:584
+#: mod/profiles.php:586
 msgid "Delete this profile"
 msgstr ""
 
-#: mod/profiles.php:586
+#: mod/profiles.php:588
 msgid "Basic information"
 msgstr ""
 
-#: mod/profiles.php:587
+#: mod/profiles.php:589
 msgid "Profile picture"
 msgstr ""
 
-#: mod/profiles.php:589
+#: mod/profiles.php:591
 msgid "Preferences"
 msgstr ""
 
-#: mod/profiles.php:590
+#: mod/profiles.php:592
 msgid "Status information"
 msgstr ""
 
-#: mod/profiles.php:591
+#: mod/profiles.php:593
 msgid "Additional information"
 msgstr ""
 
-#: mod/profiles.php:594
+#: mod/profiles.php:596
 msgid "Relation"
 msgstr ""
 
-#: mod/profiles.php:595 src/Util/Temporal.php:82 src/Util/Temporal.php:84
+#: mod/profiles.php:597 src/Util/Temporal.php:83 src/Util/Temporal.php:85
 msgid "Miscellaneous"
 msgstr ""
 
-#: mod/profiles.php:598
+#: mod/profiles.php:600
 msgid "Your Gender:"
 msgstr ""
 
-#: mod/profiles.php:599
+#: mod/profiles.php:601
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: mod/profiles.php:600 src/Model/Profile.php:783
+#: mod/profiles.php:602 src/Model/Profile.php:786
 msgid "Sexual Preference:"
 msgstr ""
 
-#: mod/profiles.php:601
+#: mod/profiles.php:603
 msgid "Example: fishing photography software"
 msgstr ""
 
-#: mod/profiles.php:606
+#: mod/profiles.php:608
 msgid "Profile Name:"
 msgstr ""
 
-#: mod/profiles.php:608
+#: mod/profiles.php:610
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr ""
 
-#: mod/profiles.php:609
+#: mod/profiles.php:611
 msgid "Your Full Name:"
 msgstr ""
 
-#: mod/profiles.php:610
+#: mod/profiles.php:612
 msgid "Title/Description:"
 msgstr ""
 
-#: mod/profiles.php:613
+#: mod/profiles.php:615
 msgid "Street Address:"
 msgstr ""
 
-#: mod/profiles.php:614
+#: mod/profiles.php:616
 msgid "Locality/City:"
 msgstr ""
 
-#: mod/profiles.php:615
+#: mod/profiles.php:617
 msgid "Region/State:"
 msgstr ""
 
-#: mod/profiles.php:616
+#: mod/profiles.php:618
 msgid "Postal/Zip Code:"
 msgstr ""
 
-#: mod/profiles.php:617
+#: mod/profiles.php:619
 msgid "Country:"
 msgstr ""
 
-#: mod/profiles.php:618 src/Util/Temporal.php:150
+#: mod/profiles.php:620 src/Util/Temporal.php:151
 msgid "Age: "
 msgstr ""
 
-#: mod/profiles.php:621
+#: mod/profiles.php:623
 msgid "Who: (if applicable)"
 msgstr ""
 
-#: mod/profiles.php:621
+#: mod/profiles.php:623
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: mod/profiles.php:622
+#: mod/profiles.php:624
 msgid "Since [date]:"
 msgstr ""
 
-#: mod/profiles.php:624
+#: mod/profiles.php:626
 msgid "Tell us about yourself..."
 msgstr ""
 
-#: mod/profiles.php:625
+#: mod/profiles.php:627
 msgid "XMPP (Jabber) address:"
 msgstr ""
 
-#: mod/profiles.php:625
+#: mod/profiles.php:627
 msgid ""
 "The XMPP address will be propagated to your contacts so that they can follow "
 "you."
 msgstr ""
 
-#: mod/profiles.php:626
+#: mod/profiles.php:628
 msgid "Homepage URL:"
 msgstr ""
 
-#: mod/profiles.php:627 src/Model/Profile.php:791
+#: mod/profiles.php:629 src/Model/Profile.php:794
 msgid "Hometown:"
 msgstr ""
 
-#: mod/profiles.php:628 src/Model/Profile.php:799
+#: mod/profiles.php:630 src/Model/Profile.php:802
 msgid "Political Views:"
 msgstr ""
 
-#: mod/profiles.php:629
+#: mod/profiles.php:631
 msgid "Religious Views:"
 msgstr ""
 
-#: mod/profiles.php:630
+#: mod/profiles.php:632
 msgid "Public Keywords:"
 msgstr ""
 
-#: mod/profiles.php:630
+#: mod/profiles.php:632
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: mod/profiles.php:631
+#: mod/profiles.php:633
 msgid "Private Keywords:"
 msgstr ""
 
-#: mod/profiles.php:631
+#: mod/profiles.php:633
 msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: mod/profiles.php:632 src/Model/Profile.php:815
+#: mod/profiles.php:634 src/Model/Profile.php:818
 msgid "Likes:"
 msgstr ""
 
-#: mod/profiles.php:633 src/Model/Profile.php:819
+#: mod/profiles.php:635 src/Model/Profile.php:822
 msgid "Dislikes:"
 msgstr ""
 
-#: mod/profiles.php:634
+#: mod/profiles.php:636
 msgid "Musical interests"
 msgstr ""
 
-#: mod/profiles.php:635
+#: mod/profiles.php:637
 msgid "Books, literature"
 msgstr ""
 
-#: mod/profiles.php:636
+#: mod/profiles.php:638
 msgid "Television"
 msgstr ""
 
-#: mod/profiles.php:637
+#: mod/profiles.php:639
 msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: mod/profiles.php:638
+#: mod/profiles.php:640
 msgid "Hobbies/Interests"
 msgstr ""
 
-#: mod/profiles.php:639
+#: mod/profiles.php:641
 msgid "Love/romance"
 msgstr ""
 
-#: mod/profiles.php:640
+#: mod/profiles.php:642
 msgid "Work/employment"
 msgstr ""
 
-#: mod/profiles.php:641
+#: mod/profiles.php:643
 msgid "School/education"
 msgstr ""
 
-#: mod/profiles.php:642
+#: mod/profiles.php:644
 msgid "Contact information and Social Networks"
 msgstr ""
 
-#: mod/profiles.php:673 src/Model/Profile.php:403
+#: mod/profiles.php:675 src/Model/Profile.php:406
 msgid "Profile Image"
 msgstr ""
 
-#: mod/profiles.php:675 src/Model/Profile.php:406
+#: mod/profiles.php:677 src/Model/Profile.php:409
 msgid "visible to everybody"
 msgstr ""
 
-#: mod/profiles.php:682
+#: mod/profiles.php:684
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: mod/profiles.php:683 src/Model/Profile.php:393 src/Model/Profile.php:415
+#: mod/profiles.php:685 src/Model/Profile.php:396 src/Model/Profile.php:418
 msgid "Change profile photo"
 msgstr ""
 
-#: mod/profiles.php:684 src/Model/Profile.php:394
+#: mod/profiles.php:686 src/Model/Profile.php:397
 msgid "Create New Profile"
 msgstr ""
 
-#: mod/profperm.php:35 mod/profperm.php:68
+#: mod/profperm.php:36 mod/profperm.php:69
 msgid "Invalid profile identifier."
 msgstr ""
 
-#: mod/profperm.php:114
+#: mod/profperm.php:115
 msgid "Profile Visibility Editor"
 msgstr ""
 
-#: mod/profperm.php:127
+#: mod/profperm.php:128
 msgid "Visible To"
 msgstr ""
 
-#: mod/profperm.php:143
+#: mod/profperm.php:144
 msgid "All Contacts (with secure profile access)"
 msgstr ""
 
-#: mod/register.php:103
+#: mod/register.php:105
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: mod/register.php:107
+#: mod/register.php:109
 #, 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 ""
 
-#: mod/register.php:114
+#: mod/register.php:116
 msgid "Registration successful."
 msgstr ""
 
-#: mod/register.php:119
+#: mod/register.php:121
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: mod/register.php:162
+#: mod/register.php:164
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: mod/register.php:191 mod/uimport.php:38
+#: mod/register.php:193 mod/uimport.php:39
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr ""
 
-#: mod/register.php:220
+#: mod/register.php:222
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 
-#: mod/register.php:221
+#: mod/register.php:223
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr ""
 
-#: mod/register.php:222
+#: mod/register.php:224
 msgid "Your OpenID (optional): "
 msgstr ""
 
-#: mod/register.php:234
+#: mod/register.php:236
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: mod/register.php:261
+#: mod/register.php:263
 msgid "Note for the admin"
 msgstr ""
 
-#: mod/register.php:261
+#: mod/register.php:263
 msgid "Leave a message for the admin, why you want to join this node"
 msgstr ""
 
-#: mod/register.php:262
+#: mod/register.php:264
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: mod/register.php:263
+#: mod/register.php:265
 msgid "Your invitation code: "
 msgstr ""
 
-#: mod/register.php:272
+#: mod/register.php:274
 msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
 msgstr ""
 
-#: mod/register.php:273
+#: mod/register.php:275
 msgid ""
 "Your Email Address: (Initial information will be send there, so this has to "
 "be an existing address.)"
 msgstr ""
 
-#: mod/register.php:275 mod/settings.php:1194
+#: mod/register.php:277 mod/settings.php:1196
 msgid "New Password:"
 msgstr ""
 
-#: mod/register.php:275
+#: mod/register.php:277
 msgid "Leave empty for an auto generated password."
 msgstr ""
 
-#: mod/register.php:276 mod/settings.php:1195
+#: mod/register.php:278 mod/settings.php:1197
 msgid "Confirm:"
 msgstr ""
 
-#: mod/register.php:277
+#: mod/register.php:279
 #, php-format
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be '<strong>nickname@%s</strong>'."
 msgstr ""
 
-#: mod/register.php:278
+#: mod/register.php:280
 msgid "Choose a nickname: "
 msgstr ""
 
-#: mod/register.php:281 src/Content/Nav.php:180 src/Module/Login.php:291
+#: mod/register.php:283 src/Content/Nav.php:181 src/Module/Login.php:293
 msgid "Register"
 msgstr ""
 
-#: mod/register.php:287 mod/uimport.php:53
+#: mod/register.php:289 mod/uimport.php:54
 msgid "Import"
 msgstr ""
 
-#: mod/register.php:288
+#: mod/register.php:290
 msgid "Import your profile to this friendica instance"
 msgstr ""
 
-#: mod/register.php:296
+#: mod/register.php:298
 msgid "Note: This node explicitly contains adult content"
 msgstr ""
 
-#: mod/regmod.php:55
-msgid "Account approved."
-msgstr ""
-
-#: mod/regmod.php:79
-#, php-format
-msgid "Registration revoked for %s"
-msgstr ""
-
-#: mod/regmod.php:86
-msgid "Please login."
-msgstr ""
-
-#: mod/removeme.php:47
+#: mod/removeme.php:49
 msgid "User deleted their account"
 msgstr ""
 
-#: mod/removeme.php:48
+#: mod/removeme.php:50
 msgid ""
 "On your Friendica node an user deleted their account. Please ensure that "
 "their data is removed from the backups."
 msgstr ""
 
-#: mod/removeme.php:49
+#: mod/removeme.php:51
 #, php-format
 msgid "The user id is %d"
 msgstr ""
 
-#: mod/removeme.php:81 mod/removeme.php:84
+#: mod/removeme.php:83 mod/removeme.php:86
 msgid "Remove My Account"
 msgstr ""
 
-#: mod/removeme.php:82
+#: mod/removeme.php:84
 msgid ""
 "This will completely remove your account. Once this has been done it is not "
 "recoverable."
 msgstr ""
 
-#: mod/removeme.php:83
+#: mod/removeme.php:85
 msgid "Please enter your password for verification:"
 msgstr ""
 
-#: mod/repair_ostatus.php:21
-msgid "Resubscribing to OStatus contacts"
-msgstr ""
-
-#: mod/repair_ostatus.php:37
-msgid "Error"
-msgstr ""
-
 #: mod/search.php:113
 msgid "Only logged in users are permitted to perform a search."
 msgstr ""
@@ -5987,216 +5673,224 @@ msgstr ""
 msgid "Only one search per minute is permitted for not logged in users."
 msgstr ""
 
+#: mod/search.php:163 src/Content/Text/HTML.php:967 src/Content/Nav.php:195
+msgid "Search"
+msgstr ""
+
 #: mod/search.php:249
 #, php-format
 msgid "Items tagged with: %s"
 msgstr ""
 
-#: mod/search.php:251 src/Module/Contact.php:811
+#: mod/search.php:251 src/Module/Contact.php:821
 #, php-format
 msgid "Results for: %s"
 msgstr ""
 
-#: mod/settings.php:59
+#: mod/settings.php:61
 msgid "Account"
 msgstr ""
 
-#: mod/settings.php:67 src/Content/Nav.php:262 src/Model/Profile.php:386
+#: mod/settings.php:69 src/Content/Nav.php:263 src/Model/Profile.php:389
 msgid "Profiles"
 msgstr ""
 
-#: mod/settings.php:83
+#: mod/settings.php:85
 msgid "Display"
 msgstr ""
 
-#: mod/settings.php:90 mod/settings.php:843
+#: mod/settings.php:92 mod/settings.php:845
 msgid "Social Networks"
 msgstr ""
 
-#: mod/settings.php:104 src/Content/Nav.php:257
+#: mod/settings.php:106 src/Content/Nav.php:258
 msgid "Delegations"
 msgstr ""
 
-#: mod/settings.php:111
+#: mod/settings.php:113
 msgid "Connected apps"
 msgstr ""
 
-#: mod/settings.php:125
+#: mod/settings.php:120 mod/uexport.php:53
+msgid "Export personal data"
+msgstr ""
+
+#: mod/settings.php:127
 msgid "Remove account"
 msgstr ""
 
-#: mod/settings.php:177
+#: mod/settings.php:179
 msgid "Missing some important data!"
 msgstr ""
 
-#: mod/settings.php:179 mod/settings.php:704 src/Module/Contact.php:818
+#: mod/settings.php:181 mod/settings.php:706 src/Module/Contact.php:828
 msgid "Update"
 msgstr ""
 
-#: mod/settings.php:288
+#: mod/settings.php:290
 msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: mod/settings.php:293
+#: mod/settings.php:295
 msgid "Email settings updated."
 msgstr ""
 
-#: mod/settings.php:309
+#: mod/settings.php:311
 msgid "Features updated"
 msgstr ""
 
-#: mod/settings.php:382
+#: mod/settings.php:384
 msgid "Relocate message has been send to your contacts"
 msgstr ""
 
-#: mod/settings.php:394 src/Model/User.php:421
+#: mod/settings.php:396 src/Model/User.php:422
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: mod/settings.php:399
+#: mod/settings.php:401
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: mod/settings.php:404 src/Core/Console/NewPassword.php:82
+#: mod/settings.php:406 src/Core/Console/NewPassword.php:82
 msgid ""
 "The new password has been exposed in a public data dump, please choose "
 "another."
 msgstr ""
 
-#: mod/settings.php:410
+#: mod/settings.php:412
 msgid "Wrong password."
 msgstr ""
 
-#: mod/settings.php:417 src/Core/Console/NewPassword.php:89
+#: mod/settings.php:419 src/Core/Console/NewPassword.php:89
 msgid "Password changed."
 msgstr ""
 
-#: mod/settings.php:419 src/Core/Console/NewPassword.php:86
+#: mod/settings.php:421 src/Core/Console/NewPassword.php:86
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: mod/settings.php:503
+#: mod/settings.php:505
 msgid " Please use a shorter name."
 msgstr ""
 
-#: mod/settings.php:506
+#: mod/settings.php:508
 msgid " Name too short."
 msgstr ""
 
-#: mod/settings.php:514
+#: mod/settings.php:516
 msgid "Wrong Password"
 msgstr ""
 
-#: mod/settings.php:519
+#: mod/settings.php:521
 msgid "Invalid email."
 msgstr ""
 
-#: mod/settings.php:525
+#: mod/settings.php:527
 msgid "Cannot change to that email."
 msgstr ""
 
-#: mod/settings.php:575
+#: mod/settings.php:577
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
-#: mod/settings.php:578
+#: mod/settings.php:580
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: mod/settings.php:618
+#: mod/settings.php:620
 msgid "Settings updated."
 msgstr ""
 
-#: mod/settings.php:677 mod/settings.php:703 mod/settings.php:737
+#: mod/settings.php:679 mod/settings.php:705 mod/settings.php:739
 msgid "Add application"
 msgstr ""
 
-#: mod/settings.php:681 mod/settings.php:707
+#: mod/settings.php:683 mod/settings.php:709
 msgid "Consumer Key"
 msgstr ""
 
-#: mod/settings.php:682 mod/settings.php:708
+#: mod/settings.php:684 mod/settings.php:710
 msgid "Consumer Secret"
 msgstr ""
 
-#: mod/settings.php:683 mod/settings.php:709
+#: mod/settings.php:685 mod/settings.php:711
 msgid "Redirect"
 msgstr ""
 
-#: mod/settings.php:684 mod/settings.php:710
+#: mod/settings.php:686 mod/settings.php:712
 msgid "Icon url"
 msgstr ""
 
-#: mod/settings.php:695
+#: mod/settings.php:697
 msgid "You can't edit this application."
 msgstr ""
 
-#: mod/settings.php:736
+#: mod/settings.php:738
 msgid "Connected Apps"
 msgstr ""
 
-#: mod/settings.php:738 src/Object/Post.php:159 src/Object/Post.php:161
+#: mod/settings.php:740 src/Object/Post.php:165 src/Object/Post.php:167
 msgid "Edit"
 msgstr ""
 
-#: mod/settings.php:740
+#: mod/settings.php:742
 msgid "Client key starts with"
 msgstr ""
 
-#: mod/settings.php:741
+#: mod/settings.php:743
 msgid "No name"
 msgstr ""
 
-#: mod/settings.php:742
+#: mod/settings.php:744
 msgid "Remove authorization"
 msgstr ""
 
-#: mod/settings.php:753
+#: mod/settings.php:755
 msgid "No Addon settings configured"
 msgstr ""
 
-#: mod/settings.php:762
+#: mod/settings.php:764
 msgid "Addon Settings"
 msgstr ""
 
-#: mod/settings.php:783
+#: mod/settings.php:785
 msgid "Additional Features"
 msgstr ""
 
-#: mod/settings.php:806 src/Content/ContactSelector.php:84
+#: mod/settings.php:808 src/Content/ContactSelector.php:85
 msgid "Diaspora"
 msgstr ""
 
-#: mod/settings.php:806 mod/settings.php:807
+#: mod/settings.php:808 mod/settings.php:809
 msgid "enabled"
 msgstr ""
 
-#: mod/settings.php:806 mod/settings.php:807
+#: mod/settings.php:808 mod/settings.php:809
 msgid "disabled"
 msgstr ""
 
-#: mod/settings.php:806 mod/settings.php:807
+#: mod/settings.php:808 mod/settings.php:809
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: mod/settings.php:807
+#: mod/settings.php:809
 msgid "GNU Social (OStatus)"
 msgstr ""
 
-#: mod/settings.php:838
+#: mod/settings.php:840
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: mod/settings.php:848
+#: mod/settings.php:850
 msgid "General Social Media Settings"
 msgstr ""
 
-#: mod/settings.php:849
+#: mod/settings.php:851
 msgid "Disable Content Warning"
 msgstr ""
 
-#: mod/settings.php:849
+#: mod/settings.php:851
 msgid ""
 "Users on networks like Mastodon or Pleroma are able to set a content warning "
 "field which collapse their post by default. This disables the automatic "
@@ -6204,308 +5898,316 @@ msgid ""
 "any other content filtering you eventually set up."
 msgstr ""
 
-#: mod/settings.php:850
+#: mod/settings.php:852
 msgid "Disable intelligent shortening"
 msgstr ""
 
-#: mod/settings.php:850
+#: mod/settings.php:852
 msgid ""
 "Normally the system tries to find the best link to add to shortened posts. "
 "If this option is enabled then every shortened post will always point to the "
 "original friendica post."
 msgstr ""
 
-#: mod/settings.php:851
+#: mod/settings.php:853
 msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
 msgstr ""
 
-#: mod/settings.php:851
+#: mod/settings.php:853
 msgid ""
 "If you receive a message from an unknown OStatus user, this option decides "
 "what to do. If it is checked, a new contact will be created for every "
 "unknown user."
 msgstr ""
 
-#: mod/settings.php:852
+#: mod/settings.php:854
 msgid "Default group for OStatus contacts"
 msgstr ""
 
-#: mod/settings.php:853
+#: mod/settings.php:855
 msgid "Your legacy GNU Social account"
 msgstr ""
 
-#: mod/settings.php:853
+#: mod/settings.php:855
 msgid ""
 "If you enter your old 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 ""
 
-#: mod/settings.php:856
+#: mod/settings.php:858
 msgid "Repair OStatus subscriptions"
 msgstr ""
 
-#: mod/settings.php:860
+#: mod/settings.php:862
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: mod/settings.php:861
+#: mod/settings.php:863
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr ""
 
-#: mod/settings.php:862
+#: mod/settings.php:864
 msgid "Last successful email check:"
 msgstr ""
 
-#: mod/settings.php:864
+#: mod/settings.php:866
 msgid "IMAP server name:"
 msgstr ""
 
-#: mod/settings.php:865
+#: mod/settings.php:867
 msgid "IMAP port:"
 msgstr ""
 
-#: mod/settings.php:866
+#: mod/settings.php:868
 msgid "Security:"
 msgstr ""
 
-#: mod/settings.php:866 mod/settings.php:871
+#: mod/settings.php:868 mod/settings.php:873
 msgid "None"
 msgstr ""
 
-#: mod/settings.php:867
+#: mod/settings.php:869
 msgid "Email login name:"
 msgstr ""
 
-#: mod/settings.php:868
+#: mod/settings.php:870
 msgid "Email password:"
 msgstr ""
 
-#: mod/settings.php:869
+#: mod/settings.php:871
 msgid "Reply-to address:"
 msgstr ""
 
-#: mod/settings.php:870
+#: mod/settings.php:872
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: mod/settings.php:871
+#: mod/settings.php:873
 msgid "Action after import:"
 msgstr ""
 
-#: mod/settings.php:871 src/Content/Nav.php:245
+#: mod/settings.php:873 src/Content/Nav.php:246
 msgid "Mark as seen"
 msgstr ""
 
-#: mod/settings.php:871
+#: mod/settings.php:873
 msgid "Move to folder"
 msgstr ""
 
-#: mod/settings.php:872
+#: mod/settings.php:874
 msgid "Move to folder:"
 msgstr ""
 
-#: mod/settings.php:915
+#: mod/settings.php:917
 #, php-format
 msgid "%s - (Unsupported)"
 msgstr ""
 
-#: mod/settings.php:917
+#: mod/settings.php:919
 #, php-format
 msgid "%s - (Experimental)"
 msgstr ""
 
-#: mod/settings.php:960
+#: mod/settings.php:946 src/Core/L10n.php:359 src/Model/Event.php:391
+msgid "Sunday"
+msgstr ""
+
+#: mod/settings.php:946 src/Core/L10n.php:359 src/Model/Event.php:392
+msgid "Monday"
+msgstr ""
+
+#: mod/settings.php:962
 msgid "Display Settings"
 msgstr ""
 
-#: mod/settings.php:966
+#: mod/settings.php:968
 msgid "Display Theme:"
 msgstr ""
 
-#: mod/settings.php:967
+#: mod/settings.php:969
 msgid "Mobile Theme:"
 msgstr ""
 
-#: mod/settings.php:968
+#: mod/settings.php:970
 msgid "Suppress warning of insecure networks"
 msgstr ""
 
-#: mod/settings.php:968
+#: mod/settings.php:970
 msgid ""
 "Should the system suppress the warning that the current group contains "
 "members of networks that can't receive non public postings."
 msgstr ""
 
-#: mod/settings.php:969
+#: mod/settings.php:971
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: mod/settings.php:969
+#: mod/settings.php:971
 msgid "Minimum of 10 seconds. Enter -1 to disable it."
 msgstr ""
 
-#: mod/settings.php:970
+#: mod/settings.php:972
 msgid "Number of items to display per page:"
 msgstr ""
 
-#: mod/settings.php:970 mod/settings.php:971
+#: mod/settings.php:972 mod/settings.php:973
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: mod/settings.php:971
+#: mod/settings.php:973
 msgid "Number of items to display per page when viewed from mobile device:"
 msgstr ""
 
-#: mod/settings.php:972
+#: mod/settings.php:974
 msgid "Don't show emoticons"
 msgstr ""
 
-#: mod/settings.php:973
+#: mod/settings.php:975
 msgid "Calendar"
 msgstr ""
 
-#: mod/settings.php:974
+#: mod/settings.php:976
 msgid "Beginning of week:"
 msgstr ""
 
-#: mod/settings.php:975
+#: mod/settings.php:977
 msgid "Don't show notices"
 msgstr ""
 
-#: mod/settings.php:976
+#: mod/settings.php:978
 msgid "Infinite scroll"
 msgstr ""
 
-#: mod/settings.php:977
+#: mod/settings.php:979
 msgid "Automatic updates only at the top of the network page"
 msgstr ""
 
-#: mod/settings.php:977
+#: mod/settings.php:979
 msgid ""
 "When disabled, the network page is updated all the time, which could be "
 "confusing while reading."
 msgstr ""
 
-#: mod/settings.php:978
+#: mod/settings.php:980
 msgid "Bandwidth Saver Mode"
 msgstr ""
 
-#: mod/settings.php:978
+#: mod/settings.php:980
 msgid ""
 "When enabled, embedded content is not displayed on automatic updates, they "
 "only show on page reload."
 msgstr ""
 
-#: mod/settings.php:979
+#: mod/settings.php:981
 msgid "Smart Threading"
 msgstr ""
 
-#: mod/settings.php:979
+#: mod/settings.php:981
 msgid ""
 "When enabled, suppress extraneous thread indentation while keeping it where "
 "it matters. Only works if threading is available and enabled."
 msgstr ""
 
-#: mod/settings.php:981
+#: mod/settings.php:983
 msgid "General Theme Settings"
 msgstr ""
 
-#: mod/settings.php:982
+#: mod/settings.php:984
 msgid "Custom Theme Settings"
 msgstr ""
 
-#: mod/settings.php:983
+#: mod/settings.php:985
 msgid "Content Settings"
 msgstr ""
 
-#: mod/settings.php:984 view/theme/duepuntozero/config.php:73
-#: view/theme/frio/config.php:120 view/theme/quattro/config.php:75
-#: view/theme/vier/config.php:121
+#: mod/settings.php:986 view/theme/duepuntozero/config.php:74
+#: view/theme/frio/config.php:121 view/theme/quattro/config.php:76
+#: view/theme/vier/config.php:122
 msgid "Theme settings"
 msgstr ""
 
-#: mod/settings.php:998
+#: mod/settings.php:1000
 msgid "Unable to find your profile. Please contact your admin."
 msgstr ""
 
-#: mod/settings.php:1037
+#: mod/settings.php:1039
 msgid "Account Types"
 msgstr ""
 
-#: mod/settings.php:1038
+#: mod/settings.php:1040
 msgid "Personal Page Subtypes"
 msgstr ""
 
-#: mod/settings.php:1039
+#: mod/settings.php:1041
 msgid "Community Forum Subtypes"
 msgstr ""
 
-#: mod/settings.php:1047
+#: mod/settings.php:1049
 msgid "Account for a personal profile."
 msgstr ""
 
-#: mod/settings.php:1051
+#: mod/settings.php:1053
 msgid ""
 "Account for an organisation that automatically approves contact requests as "
 "\"Followers\"."
 msgstr ""
 
-#: mod/settings.php:1055
+#: mod/settings.php:1057
 msgid ""
 "Account for a news reflector that automatically approves contact requests as "
 "\"Followers\"."
 msgstr ""
 
-#: mod/settings.php:1059
+#: mod/settings.php:1061
 msgid "Account for community discussions."
 msgstr ""
 
-#: mod/settings.php:1063
+#: mod/settings.php:1065
 msgid ""
 "Account for a regular personal profile that requires manual approval of "
 "\"Friends\" and \"Followers\"."
 msgstr ""
 
-#: mod/settings.php:1067
+#: mod/settings.php:1069
 msgid ""
 "Account for a public profile that automatically approves contact requests as "
 "\"Followers\"."
 msgstr ""
 
-#: mod/settings.php:1071
+#: mod/settings.php:1073
 msgid "Automatically approves all contact requests."
 msgstr ""
 
-#: mod/settings.php:1075
+#: mod/settings.php:1077
 msgid ""
 "Account for a popular profile that automatically approves contact requests "
 "as \"Friends\"."
 msgstr ""
 
-#: mod/settings.php:1078
+#: mod/settings.php:1080
 msgid "Private Forum [Experimental]"
 msgstr ""
 
-#: mod/settings.php:1079
+#: mod/settings.php:1081
 msgid "Requires manual approval of contact requests."
 msgstr ""
 
-#: mod/settings.php:1090
+#: mod/settings.php:1092
 msgid "OpenID:"
 msgstr ""
 
-#: mod/settings.php:1090
+#: mod/settings.php:1092
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: mod/settings.php:1098
+#: mod/settings.php:1100
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: mod/settings.php:1098
+#: mod/settings.php:1100
 #, php-format
 msgid ""
 "Your profile will be published in this node's <a href=\"%s\">local "
@@ -6513,490 +6215,527 @@ msgid ""
 "system settings."
 msgstr ""
 
-#: mod/settings.php:1104
+#: mod/settings.php:1106
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: mod/settings.php:1104
+#: mod/settings.php:1106
 #, php-format
 msgid ""
 "Your profile will be published in the global friendica directories (e.g. <a "
 "href=\"%s\">%s</a>). Your profile will be visible in public."
 msgstr ""
 
-#: mod/settings.php:1111
+#: mod/settings.php:1113
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: mod/settings.php:1111
+#: mod/settings.php:1113
 msgid ""
 "Your contact list won't be shown in your default profile page. You can "
 "decide to show your contact list separately for each additional profile you "
 "create"
 msgstr ""
 
-#: mod/settings.php:1115
+#: mod/settings.php:1117
 msgid "Hide your profile details from anonymous viewers?"
 msgstr ""
 
-#: mod/settings.php:1115
+#: mod/settings.php:1117
 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 ""
 
-#: mod/settings.php:1119
+#: mod/settings.php:1121
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: mod/settings.php:1119
+#: mod/settings.php:1121
 msgid ""
 "Your contacts may write posts on your profile wall. These posts will be "
 "distributed to your contacts"
 msgstr ""
 
-#: mod/settings.php:1123
+#: mod/settings.php:1125
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: mod/settings.php:1123
+#: mod/settings.php:1125
 msgid "Your contacts can add additional tags to your posts."
 msgstr ""
 
-#: mod/settings.php:1127
+#: mod/settings.php:1129
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: mod/settings.php:1127
+#: mod/settings.php:1129
 msgid "If you like, Friendica may suggest new members to add you as a contact."
 msgstr ""
 
-#: mod/settings.php:1131
+#: mod/settings.php:1133
 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: mod/settings.php:1131
+#: mod/settings.php:1133
 msgid ""
 "Friendica network users may send you private messages even if they are not "
 "in your contact list."
 msgstr ""
 
-#: mod/settings.php:1135
+#: mod/settings.php:1137
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: mod/settings.php:1141
+#: mod/settings.php:1143
 #, php-format
 msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
 msgstr ""
 
-#: mod/settings.php:1148
+#: mod/settings.php:1150
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: mod/settings.php:1148
+#: mod/settings.php:1150
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: mod/settings.php:1149
+#: mod/settings.php:1151
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: mod/settings.php:1150
+#: mod/settings.php:1152
 msgid "Advanced Expiration"
 msgstr ""
 
-#: mod/settings.php:1151
+#: mod/settings.php:1153
 msgid "Expire posts:"
 msgstr ""
 
-#: mod/settings.php:1152
+#: mod/settings.php:1154
 msgid "Expire personal notes:"
 msgstr ""
 
-#: mod/settings.php:1153
+#: mod/settings.php:1155
 msgid "Expire starred posts:"
 msgstr ""
 
-#: mod/settings.php:1154
+#: mod/settings.php:1156
 msgid "Expire photos:"
 msgstr ""
 
-#: mod/settings.php:1155
+#: mod/settings.php:1157
 msgid "Only expire posts by others:"
 msgstr ""
 
-#: mod/settings.php:1185
+#: mod/settings.php:1187
 msgid "Account Settings"
 msgstr ""
 
-#: mod/settings.php:1193
+#: mod/settings.php:1195
 msgid "Password Settings"
 msgstr ""
 
-#: mod/settings.php:1195
+#: mod/settings.php:1197
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: mod/settings.php:1196
+#: mod/settings.php:1198
 msgid "Current Password:"
 msgstr ""
 
-#: mod/settings.php:1196 mod/settings.php:1197
+#: mod/settings.php:1198 mod/settings.php:1199
 msgid "Your current password to confirm the changes"
 msgstr ""
 
-#: mod/settings.php:1197
+#: mod/settings.php:1199
 msgid "Password:"
 msgstr ""
 
-#: mod/settings.php:1201
+#: mod/settings.php:1203
 msgid "Basic Settings"
 msgstr ""
 
-#: mod/settings.php:1202 src/Model/Profile.php:739
+#: mod/settings.php:1204 src/Model/Profile.php:742
 msgid "Full Name:"
 msgstr ""
 
-#: mod/settings.php:1203
+#: mod/settings.php:1205
 msgid "Email Address:"
 msgstr ""
 
-#: mod/settings.php:1204
+#: mod/settings.php:1206
 msgid "Your Timezone:"
 msgstr ""
 
-#: mod/settings.php:1205
+#: mod/settings.php:1207
 msgid "Your Language:"
 msgstr ""
 
-#: mod/settings.php:1205
+#: mod/settings.php:1207
 msgid ""
 "Set the language we use to show you friendica interface and to send you "
 "emails"
 msgstr ""
 
-#: mod/settings.php:1206
+#: mod/settings.php:1208
 msgid "Default Post Location:"
 msgstr ""
 
-#: mod/settings.php:1207
+#: mod/settings.php:1209
 msgid "Use Browser Location:"
 msgstr ""
 
-#: mod/settings.php:1210
+#: mod/settings.php:1212
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: mod/settings.php:1212
+#: mod/settings.php:1214
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: mod/settings.php:1212 mod/settings.php:1241
+#: mod/settings.php:1214 mod/settings.php:1243
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: mod/settings.php:1213
+#: mod/settings.php:1215
 msgid "Default Post Permissions"
 msgstr ""
 
-#: mod/settings.php:1214
+#: mod/settings.php:1216
 msgid "(click to open/close)"
 msgstr ""
 
-#: mod/settings.php:1224
+#: mod/settings.php:1226
 msgid "Default Private Post"
 msgstr ""
 
-#: mod/settings.php:1225
+#: mod/settings.php:1227
 msgid "Default Public Post"
 msgstr ""
 
-#: mod/settings.php:1229
+#: mod/settings.php:1231
 msgid "Default Permissions for New Posts"
 msgstr ""
 
-#: mod/settings.php:1241
+#: mod/settings.php:1243
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: mod/settings.php:1244
+#: mod/settings.php:1246
 msgid "Notification Settings"
 msgstr ""
 
-#: mod/settings.php:1245
+#: mod/settings.php:1247
 msgid "Send a notification email when:"
 msgstr ""
 
-#: mod/settings.php:1246
+#: mod/settings.php:1248
 msgid "You receive an introduction"
 msgstr ""
 
-#: mod/settings.php:1247
+#: mod/settings.php:1249
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: mod/settings.php:1248
+#: mod/settings.php:1250
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: mod/settings.php:1249
+#: mod/settings.php:1251
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: mod/settings.php:1250
+#: mod/settings.php:1252
 msgid "You receive a private message"
 msgstr ""
 
-#: mod/settings.php:1251
+#: mod/settings.php:1253
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: mod/settings.php:1252
+#: mod/settings.php:1254
 msgid "You are tagged in a post"
 msgstr ""
 
-#: mod/settings.php:1253
+#: mod/settings.php:1255
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: mod/settings.php:1255
+#: mod/settings.php:1257
 msgid "Activate desktop notifications"
 msgstr ""
 
-#: mod/settings.php:1255
+#: mod/settings.php:1257
 msgid "Show desktop popup on new notifications"
 msgstr ""
 
-#: mod/settings.php:1257
+#: mod/settings.php:1259
 msgid "Text-only notification emails"
 msgstr ""
 
-#: mod/settings.php:1259
+#: mod/settings.php:1261
 msgid "Send text only notification emails, without the html part"
 msgstr ""
 
-#: mod/settings.php:1261
+#: mod/settings.php:1263
 msgid "Show detailled notifications"
 msgstr ""
 
-#: mod/settings.php:1263
+#: mod/settings.php:1265
 msgid ""
 "Per default, notifications are condensed to a single notification per item. "
 "When enabled every notification is displayed."
 msgstr ""
 
-#: mod/settings.php:1265
+#: mod/settings.php:1267
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: mod/settings.php:1266
+#: mod/settings.php:1268
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: mod/settings.php:1269
+#: mod/settings.php:1271
 msgid "Relocate"
 msgstr ""
 
-#: mod/settings.php:1270
+#: mod/settings.php:1272
 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 ""
 
-#: mod/settings.php:1271
+#: mod/settings.php:1273
 msgid "Resend relocate message to contacts"
 msgstr ""
 
-#: mod/subthread.php:104
+#: mod/subthread.php:106
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: mod/suggest.php:38
+#: mod/suggest.php:39
 msgid "Do you really want to delete this suggestion?"
 msgstr ""
 
-#: mod/suggest.php:74
+#: mod/suggest.php:75
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
 msgstr ""
 
-#: mod/suggest.php:87 mod/suggest.php:107
+#: mod/suggest.php:88 mod/suggest.php:108
 msgid "Ignore/Hide"
 msgstr ""
 
-#: mod/suggest.php:117 view/theme/vier/theme.php:202 src/Content/Widget.php:64
+#: mod/suggest.php:118 view/theme/vier/theme.php:204 src/Content/Widget.php:68
 msgid "Friend Suggestions"
 msgstr ""
 
-#: mod/tagrm.php:30
+#: mod/tagrm.php:31
 msgid "Tag(s) removed"
 msgstr ""
 
-#: mod/tagrm.php:98
+#: mod/tagrm.php:99
 msgid "Remove Item Tag"
 msgstr ""
 
-#: mod/tagrm.php:100
+#: mod/tagrm.php:101
 msgid "Select a tag to remove: "
 msgstr ""
 
-#: mod/uimport.php:29
+#: mod/uexport.php:45
+msgid "Export account"
+msgstr ""
+
+#: mod/uexport.php:45
+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 ""
+
+#: mod/uexport.php:46
+msgid "Export all"
+msgstr ""
+
+#: mod/uexport.php:46
+msgid ""
+"Export your accout 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 ""
+
+#: mod/uimport.php:30
 msgid "User imports on closed servers can only be done by an administrator."
 msgstr ""
 
-#: mod/uimport.php:55
+#: mod/uimport.php:56
 msgid "Move account"
 msgstr ""
 
-#: mod/uimport.php:56
+#: mod/uimport.php:57
 msgid "You can import an account from another Friendica server."
 msgstr ""
 
-#: mod/uimport.php:57
+#: mod/uimport.php:58
 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 ""
 
-#: mod/uimport.php:58
+#: mod/uimport.php:59
 msgid ""
 "This feature is experimental. We can't import contacts from the OStatus "
 "network (GNU Social/Statusnet) or from Diaspora"
 msgstr ""
 
-#: mod/uimport.php:59
+#: mod/uimport.php:60
 msgid "Account file"
 msgstr ""
 
-#: mod/uimport.php:59
+#: mod/uimport.php:60
 msgid ""
 "To export your account, go to \"Settings->Export your personal data\" and "
 "select \"Export account\""
 msgstr ""
 
-#: mod/unfollow.php:34 mod/unfollow.php:90
+#: mod/unfollow.php:36 mod/unfollow.php:92
 msgid "You aren't following this contact."
 msgstr ""
 
-#: mod/unfollow.php:44 mod/unfollow.php:96
+#: mod/unfollow.php:46 mod/unfollow.php:98
 msgid "Unfollowing is currently not supported by your network."
 msgstr ""
 
-#: mod/unfollow.php:65
+#: mod/unfollow.php:67
 msgid "Contact unfollowed"
 msgstr ""
 
-#: mod/unfollow.php:115 src/Module/Contact.php:574
+#: mod/unfollow.php:117 src/Module/Contact.php:576
 msgid "Disconnect/Unfollow"
 msgstr ""
 
-#: mod/videos.php:133
+#: mod/videos.php:134
 msgid "Do you really want to delete this video?"
 msgstr ""
 
-#: mod/videos.php:138
+#: mod/videos.php:139
 msgid "Delete Video"
 msgstr ""
 
-#: mod/videos.php:200
+#: mod/videos.php:201
 msgid "No videos selected"
 msgstr ""
 
-#: mod/videos.php:386
+#: mod/videos.php:372 src/Model/Item.php:3430
+msgid "View Video"
+msgstr ""
+
+#: mod/videos.php:387
 msgid "Recent Videos"
 msgstr ""
 
-#: mod/videos.php:388
+#: mod/videos.php:389
 msgid "Upload New Videos"
 msgstr ""
 
-#: mod/viewcontacts.php:94
+#: mod/viewcontacts.php:97
 msgid "No contacts."
 msgstr ""
 
-#: mod/viewcontacts.php:110 src/Module/Contact.php:607
-#: src/Module/Contact.php:1019
+#: mod/viewcontacts.php:113 src/Module/Contact.php:609
+#: src/Module/Contact.php:1029
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: mod/wall_attach.php:27 mod/wall_attach.php:34 mod/wall_attach.php:89
-#: mod/wall_upload.php:40 mod/wall_upload.php:56 mod/wall_upload.php:114
-#: mod/wall_upload.php:165 mod/wall_upload.php:168
+#: mod/viewcontacts.php:132 view/theme/frio/theme.php:284
+#: src/Content/Text/HTML.php:978 src/Content/Nav.php:200
+#: src/Content/Nav.php:266 src/Model/Profile.php:971 src/Model/Profile.php:974
+#: src/Module/Contact.php:816 src/Module/Contact.php:886
+msgid "Contacts"
+msgstr ""
+
+#: mod/wall_attach.php:28 mod/wall_attach.php:35 mod/wall_attach.php:90
+#: mod/wall_upload.php:41 mod/wall_upload.php:57 mod/wall_upload.php:115
+#: mod/wall_upload.php:166 mod/wall_upload.php:169
 msgid "Invalid request."
 msgstr ""
 
-#: mod/wall_attach.php:107
+#: mod/wall_attach.php:108
 msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
 msgstr ""
 
-#: mod/wall_attach.php:107
+#: mod/wall_attach.php:108
 msgid "Or - did you try to upload an empty file?"
 msgstr ""
 
-#: mod/wall_attach.php:118
+#: mod/wall_attach.php:119
 #, php-format
 msgid "File exceeds size limit of %s"
 msgstr ""
 
-#: mod/wall_attach.php:142 mod/wall_attach.php:158
+#: mod/wall_attach.php:143 mod/wall_attach.php:159
 msgid "File upload failed."
 msgstr ""
 
-#: mod/wallmessage.php:50 mod/wallmessage.php:113
+#: mod/wall_upload.php:242 src/Object/Image.php:968 src/Object/Image.php:984
+#: src/Object/Image.php:992 src/Object/Image.php:1017
+msgid "Wall Photos"
+msgstr ""
+
+#: mod/wallmessage.php:52 mod/wallmessage.php:115
 #, php-format
 msgid "Number of daily wall messages for %s exceeded. Message failed."
 msgstr ""
 
-#: mod/wallmessage.php:61
+#: mod/wallmessage.php:63
 msgid "Unable to check your home location."
 msgstr ""
 
-#: mod/wallmessage.php:87 mod/wallmessage.php:96
+#: mod/wallmessage.php:89 mod/wallmessage.php:98
 msgid "No recipient."
 msgstr ""
 
-#: mod/wallmessage.php:127
+#: mod/wallmessage.php:129
 #, 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 ""
 
-#: view/theme/duepuntozero/config.php:54 src/Model/User.php:599
+#: view/theme/duepuntozero/config.php:55 src/Model/User.php:600
 msgid "default"
 msgstr ""
 
-#: view/theme/duepuntozero/config.php:55
+#: view/theme/duepuntozero/config.php:56
 msgid "greenzero"
 msgstr ""
 
-#: view/theme/duepuntozero/config.php:56
+#: view/theme/duepuntozero/config.php:57
 msgid "purplezero"
 msgstr ""
 
-#: view/theme/duepuntozero/config.php:57
+#: view/theme/duepuntozero/config.php:58
 msgid "easterbunny"
 msgstr ""
 
-#: view/theme/duepuntozero/config.php:58
+#: view/theme/duepuntozero/config.php:59
 msgid "darkzero"
 msgstr ""
 
-#: view/theme/duepuntozero/config.php:59
+#: view/theme/duepuntozero/config.php:60
 msgid "comix"
 msgstr ""
 
-#: view/theme/duepuntozero/config.php:60
+#: view/theme/duepuntozero/config.php:61
 msgid "slackr"
 msgstr ""
 
-#: view/theme/duepuntozero/config.php:74
+#: view/theme/duepuntozero/config.php:75
 msgid "Variations"
 msgstr ""
 
@@ -7036,317 +6775,396 @@ msgstr ""
 msgid "Repeat image to fill the screen."
 msgstr ""
 
-#: view/theme/frio/config.php:102
+#: view/theme/frio/config.php:103
 msgid "Custom"
 msgstr ""
 
-#: view/theme/frio/config.php:114
+#: view/theme/frio/config.php:115
 msgid "Note"
 msgstr ""
 
-#: view/theme/frio/config.php:114
+#: view/theme/frio/config.php:115
 msgid "Check image permissions if all users are allowed to see the image"
 msgstr ""
 
-#: view/theme/frio/config.php:121
+#: view/theme/frio/config.php:122
 msgid "Select color scheme"
 msgstr ""
 
-#: view/theme/frio/config.php:122
+#: view/theme/frio/config.php:123
 msgid "Navigation bar background color"
 msgstr ""
 
-#: view/theme/frio/config.php:123
+#: view/theme/frio/config.php:124
 msgid "Navigation bar icon color "
 msgstr ""
 
-#: view/theme/frio/config.php:124
+#: view/theme/frio/config.php:125
 msgid "Link color"
 msgstr ""
 
-#: view/theme/frio/config.php:125
+#: view/theme/frio/config.php:126
 msgid "Set the background color"
 msgstr ""
 
-#: view/theme/frio/config.php:126
+#: view/theme/frio/config.php:127
 msgid "Content background opacity"
 msgstr ""
 
-#: view/theme/frio/config.php:127
+#: view/theme/frio/config.php:128
 msgid "Set the background image"
 msgstr ""
 
-#: view/theme/frio/config.php:128
+#: view/theme/frio/config.php:129
 msgid "Background image style"
 msgstr ""
 
-#: view/theme/frio/config.php:133
+#: view/theme/frio/config.php:134
 msgid "Login page background image"
 msgstr ""
 
-#: view/theme/frio/config.php:137
+#: view/theme/frio/config.php:138
 msgid "Login page background color"
 msgstr ""
 
-#: view/theme/frio/config.php:137
+#: view/theme/frio/config.php:138
 msgid "Leave background image and color empty for theme defaults"
 msgstr ""
 
-#: view/theme/frio/theme.php:250
+#: view/theme/frio/theme.php:252
 msgid "Guest"
 msgstr ""
 
-#: view/theme/frio/theme.php:255
+#: view/theme/frio/theme.php:257
 msgid "Visitor"
 msgstr ""
 
-#: view/theme/frio/theme.php:268 src/Content/Nav.php:149
-#: src/Module/Login.php:319
+#: view/theme/frio/theme.php:270 src/Content/Nav.php:150
+#: src/Module/Login.php:321
 msgid "Logout"
 msgstr ""
 
-#: view/theme/frio/theme.php:268 src/Content/Nav.php:149
+#: view/theme/frio/theme.php:270 src/Content/Nav.php:150
 msgid "End this session"
 msgstr ""
 
-#: view/theme/frio/theme.php:271 src/Content/Nav.php:152
-#: src/Model/Profile.php:889 src/Module/Contact.php:657
-#: src/Module/Contact.php:848
+#: view/theme/frio/theme.php:273 src/Content/Nav.php:153
+#: src/Model/Profile.php:892 src/Module/Contact.php:659
+#: src/Module/Contact.php:858
 msgid "Status"
 msgstr ""
 
-#: view/theme/frio/theme.php:271 src/Content/Nav.php:152
-#: src/Content/Nav.php:238
+#: view/theme/frio/theme.php:273 src/Content/Nav.php:153
+#: src/Content/Nav.php:239
 msgid "Your posts and conversations"
 msgstr ""
 
-#: view/theme/frio/theme.php:272 src/Content/Nav.php:153
+#: view/theme/frio/theme.php:274 src/Content/Nav.php:154
 msgid "Your profile page"
 msgstr ""
 
-#: view/theme/frio/theme.php:273 src/Content/Nav.php:154
+#: view/theme/frio/theme.php:275 src/Content/Nav.php:155
 msgid "Your photos"
 msgstr ""
 
-#: view/theme/frio/theme.php:274 src/Content/Nav.php:155
-#: src/Model/Profile.php:913 src/Model/Profile.php:916
+#: view/theme/frio/theme.php:276 src/Content/Nav.php:156
+#: src/Model/Profile.php:916 src/Model/Profile.php:919
 msgid "Videos"
 msgstr ""
 
-#: view/theme/frio/theme.php:274 src/Content/Nav.php:155
+#: view/theme/frio/theme.php:276 src/Content/Nav.php:156
 msgid "Your videos"
 msgstr ""
 
-#: view/theme/frio/theme.php:275 src/Content/Nav.php:156
+#: view/theme/frio/theme.php:277 src/Content/Nav.php:157
 msgid "Your events"
 msgstr ""
 
-#: view/theme/frio/theme.php:278 src/Content/Nav.php:235
+#: view/theme/frio/theme.php:280 src/Content/Nav.php:236
 msgid "Conversations from your friends"
 msgstr ""
 
-#: view/theme/frio/theme.php:279 src/Content/Nav.php:222
-#: src/Model/Profile.php:928 src/Model/Profile.php:939
+#: view/theme/frio/theme.php:281 src/Content/Nav.php:223
+#: src/Model/Profile.php:931 src/Model/Profile.php:942
 msgid "Events and Calendar"
 msgstr ""
 
-#: view/theme/frio/theme.php:280 src/Content/Nav.php:248
+#: view/theme/frio/theme.php:282 src/Content/Nav.php:249
 msgid "Private mail"
 msgstr ""
 
-#: view/theme/frio/theme.php:281 src/Content/Nav.php:259
+#: view/theme/frio/theme.php:283 src/Content/Nav.php:260
 msgid "Account settings"
 msgstr ""
 
-#: view/theme/frio/theme.php:282 src/Content/Nav.php:265
+#: view/theme/frio/theme.php:284 src/Content/Nav.php:266
 msgid "Manage/edit friends and contacts"
 msgstr ""
 
-#: view/theme/quattro/config.php:76
+#: view/theme/quattro/config.php:77
 msgid "Alignment"
 msgstr ""
 
-#: view/theme/quattro/config.php:76
+#: view/theme/quattro/config.php:77
 msgid "Left"
 msgstr ""
 
-#: view/theme/quattro/config.php:76
+#: view/theme/quattro/config.php:77
 msgid "Center"
 msgstr ""
 
-#: view/theme/quattro/config.php:77
+#: view/theme/quattro/config.php:78
 msgid "Color scheme"
 msgstr ""
 
-#: view/theme/quattro/config.php:78
+#: view/theme/quattro/config.php:79
 msgid "Posts font size"
 msgstr ""
 
-#: view/theme/quattro/config.php:79
+#: view/theme/quattro/config.php:80
 msgid "Textareas font size"
 msgstr ""
 
-#: view/theme/vier/config.php:75
+#: view/theme/vier/config.php:76
 msgid "Comma separated list of helper forums"
 msgstr ""
 
-#: view/theme/vier/config.php:115 src/Core/ACL.php:298
+#: view/theme/vier/config.php:116 src/Core/ACL.php:299
 msgid "don't show"
 msgstr ""
 
-#: view/theme/vier/config.php:115 src/Core/ACL.php:297
+#: view/theme/vier/config.php:116 src/Core/ACL.php:298
 msgid "show"
 msgstr ""
 
-#: view/theme/vier/config.php:122
+#: view/theme/vier/config.php:123
 msgid "Set style"
 msgstr ""
 
-#: view/theme/vier/config.php:123
+#: view/theme/vier/config.php:124
 msgid "Community Pages"
 msgstr ""
 
-#: view/theme/vier/config.php:124 view/theme/vier/theme.php:149
+#: view/theme/vier/config.php:125 view/theme/vier/theme.php:151
 msgid "Community Profiles"
 msgstr ""
 
-#: view/theme/vier/config.php:125
+#: view/theme/vier/config.php:126
 msgid "Help or @NewHere ?"
 msgstr ""
 
-#: view/theme/vier/config.php:126 view/theme/vier/theme.php:386
+#: view/theme/vier/config.php:127 view/theme/vier/theme.php:388
 msgid "Connect Services"
 msgstr ""
 
-#: view/theme/vier/config.php:127
+#: view/theme/vier/config.php:128
 msgid "Find Friends"
 msgstr ""
 
-#: view/theme/vier/config.php:128 view/theme/vier/theme.php:179
+#: view/theme/vier/config.php:129 view/theme/vier/theme.php:181
 msgid "Last users"
 msgstr ""
 
-#: view/theme/vier/theme.php:197 src/Content/Widget.php:59
+#: view/theme/vier/theme.php:199 src/Content/Widget.php:63
 msgid "Find People"
 msgstr ""
 
-#: view/theme/vier/theme.php:198 src/Content/Widget.php:60
+#: view/theme/vier/theme.php:200 src/Content/Widget.php:64
 msgid "Enter name or interest"
 msgstr ""
 
-#: view/theme/vier/theme.php:200 src/Content/Widget.php:62
+#: view/theme/vier/theme.php:202 src/Content/Widget.php:66
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: view/theme/vier/theme.php:203 src/Content/Widget.php:65
+#: view/theme/vier/theme.php:205 src/Content/Widget.php:69
 msgid "Similar Interests"
 msgstr ""
 
-#: view/theme/vier/theme.php:204 src/Content/Widget.php:66
+#: view/theme/vier/theme.php:206 src/Content/Widget.php:70
 msgid "Random Profile"
 msgstr ""
 
-#: view/theme/vier/theme.php:205 src/Content/Widget.php:67
+#: view/theme/vier/theme.php:207 src/Content/Widget.php:71
 msgid "Invite Friends"
 msgstr ""
 
-#: view/theme/vier/theme.php:208 src/Content/Widget.php:70
+#: view/theme/vier/theme.php:210 src/Content/Widget.php:74
 msgid "Local Directory"
 msgstr ""
 
-#: view/theme/vier/theme.php:253 src/Content/ForumManager.php:132
+#: view/theme/vier/theme.php:253 src/Content/Text/HTML.php:981
+#: src/Content/ForumManager.php:128 src/Content/Nav.php:204
+msgid "Forums"
+msgstr ""
+
+#: view/theme/vier/theme.php:255 src/Content/ForumManager.php:130
 msgid "External link to forum"
 msgstr ""
 
-#: view/theme/vier/theme.php:289
+#: view/theme/vier/theme.php:291
 msgid "Quick Start"
 msgstr ""
 
-#: src/Core/Console/ArchiveContact.php:65
+#: src/Core/Console/NewPassword.php:73
+msgid "Enter new password: "
+msgstr ""
+
+#: src/Core/Console/NewPassword.php:78 src/Model/User.php:314
+msgid "Password can't be empty"
+msgstr ""
+
+#: src/Core/Console/ArchiveContact.php:66
 #, php-format
 msgid "Could not find any unarchived contact entry for this URL (%s)"
 msgstr ""
 
-#: src/Core/Console/ArchiveContact.php:70
+#: src/Core/Console/ArchiveContact.php:71
 msgid "The contact entries have been archived"
 msgstr ""
 
-#: src/Core/Console/NewPassword.php:73
-msgid "Enter new password: "
+#: src/Core/Console/PostUpdate.php:50
+#, php-format
+msgid "Post update version number has been set to %s."
 msgstr ""
 
-#: src/Core/Console/NewPassword.php:78 src/Model/User.php:313
-msgid "Password can't be empty"
+#: src/Core/Console/PostUpdate.php:58
+msgid "Check for pending update actions."
 msgstr ""
 
-#: src/Core/Console/PostUpdate.php:49
-#, php-format
-msgid "Post update version number has been set to %s."
+#: src/Core/Console/PostUpdate.php:60
+msgid "Done."
 msgstr ""
 
-#: src/Core/Console/PostUpdate.php:57
+#: src/Core/Console/PostUpdate.php:62
 msgid "Execute pending post updates."
 msgstr ""
 
-#: src/Core/Console/PostUpdate.php:63
+#: src/Core/Console/PostUpdate.php:68
 msgid "All pending post updates are done."
 msgstr ""
 
-#: src/Core/ACL.php:284
-msgid "Post to Email"
+#: src/Core/NotificationsManager.php:173
+msgid "System"
 msgstr ""
 
-#: src/Core/ACL.php:290
-msgid "Hide your profile details from unknown viewers?"
+#: src/Core/NotificationsManager.php:194 src/Content/Nav.php:177
+#: src/Content/Nav.php:239
+msgid "Home"
 msgstr ""
 
-#: src/Core/ACL.php:289
-#, php-format
-msgid "Connectors disabled, since \"%s\" is enabled."
+#: src/Core/NotificationsManager.php:201 src/Content/Nav.php:243
+msgid "Introductions"
 msgstr ""
 
-#: src/Core/ACL.php:296
-msgid "Visible to everybody"
+#: src/Core/NotificationsManager.php:263 src/Core/NotificationsManager.php:275
+#, php-format
+msgid "%s commented on %s's post"
 msgstr ""
 
-#: src/Core/ACL.php:308
-msgid "Close"
+#: src/Core/NotificationsManager.php:274
+#, php-format
+msgid "%s created a new post"
 msgstr ""
 
-#: src/Core/Authentication.php:88
-msgid "Welcome "
+#: src/Core/NotificationsManager.php:288
+#, php-format
+msgid "%s liked %s's post"
 msgstr ""
 
-#: src/Core/Authentication.php:89
-msgid "Please upload a profile photo."
+#: src/Core/NotificationsManager.php:301
+#, php-format
+msgid "%s disliked %s's post"
 msgstr ""
 
-#: src/Core/Authentication.php:91
-msgid "Welcome back "
+#: src/Core/NotificationsManager.php:314
+#, php-format
+msgid "%s is attending %s's event"
 msgstr ""
 
-#: src/Core/Installer.php:158
-msgid ""
-"The database configuration file \"config/local.ini.php\" could not be "
-"written. Please use the enclosed text to create a configuration file in your "
-"web server root."
+#: src/Core/NotificationsManager.php:327
+#, php-format
+msgid "%s is not attending %s's event"
 msgstr ""
 
-#: src/Core/Installer.php:174
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
+#: src/Core/NotificationsManager.php:340
+#, php-format
+msgid "%s may attend %s's event"
 msgstr ""
 
-#: src/Core/Installer.php:175 src/Module/Install.php:262
-msgid "Please see the file \"INSTALL.txt\"."
+#: src/Core/NotificationsManager.php:373
+#, php-format
+msgid "%s is now friends with %s"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:639
+msgid "Friend Suggestion"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:673
+msgid "Friend/Connect Request"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:673
+msgid "New Follower"
+msgstr ""
+
+#: src/Core/ACL.php:285
+msgid "Post to Email"
+msgstr ""
+
+#: src/Core/ACL.php:291
+msgid "Hide your profile details from unknown viewers?"
+msgstr ""
+
+#: src/Core/ACL.php:290
+#, php-format
+msgid "Connectors disabled, since \"%s\" is enabled."
+msgstr ""
+
+#: src/Core/ACL.php:297
+msgid "Visible to everybody"
+msgstr ""
+
+#: src/Core/ACL.php:309
+msgid "Close"
+msgstr ""
+
+#: src/Core/Authentication.php:89
+msgid "Welcome "
+msgstr ""
+
+#: src/Core/Authentication.php:90
+msgid "Please upload a profile photo."
+msgstr ""
+
+#: src/Core/Authentication.php:92
+msgid "Welcome back "
+msgstr ""
+
+#: src/Core/Installer.php:160
+msgid ""
+"The database configuration file \"config/local.ini.php\" could not be "
+"written. Please use the enclosed text to create a configuration file in your "
+"web server root."
+msgstr ""
+
+#: src/Core/Installer.php:176
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
 msgstr ""
 
-#: src/Core/Installer.php:237
+#: src/Core/Installer.php:177 src/Module/Install.php:134
+#: src/Module/Install.php:264
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr ""
+
+#: src/Core/Installer.php:239
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: src/Core/Installer.php:238
+#: src/Core/Installer.php:240
 msgid ""
 "If you don't have a command line version of PHP installed on your server, "
 "you will not be able to run the background processing. See <a href='https://"
@@ -7354,1170 +7172,1267 @@ msgid ""
 "worker'>'Setup the worker'</a>"
 msgstr ""
 
-#: src/Core/Installer.php:242
+#: src/Core/Installer.php:244
 msgid "PHP executable path"
 msgstr ""
 
-#: src/Core/Installer.php:242
+#: src/Core/Installer.php:244
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr ""
 
-#: src/Core/Installer.php:247
+#: src/Core/Installer.php:249
 msgid "Command line PHP"
 msgstr ""
 
-#: src/Core/Installer.php:256
+#: src/Core/Installer.php:258
 msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
 msgstr ""
 
-#: src/Core/Installer.php:257
+#: src/Core/Installer.php:259
 msgid "Found PHP version: "
 msgstr ""
 
-#: src/Core/Installer.php:259
+#: src/Core/Installer.php:261
 msgid "PHP cli binary"
 msgstr ""
 
-#: src/Core/Installer.php:272
+#: src/Core/Installer.php:274
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr ""
 
-#: src/Core/Installer.php:273
+#: src/Core/Installer.php:275
 msgid "This is required for message delivery to work."
 msgstr ""
 
-#: src/Core/Installer.php:278
+#: src/Core/Installer.php:280
 msgid "PHP register_argc_argv"
 msgstr ""
 
-#: src/Core/Installer.php:310
+#: src/Core/Installer.php:312
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr ""
 
-#: src/Core/Installer.php:311
+#: src/Core/Installer.php:313
 msgid ""
 "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
 "installation.php\"."
 msgstr ""
 
-#: src/Core/Installer.php:314
+#: src/Core/Installer.php:316
 msgid "Generate encryption keys"
 msgstr ""
 
-#: src/Core/Installer.php:365
+#: src/Core/Installer.php:367
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: src/Core/Installer.php:370
+#: src/Core/Installer.php:372
 msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: src/Core/Installer.php:376
+#: src/Core/Installer.php:378
 msgid "Error: PDO or MySQLi PHP module required but not installed."
 msgstr ""
 
-#: src/Core/Installer.php:381
+#: src/Core/Installer.php:383
 msgid "Error: The MySQL driver for PDO is not installed."
 msgstr ""
 
-#: src/Core/Installer.php:385
+#: src/Core/Installer.php:387
 msgid "PDO or MySQLi PHP module"
 msgstr ""
 
-#: src/Core/Installer.php:393
+#: src/Core/Installer.php:395
 msgid "Error, XML PHP module required but not installed."
 msgstr ""
 
-#: src/Core/Installer.php:397
+#: src/Core/Installer.php:399
 msgid "XML PHP module"
 msgstr ""
 
-#: src/Core/Installer.php:400 tests/src/Core/InstallerTest.php:94
+#: src/Core/Installer.php:402
 msgid "libCurl PHP module"
 msgstr ""
 
-#: src/Core/Installer.php:401 tests/src/Core/InstallerTest.php:95
+#: src/Core/Installer.php:403
 msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: src/Core/Installer.php:407 tests/src/Core/InstallerTest.php:104
+#: src/Core/Installer.php:409
 msgid "GD graphics PHP module"
 msgstr ""
 
-#: src/Core/Installer.php:408 tests/src/Core/InstallerTest.php:105
+#: src/Core/Installer.php:410
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: src/Core/Installer.php:414 tests/src/Core/InstallerTest.php:114
+#: src/Core/Installer.php:416
 msgid "OpenSSL PHP module"
 msgstr ""
 
-#: src/Core/Installer.php:415 tests/src/Core/InstallerTest.php:115
+#: src/Core/Installer.php:417
 msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: src/Core/Installer.php:421 tests/src/Core/InstallerTest.php:124
+#: src/Core/Installer.php:423
 msgid "mb_string PHP module"
 msgstr ""
 
-#: src/Core/Installer.php:422 tests/src/Core/InstallerTest.php:125
+#: src/Core/Installer.php:424
 msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: src/Core/Installer.php:428 tests/src/Core/InstallerTest.php:134
+#: src/Core/Installer.php:430
 msgid "iconv PHP module"
 msgstr ""
 
-#: src/Core/Installer.php:429 tests/src/Core/InstallerTest.php:135
+#: src/Core/Installer.php:431
 msgid "Error: iconv PHP module required but not installed."
 msgstr ""
 
-#: src/Core/Installer.php:435 tests/src/Core/InstallerTest.php:144
+#: src/Core/Installer.php:437
 msgid "POSIX PHP module"
 msgstr ""
 
-#: src/Core/Installer.php:436 tests/src/Core/InstallerTest.php:145
+#: src/Core/Installer.php:438
 msgid "Error: POSIX PHP module required but not installed."
 msgstr ""
 
-#: src/Core/Installer.php:459
+#: src/Core/Installer.php:461
 msgid ""
 "The web installer needs to be able to create a file called \"local.ini.php\" "
 "in the \"config\" folder of your web server and it is unable to do so."
 msgstr ""
 
-#: src/Core/Installer.php:460
+#: src/Core/Installer.php:462
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr ""
 
-#: src/Core/Installer.php:461
+#: src/Core/Installer.php:463
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named local.ini.php in your Friendica \"config\" folder."
 msgstr ""
 
-#: src/Core/Installer.php:462
+#: src/Core/Installer.php:464
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation. "
 "Please see the file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: src/Core/Installer.php:465
+#: src/Core/Installer.php:467
 msgid "config/local.ini.php is writable"
 msgstr ""
 
-#: src/Core/Installer.php:485
+#: src/Core/Installer.php:487
 msgid ""
 "Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
 "compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: src/Core/Installer.php:486
+#: src/Core/Installer.php:488
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory view/smarty3/ under the Friendica top level "
 "folder."
 msgstr ""
 
-#: src/Core/Installer.php:487
+#: src/Core/Installer.php:489
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has "
 "write access to this folder."
 msgstr ""
 
-#: src/Core/Installer.php:488
+#: src/Core/Installer.php:490
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "view/smarty3/ only--not the template files (.tpl) that it contains."
 msgstr ""
 
-#: src/Core/Installer.php:491
+#: src/Core/Installer.php:493
 msgid "view/smarty3 is writable"
 msgstr ""
 
-#: src/Core/Installer.php:519
+#: src/Core/Installer.php:521
 msgid ""
 "Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist "
 "to .htaccess."
 msgstr ""
 
-#: src/Core/Installer.php:521
+#: src/Core/Installer.php:523
 msgid "Error message from Curl when fetching"
 msgstr ""
 
-#: src/Core/Installer.php:526
+#: src/Core/Installer.php:528
 msgid "Url rewrite is working"
 msgstr ""
 
-#: src/Core/Installer.php:555 tests/src/Core/InstallerTest.php:317
+#: src/Core/Installer.php:557
 msgid "ImageMagick PHP extension is not installed"
 msgstr ""
 
-#: src/Core/Installer.php:557
+#: src/Core/Installer.php:559
 msgid "ImageMagick PHP extension is installed"
 msgstr ""
 
-#: src/Core/Installer.php:559 tests/src/Core/InstallerTest.php:277
-#: tests/src/Core/InstallerTest.php:301
+#: src/Core/Installer.php:561 tests/src/Core/InstallerTest.php:308
+#: tests/src/Core/InstallerTest.php:332
 msgid "ImageMagick supports GIF"
 msgstr ""
 
-#: src/Core/Installer.php:581
+#: src/Core/Installer.php:583
 msgid "Could not connect to database."
 msgstr ""
 
-#: src/Core/Installer.php:588
+#: src/Core/Installer.php:590
 msgid "Database already in use."
 msgstr ""
 
-#: src/Core/NotificationsManager.php:173
-msgid "System"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:194 src/Content/Nav.php:176
-#: src/Content/Nav.php:238
-msgid "Home"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:201 src/Content/Nav.php:242
-msgid "Introductions"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:263 src/Core/NotificationsManager.php:275
-#, php-format
-msgid "%s commented on %s's post"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:274
-#, php-format
-msgid "%s created a new post"
+#: src/Core/L10n.php:359 src/Model/Event.php:393
+msgid "Tuesday"
 msgstr ""
 
-#: src/Core/NotificationsManager.php:288
-#, php-format
-msgid "%s liked %s's post"
+#: src/Core/L10n.php:359 src/Model/Event.php:394
+msgid "Wednesday"
 msgstr ""
 
-#: src/Core/NotificationsManager.php:301
-#, php-format
-msgid "%s disliked %s's post"
+#: src/Core/L10n.php:359 src/Model/Event.php:395
+msgid "Thursday"
 msgstr ""
 
-#: src/Core/NotificationsManager.php:314
-#, php-format
-msgid "%s is attending %s's event"
+#: src/Core/L10n.php:359 src/Model/Event.php:396
+msgid "Friday"
 msgstr ""
 
-#: src/Core/NotificationsManager.php:327
-#, php-format
-msgid "%s is not attending %s's event"
+#: src/Core/L10n.php:359 src/Model/Event.php:397
+msgid "Saturday"
 msgstr ""
 
-#: src/Core/NotificationsManager.php:340
-#, php-format
-msgid "%s may attend %s's event"
+#: src/Core/L10n.php:363 src/Model/Event.php:412
+msgid "January"
 msgstr ""
 
-#: src/Core/NotificationsManager.php:373
-#, php-format
-msgid "%s is now friends with %s"
+#: src/Core/L10n.php:363 src/Model/Event.php:413
+msgid "February"
 msgstr ""
 
-#: src/Core/NotificationsManager.php:639
-msgid "Friend Suggestion"
+#: src/Core/L10n.php:363 src/Model/Event.php:414
+msgid "March"
 msgstr ""
 
-#: src/Core/NotificationsManager.php:673
-msgid "Friend/Connect Request"
+#: src/Core/L10n.php:363 src/Model/Event.php:415
+msgid "April"
 msgstr ""
 
-#: src/Core/NotificationsManager.php:673
-msgid "New Follower"
+#: src/Core/L10n.php:363 src/Core/L10n.php:382 src/Model/Event.php:403
+#: src/Model/Event.php:416
+msgid "May"
 msgstr ""
 
-#: src/Core/UserImport.php:101
-msgid "Error decoding account file"
+#: src/Core/L10n.php:363 src/Model/Event.php:417
+msgid "June"
 msgstr ""
 
-#: src/Core/UserImport.php:107
-msgid "Error! No version data in file! This is not a Friendica account file?"
+#: src/Core/L10n.php:363 src/Model/Event.php:418
+msgid "July"
 msgstr ""
 
-#: src/Core/UserImport.php:115
-#, php-format
-msgid "User '%s' already exists on this server!"
+#: src/Core/L10n.php:363 src/Model/Event.php:419
+msgid "August"
 msgstr ""
 
-#: src/Core/UserImport.php:148
-msgid "User creation error"
+#: src/Core/L10n.php:363 src/Model/Event.php:420
+msgid "September"
 msgstr ""
 
-#: src/Core/UserImport.php:166
-msgid "User profile creation error"
+#: src/Core/L10n.php:363 src/Model/Event.php:421
+msgid "October"
 msgstr ""
 
-#: src/Core/UserImport.php:210
-#, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Core/UserImport.php:275
-msgid "Done. You can now login with your username and password"
+#: src/Core/L10n.php:363 src/Model/Event.php:422
+msgid "November"
 msgstr ""
 
-#: src/Util/Temporal.php:148 src/Model/Profile.php:759
-msgid "Birthday:"
+#: src/Core/L10n.php:363 src/Model/Event.php:423
+msgid "December"
 msgstr ""
 
-#: src/Util/Temporal.php:152
-msgid "YYYY-MM-DD or MM-DD"
+#: src/Core/L10n.php:378 src/Model/Event.php:384
+msgid "Mon"
 msgstr ""
 
-#: src/Util/Temporal.php:295
-msgid "never"
+#: src/Core/L10n.php:378 src/Model/Event.php:385
+msgid "Tue"
 msgstr ""
 
-#: src/Util/Temporal.php:302
-msgid "less than a second ago"
+#: src/Core/L10n.php:378 src/Model/Event.php:386
+msgid "Wed"
 msgstr ""
 
-#: src/Util/Temporal.php:310
-msgid "year"
+#: src/Core/L10n.php:378 src/Model/Event.php:387
+msgid "Thu"
 msgstr ""
 
-#: src/Util/Temporal.php:310
-msgid "years"
+#: src/Core/L10n.php:378 src/Model/Event.php:388
+msgid "Fri"
 msgstr ""
 
-#: src/Util/Temporal.php:311
-msgid "months"
+#: src/Core/L10n.php:378 src/Model/Event.php:389
+msgid "Sat"
 msgstr ""
 
-#: src/Util/Temporal.php:312
-msgid "weeks"
+#: src/Core/L10n.php:378 src/Model/Event.php:383
+msgid "Sun"
 msgstr ""
 
-#: src/Util/Temporal.php:313
-msgid "days"
+#: src/Core/L10n.php:382 src/Model/Event.php:399
+msgid "Jan"
 msgstr ""
 
-#: src/Util/Temporal.php:314
-msgid "hour"
+#: src/Core/L10n.php:382 src/Model/Event.php:400
+msgid "Feb"
 msgstr ""
 
-#: src/Util/Temporal.php:314
-msgid "hours"
+#: src/Core/L10n.php:382 src/Model/Event.php:401
+msgid "Mar"
 msgstr ""
 
-#: src/Util/Temporal.php:315
-msgid "minute"
+#: src/Core/L10n.php:382 src/Model/Event.php:402
+msgid "Apr"
 msgstr ""
 
-#: src/Util/Temporal.php:315
-msgid "minutes"
+#: src/Core/L10n.php:382 src/Model/Event.php:405
+msgid "Jul"
 msgstr ""
 
-#: src/Util/Temporal.php:316
-msgid "second"
+#: src/Core/L10n.php:382 src/Model/Event.php:406
+msgid "Aug"
 msgstr ""
 
-#: src/Util/Temporal.php:316
-msgid "seconds"
+#: src/Core/L10n.php:382
+msgid "Sep"
 msgstr ""
 
-#: src/Util/Temporal.php:326
-#, php-format
-msgid "in %1$d %2$s"
+#: src/Core/L10n.php:382 src/Model/Event.php:408
+msgid "Oct"
 msgstr ""
 
-#: src/Util/Temporal.php:329
-#, php-format
-msgid "%1$d %2$s ago"
+#: src/Core/L10n.php:382 src/Model/Event.php:409
+msgid "Nov"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:423
-msgid "view full size"
+#: src/Core/L10n.php:382 src/Model/Event.php:410
+msgid "Dec"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:855 src/Content/Text/BBCode.php:1574
-#: src/Content/Text/BBCode.php:1575
-msgid "Image/photo"
+#: src/Core/L10n.php:400
+msgid "poke"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:958
-#, php-format
-msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
+#: src/Core/L10n.php:400
+msgid "poked"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1501 src/Content/Text/BBCode.php:1523
-msgid "$1 wrote:"
+#: src/Core/L10n.php:401
+msgid "ping"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1585 src/Content/Text/BBCode.php:1586
-msgid "Encrypted content"
+#: src/Core/L10n.php:401
+msgid "pinged"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1693
-msgid "Invalid source protocol"
+#: src/Core/L10n.php:402
+msgid "prod"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1704
-msgid "Invalid link protocol"
+#: src/Core/L10n.php:402
+msgid "prodded"
 msgstr ""
 
-#: src/Content/Widget/CalendarExport.php:65
-msgid "Export"
+#: src/Core/L10n.php:403
+msgid "slap"
 msgstr ""
 
-#: src/Content/Widget/CalendarExport.php:66
-msgid "Export calendar as ical"
+#: src/Core/L10n.php:403
+msgid "slapped"
 msgstr ""
 
-#: src/Content/Widget/CalendarExport.php:67
-msgid "Export calendar as csv"
+#: src/Core/L10n.php:404
+msgid "finger"
 msgstr ""
 
-#: src/Content/Feature.php:79
-msgid "General Features"
+#: src/Core/L10n.php:404
+msgid "fingered"
 msgstr ""
 
-#: src/Content/Feature.php:81
-msgid "Multiple Profiles"
+#: src/Core/L10n.php:405
+msgid "rebuff"
 msgstr ""
 
-#: src/Content/Feature.php:81
-msgid "Ability to create multiple profiles"
+#: src/Core/L10n.php:405
+msgid "rebuffed"
 msgstr ""
 
-#: src/Content/Feature.php:82
-msgid "Photo Location"
+#: src/Core/Update.php:157
+#, php-format
+msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: src/Content/Feature.php:82
+#: src/Core/Update.php:213
+#, php-format
 msgid ""
-"Photo metadata is normally stripped. This extracts the location (if present) "
-"prior to stripping metadata and links it to a map."
+"\n"
+"\t\t\t\tThe friendica developers released update %s recently,\n"
+"\t\t\t\tbut when I tried to install it, something went terribly wrong.\n"
+"\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact "
+"a\n"
+"\t\t\t\tfriendica developer if you can not help me on your own. My database "
+"might be invalid."
 msgstr ""
 
-#: src/Content/Feature.php:83
-msgid "Export Public Calendar"
+#: src/Core/Update.php:219
+#, php-format
+msgid ""
+"The error message is\n"
+"[pre]%s[/pre]"
 msgstr ""
 
-#: src/Content/Feature.php:83
-msgid "Ability for visitors to download the public calendar"
+#: src/Core/Update.php:248
+#, php-format
+msgid ""
+"\n"
+"\t\t\t\t\tThe friendica database was successfully updated from %s to %s."
 msgstr ""
 
-#: src/Content/Feature.php:88
-msgid "Post Composition Features"
+#: src/Core/UserImport.php:103
+msgid "Error decoding account file"
 msgstr ""
 
-#: src/Content/Feature.php:89
-msgid "Post Preview"
+#: src/Core/UserImport.php:109
+msgid "Error! No version data in file! This is not a Friendica account file?"
 msgstr ""
 
-#: src/Content/Feature.php:89
-msgid "Allow previewing posts and comments before publishing them"
+#: src/Core/UserImport.php:117
+#, php-format
+msgid "User '%s' already exists on this server!"
 msgstr ""
 
-#: src/Content/Feature.php:90
-msgid "Auto-mention Forums"
+#: src/Core/UserImport.php:153
+msgid "User creation error"
 msgstr ""
 
-#: src/Content/Feature.php:90
-msgid ""
-"Add/remove mention when a forum page is selected/deselected in ACL window."
+#: src/Core/UserImport.php:171
+msgid "User profile creation error"
 msgstr ""
 
-#: src/Content/Feature.php:95
-msgid "Network Sidebar"
-msgstr ""
+#: src/Core/UserImport.php:215
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Content/Feature.php:96
-msgid "Ability to select posts by date ranges"
+#: src/Core/UserImport.php:280
+msgid "Done. You can now login with your username and password"
 msgstr ""
 
-#: src/Content/Feature.php:97 src/Content/Feature.php:127
-msgid "List Forums"
+#: src/Util/Temporal.php:149 src/Model/Profile.php:762
+msgid "Birthday:"
 msgstr ""
 
-#: src/Content/Feature.php:97
-msgid "Enable widget to display the forums your are connected with"
+#: src/Util/Temporal.php:153
+msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: src/Content/Feature.php:98
-msgid "Group Filter"
+#: src/Util/Temporal.php:296
+msgid "never"
 msgstr ""
 
-#: src/Content/Feature.php:98
-msgid "Enable widget to display Network posts only from selected group"
+#: src/Util/Temporal.php:303
+msgid "less than a second ago"
 msgstr ""
 
-#: src/Content/Feature.php:99
-msgid "Network Filter"
+#: src/Util/Temporal.php:311
+msgid "year"
 msgstr ""
 
-#: src/Content/Feature.php:99
-msgid "Enable widget to display Network posts only from selected network"
+#: src/Util/Temporal.php:311
+msgid "years"
 msgstr ""
 
-#: src/Content/Feature.php:100
-msgid "Save search terms for re-use"
+#: src/Util/Temporal.php:312
+msgid "months"
 msgstr ""
 
-#: src/Content/Feature.php:105
-msgid "Network Tabs"
+#: src/Util/Temporal.php:313
+msgid "weeks"
 msgstr ""
 
-#: src/Content/Feature.php:106
-msgid "Network Personal Tab"
+#: src/Util/Temporal.php:314
+msgid "days"
 msgstr ""
 
-#: src/Content/Feature.php:106
-msgid "Enable tab to display only Network posts that you've interacted on"
+#: src/Util/Temporal.php:315
+msgid "hour"
 msgstr ""
 
-#: src/Content/Feature.php:107
-msgid "Network New Tab"
+#: src/Util/Temporal.php:315
+msgid "hours"
 msgstr ""
 
-#: src/Content/Feature.php:107
-msgid "Enable tab to display only new Network posts (from the last 12 hours)"
+#: src/Util/Temporal.php:316
+msgid "minute"
 msgstr ""
 
-#: src/Content/Feature.php:108
-msgid "Network Shared Links Tab"
+#: src/Util/Temporal.php:316
+msgid "minutes"
 msgstr ""
 
-#: src/Content/Feature.php:108
-msgid "Enable tab to display only Network posts with links in them"
+#: src/Util/Temporal.php:317
+msgid "second"
 msgstr ""
 
-#: src/Content/Feature.php:113
-msgid "Post/Comment Tools"
+#: src/Util/Temporal.php:317
+msgid "seconds"
 msgstr ""
 
-#: src/Content/Feature.php:114
-msgid "Multiple Deletion"
+#: src/Util/Temporal.php:327
+#, php-format
+msgid "in %1$d %2$s"
 msgstr ""
 
-#: src/Content/Feature.php:114
-msgid "Select and delete multiple posts/comments at once"
+#: src/Util/Temporal.php:330
+#, php-format
+msgid "%1$d %2$s ago"
 msgstr ""
 
-#: src/Content/Feature.php:115
-msgid "Edit Sent Posts"
+#: src/Content/Text/BBCode.php:425
+msgid "view full size"
 msgstr ""
 
-#: src/Content/Feature.php:115
-msgid "Edit and correct posts and comments after sending"
+#: src/Content/Text/BBCode.php:857 src/Content/Text/BBCode.php:1576
+#: src/Content/Text/BBCode.php:1577
+msgid "Image/photo"
 msgstr ""
 
-#: src/Content/Feature.php:116
-msgid "Tagging"
+#: src/Content/Text/BBCode.php:960
+#, php-format
+msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
 msgstr ""
 
-#: src/Content/Feature.php:116
-msgid "Ability to tag existing posts"
+#: src/Content/Text/BBCode.php:1503 src/Content/Text/BBCode.php:1525
+msgid "$1 wrote:"
 msgstr ""
 
-#: src/Content/Feature.php:117
-msgid "Post Categories"
+#: src/Content/Text/BBCode.php:1587 src/Content/Text/BBCode.php:1588
+msgid "Encrypted content"
 msgstr ""
 
-#: src/Content/Feature.php:117
-msgid "Add categories to your posts"
+#: src/Content/Text/BBCode.php:1695
+msgid "Invalid source protocol"
 msgstr ""
 
-#: src/Content/Feature.php:118 src/Content/Widget.php:195
-msgid "Saved Folders"
+#: src/Content/Text/BBCode.php:1706
+msgid "Invalid link protocol"
 msgstr ""
 
-#: src/Content/Feature.php:118
-msgid "Ability to file posts under folders"
+#: src/Content/Text/HTML.php:797
+msgid "Loading more entries..."
 msgstr ""
 
-#: src/Content/Feature.php:119
-msgid "Dislike Posts"
+#: src/Content/Text/HTML.php:798
+msgid "The end"
 msgstr ""
 
-#: src/Content/Feature.php:119
-msgid "Ability to dislike posts/comments"
+#: src/Content/Text/HTML.php:838
+msgid "No contacts"
 msgstr ""
 
-#: src/Content/Feature.php:120
-msgid "Star Posts"
-msgstr ""
+#: src/Content/Text/HTML.php:865
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Content/Feature.php:120
-msgid "Ability to mark special posts with a star indicator"
+#: src/Content/Text/HTML.php:878
+msgid "View Contacts"
 msgstr ""
 
-#: src/Content/Feature.php:121
-msgid "Mute Post Notifications"
+#: src/Content/Text/HTML.php:961
+msgid "Follow"
 msgstr ""
 
-#: src/Content/Feature.php:121
-msgid "Ability to mute notifications for a thread"
+#: src/Content/Text/HTML.php:970 src/Content/Nav.php:77
+msgid "@name, !forum, #tags, content"
 msgstr ""
 
-#: src/Content/Feature.php:126
-msgid "Advanced Profile Settings"
+#: src/Content/Text/HTML.php:976 src/Content/Nav.php:198
+msgid "Full Text"
 msgstr ""
 
-#: src/Content/Feature.php:127
-msgid "Show visitors public community forums at the Advanced Profile Page"
+#: src/Content/Text/HTML.php:977 src/Content/Widget/TagCloud.php:55
+#: src/Content/Nav.php:199
+msgid "Tags"
 msgstr ""
 
-#: src/Content/Feature.php:128
-msgid "Tag Cloud"
+#: src/Content/Text/HTML.php:1016 src/Model/Item.php:3480
+#: src/Model/Item.php:3491
+msgid "Click to open/close"
 msgstr ""
 
-#: src/Content/Feature.php:128
-msgid "Provide a personal tag cloud on your profile page"
+#: src/Content/Widget/CalendarExport.php:66
+msgid "Export"
 msgstr ""
 
-#: src/Content/Feature.php:129
-msgid "Display Membership Date"
+#: src/Content/Widget/CalendarExport.php:67
+msgid "Export calendar as ical"
 msgstr ""
 
-#: src/Content/Feature.php:129
-msgid "Display membership date in profile"
+#: src/Content/Widget/CalendarExport.php:68
+msgid "Export calendar as csv"
 msgstr ""
 
-#: src/Content/ContactSelector.php:56
+#: src/Content/ContactSelector.php:57
 msgid "Frequently"
 msgstr ""
 
-#: src/Content/ContactSelector.php:57
+#: src/Content/ContactSelector.php:58
 msgid "Hourly"
 msgstr ""
 
-#: src/Content/ContactSelector.php:58
+#: src/Content/ContactSelector.php:59
 msgid "Twice daily"
 msgstr ""
 
-#: src/Content/ContactSelector.php:59
+#: src/Content/ContactSelector.php:60
 msgid "Daily"
 msgstr ""
 
-#: src/Content/ContactSelector.php:60
+#: src/Content/ContactSelector.php:61
 msgid "Weekly"
 msgstr ""
 
-#: src/Content/ContactSelector.php:61
+#: src/Content/ContactSelector.php:62
 msgid "Monthly"
 msgstr ""
 
 #: src/Content/ContactSelector.php:81
-msgid "OStatus"
+msgid "DFRN"
 msgstr ""
 
 #: src/Content/ContactSelector.php:82
+msgid "OStatus"
+msgstr ""
+
+#: src/Content/ContactSelector.php:83
 msgid "RSS/Atom"
 msgstr ""
 
-#: src/Content/ContactSelector.php:85
+#: src/Content/ContactSelector.php:86
 msgid "Zot!"
 msgstr ""
 
-#: src/Content/ContactSelector.php:86
+#: src/Content/ContactSelector.php:87
 msgid "LinkedIn"
 msgstr ""
 
-#: src/Content/ContactSelector.php:87
+#: src/Content/ContactSelector.php:88
 msgid "XMPP/IM"
 msgstr ""
 
-#: src/Content/ContactSelector.php:88
+#: src/Content/ContactSelector.php:89
 msgid "MySpace"
 msgstr ""
 
-#: src/Content/ContactSelector.php:89
+#: src/Content/ContactSelector.php:90
 msgid "Google+"
 msgstr ""
 
-#: src/Content/ContactSelector.php:90
+#: src/Content/ContactSelector.php:91
 msgid "pump.io"
 msgstr ""
 
-#: src/Content/ContactSelector.php:91
+#: src/Content/ContactSelector.php:92
 msgid "Twitter"
 msgstr ""
 
-#: src/Content/ContactSelector.php:92
+#: src/Content/ContactSelector.php:93
 msgid "Diaspora Connector"
 msgstr ""
 
-#: src/Content/ContactSelector.php:93
+#: src/Content/ContactSelector.php:94
 msgid "GNU Social Connector"
 msgstr ""
 
-#: src/Content/ContactSelector.php:94
+#: src/Content/ContactSelector.php:95
 msgid "ActivityPub"
 msgstr ""
 
-#: src/Content/ContactSelector.php:95
+#: src/Content/ContactSelector.php:96
 msgid "pnut"
 msgstr ""
 
-#: src/Content/ContactSelector.php:147
+#: src/Content/ContactSelector.php:148
 msgid "Male"
 msgstr ""
 
-#: src/Content/ContactSelector.php:147
+#: src/Content/ContactSelector.php:148
 msgid "Female"
 msgstr ""
 
-#: src/Content/ContactSelector.php:147
+#: src/Content/ContactSelector.php:148
 msgid "Currently Male"
 msgstr ""
 
-#: src/Content/ContactSelector.php:147
+#: src/Content/ContactSelector.php:148
 msgid "Currently Female"
 msgstr ""
 
-#: src/Content/ContactSelector.php:147
+#: src/Content/ContactSelector.php:148
 msgid "Mostly Male"
 msgstr ""
 
-#: src/Content/ContactSelector.php:147
+#: src/Content/ContactSelector.php:148
 msgid "Mostly Female"
 msgstr ""
 
-#: src/Content/ContactSelector.php:147
+#: src/Content/ContactSelector.php:148
 msgid "Transgender"
 msgstr ""
 
-#: src/Content/ContactSelector.php:147
+#: src/Content/ContactSelector.php:148
 msgid "Intersex"
 msgstr ""
 
-#: src/Content/ContactSelector.php:147
+#: src/Content/ContactSelector.php:148
 msgid "Transsexual"
 msgstr ""
 
-#: src/Content/ContactSelector.php:147
+#: src/Content/ContactSelector.php:148
 msgid "Hermaphrodite"
 msgstr ""
 
-#: src/Content/ContactSelector.php:147
+#: src/Content/ContactSelector.php:148
 msgid "Neuter"
 msgstr ""
 
-#: src/Content/ContactSelector.php:147
+#: src/Content/ContactSelector.php:148
 msgid "Non-specific"
 msgstr ""
 
-#: src/Content/ContactSelector.php:147
+#: src/Content/ContactSelector.php:148
 msgid "Other"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
+#: src/Content/ContactSelector.php:170
 msgid "Males"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
+#: src/Content/ContactSelector.php:170
 msgid "Females"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
+#: src/Content/ContactSelector.php:170
 msgid "Gay"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
+#: src/Content/ContactSelector.php:170
 msgid "Lesbian"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
+#: src/Content/ContactSelector.php:170
 msgid "No Preference"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Bisexual"
+#: src/Content/ContactSelector.php:170
+msgid "Bisexual"
+msgstr ""
+
+#: src/Content/ContactSelector.php:170
+msgid "Autosexual"
+msgstr ""
+
+#: src/Content/ContactSelector.php:170
+msgid "Abstinent"
+msgstr ""
+
+#: src/Content/ContactSelector.php:170
+msgid "Virgin"
+msgstr ""
+
+#: src/Content/ContactSelector.php:170
+msgid "Deviant"
+msgstr ""
+
+#: src/Content/ContactSelector.php:170
+msgid "Fetish"
+msgstr ""
+
+#: src/Content/ContactSelector.php:170
+msgid "Oodles"
+msgstr ""
+
+#: src/Content/ContactSelector.php:170
+msgid "Nonsexual"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Single"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Lonely"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Available"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Unavailable"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Has crush"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Infatuated"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Dating"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Unfaithful"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Sex Addict"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192 src/Model/User.php:617
+msgid "Friends"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Friends/Benefits"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Casual"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Engaged"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Married"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Imaginarily married"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Partners"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Cohabiting"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Common law"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Happy"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Not looking"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Swinger"
+msgstr ""
+
+#: src/Content/ContactSelector.php:192
+msgid "Betrayed"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Autosexual"
+#: src/Content/ContactSelector.php:192
+msgid "Separated"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Abstinent"
+#: src/Content/ContactSelector.php:192
+msgid "Unstable"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Virgin"
+#: src/Content/ContactSelector.php:192
+msgid "Divorced"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Deviant"
+#: src/Content/ContactSelector.php:192
+msgid "Imaginarily divorced"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Fetish"
+#: src/Content/ContactSelector.php:192
+msgid "Widowed"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Oodles"
+#: src/Content/ContactSelector.php:192
+msgid "Uncertain"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Nonsexual"
+#: src/Content/ContactSelector.php:192
+msgid "It's complicated"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Single"
+#: src/Content/ContactSelector.php:192
+msgid "Don't care"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Lonely"
+#: src/Content/ContactSelector.php:192
+msgid "Ask me"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Available"
+#: src/Content/Feature.php:79
+msgid "General Features"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Unavailable"
+#: src/Content/Feature.php:81
+msgid "Multiple Profiles"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Has crush"
+#: src/Content/Feature.php:81
+msgid "Ability to create multiple profiles"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Infatuated"
+#: src/Content/Feature.php:82
+msgid "Photo Location"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Dating"
+#: src/Content/Feature.php:82
+msgid ""
+"Photo metadata is normally stripped. This extracts the location (if present) "
+"prior to stripping metadata and links it to a map."
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Unfaithful"
+#: src/Content/Feature.php:83
+msgid "Export Public Calendar"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Sex Addict"
+#: src/Content/Feature.php:83
+msgid "Ability for visitors to download the public calendar"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191 src/Model/User.php:616
-msgid "Friends"
+#: src/Content/Feature.php:88
+msgid "Post Composition Features"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Friends/Benefits"
+#: src/Content/Feature.php:89
+msgid "Auto-mention Forums"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Casual"
+#: src/Content/Feature.php:89
+msgid ""
+"Add/remove mention when a forum page is selected/deselected in ACL window."
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Engaged"
+#: src/Content/Feature.php:94
+msgid "Network Sidebar"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Married"
+#: src/Content/Feature.php:95
+msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Imaginarily married"
+#: src/Content/Feature.php:96
+msgid "Protocol Filter"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Partners"
+#: src/Content/Feature.php:96
+msgid "Enable widget to display Network posts only from selected protocols"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Cohabiting"
+#: src/Content/Feature.php:101
+msgid "Network Tabs"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Common law"
+#: src/Content/Feature.php:102
+msgid "Network New Tab"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Happy"
+#: src/Content/Feature.php:102
+msgid "Enable tab to display only new Network posts (from the last 12 hours)"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Not looking"
+#: src/Content/Feature.php:103
+msgid "Network Shared Links Tab"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Swinger"
+#: src/Content/Feature.php:103
+msgid "Enable tab to display only Network posts with links in them"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Betrayed"
+#: src/Content/Feature.php:108
+msgid "Post/Comment Tools"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Separated"
+#: src/Content/Feature.php:109
+msgid "Post Categories"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Unstable"
+#: src/Content/Feature.php:109
+msgid "Add categories to your posts"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Divorced"
+#: src/Content/Feature.php:114
+msgid "Advanced Profile Settings"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Imaginarily divorced"
+#: src/Content/Feature.php:115
+msgid "List Forums"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Widowed"
+#: src/Content/Feature.php:115
+msgid "Show visitors public community forums at the Advanced Profile Page"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Uncertain"
+#: src/Content/Feature.php:116
+msgid "Tag Cloud"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "It's complicated"
+#: src/Content/Feature.php:116
+msgid "Provide a personal tag cloud on your profile page"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Don't care"
+#: src/Content/Feature.php:117
+msgid "Display Membership Date"
 msgstr ""
 
-#: src/Content/ContactSelector.php:191
-msgid "Ask me"
+#: src/Content/Feature.php:117
+msgid "Display membership date in profile"
 msgstr ""
 
-#: src/Content/Nav.php:71
+#: src/Content/Nav.php:72
 msgid "Nothing new here"
 msgstr ""
 
-#: src/Content/Nav.php:75
+#: src/Content/Nav.php:76
 msgid "Clear notifications"
 msgstr ""
 
-#: src/Content/Nav.php:157
+#: src/Content/Nav.php:158
 msgid "Personal notes"
 msgstr ""
 
-#: src/Content/Nav.php:157
+#: src/Content/Nav.php:158
 msgid "Your personal notes"
 msgstr ""
 
-#: src/Content/Nav.php:166
+#: src/Content/Nav.php:167
 msgid "Sign in"
 msgstr ""
 
-#: src/Content/Nav.php:176
+#: src/Content/Nav.php:177
 msgid "Home Page"
 msgstr ""
 
-#: src/Content/Nav.php:180
+#: src/Content/Nav.php:181
 msgid "Create an account"
 msgstr ""
 
-#: src/Content/Nav.php:186
+#: src/Content/Nav.php:187
 msgid "Help and documentation"
 msgstr ""
 
-#: src/Content/Nav.php:190
+#: src/Content/Nav.php:191
 msgid "Apps"
 msgstr ""
 
-#: src/Content/Nav.php:190
+#: src/Content/Nav.php:191
 msgid "Addon applications, utilities, games"
 msgstr ""
 
-#: src/Content/Nav.php:194
+#: src/Content/Nav.php:195
 msgid "Search site content"
 msgstr ""
 
-#: src/Content/Nav.php:218
+#: src/Content/Nav.php:219
 msgid "Community"
 msgstr ""
 
-#: src/Content/Nav.php:218
+#: src/Content/Nav.php:219
 msgid "Conversations on this and other servers"
 msgstr ""
 
-#: src/Content/Nav.php:225
+#: src/Content/Nav.php:226
 msgid "Directory"
 msgstr ""
 
-#: src/Content/Nav.php:225
+#: src/Content/Nav.php:226
 msgid "People directory"
 msgstr ""
 
-#: src/Content/Nav.php:227
+#: src/Content/Nav.php:228
 msgid "Information about this friendica instance"
 msgstr ""
 
-#: src/Content/Nav.php:230
+#: src/Content/Nav.php:231
 msgid "Terms of Service of this Friendica instance"
 msgstr ""
 
-#: src/Content/Nav.php:236
+#: src/Content/Nav.php:237
 msgid "Network Reset"
 msgstr ""
 
-#: src/Content/Nav.php:236
+#: src/Content/Nav.php:237
 msgid "Load Network page with no filters"
 msgstr ""
 
-#: src/Content/Nav.php:242
+#: src/Content/Nav.php:243
 msgid "Friend Requests"
 msgstr ""
 
-#: src/Content/Nav.php:244
+#: src/Content/Nav.php:245
 msgid "See all notifications"
 msgstr ""
 
-#: src/Content/Nav.php:245
+#: src/Content/Nav.php:246
 msgid "Mark all system notifications seen"
 msgstr ""
 
-#: src/Content/Nav.php:249
+#: src/Content/Nav.php:250
 msgid "Inbox"
 msgstr ""
 
-#: src/Content/Nav.php:250
+#: src/Content/Nav.php:251
 msgid "Outbox"
 msgstr ""
 
-#: src/Content/Nav.php:254
+#: src/Content/Nav.php:255
 msgid "Manage"
 msgstr ""
 
-#: src/Content/Nav.php:254
+#: src/Content/Nav.php:255
 msgid "Manage other pages"
 msgstr ""
 
-#: src/Content/Nav.php:262
+#: src/Content/Nav.php:263
 msgid "Manage/Edit Profiles"
 msgstr ""
 
-#: src/Content/Nav.php:270
+#: src/Content/Nav.php:271
 msgid "Site setup and configuration"
 msgstr ""
 
-#: src/Content/Nav.php:273
+#: src/Content/Nav.php:274
 msgid "Navigation"
 msgstr ""
 
-#: src/Content/Nav.php:273
+#: src/Content/Nav.php:274
 msgid "Site map"
 msgstr ""
 
-#: src/Content/OEmbed.php:256
+#: src/Content/OEmbed.php:257
 msgid "Embedding disabled"
 msgstr ""
 
-#: src/Content/OEmbed.php:376
+#: src/Content/OEmbed.php:377
 msgid "Embedded content"
 msgstr ""
 
-#: src/Content/Pager.php:165
+#: src/Content/Pager.php:166
 msgid "newer"
 msgstr ""
 
-#: src/Content/Pager.php:170
+#: src/Content/Pager.php:171
 msgid "older"
 msgstr ""
 
-#: src/Content/Pager.php:209
+#: src/Content/Pager.php:210
 msgid "first"
 msgstr ""
 
-#: src/Content/Pager.php:214
+#: src/Content/Pager.php:215
 msgid "prev"
 msgstr ""
 
-#: src/Content/Pager.php:269
+#: src/Content/Pager.php:270
 msgid "next"
 msgstr ""
 
-#: src/Content/Pager.php:274
+#: src/Content/Pager.php:275
 msgid "last"
 msgstr ""
 
-#: src/Content/Widget.php:33
+#: src/Content/Widget.php:37
 msgid "Add New Contact"
 msgstr ""
 
-#: src/Content/Widget.php:34
+#: src/Content/Widget.php:38
 msgid "Enter address or web location"
 msgstr ""
 
-#: src/Content/Widget.php:35
+#: src/Content/Widget.php:39
 msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
-#: src/Content/Widget.php:53
+#: src/Content/Widget.php:57
 #, php-format
 msgid "%d invitation available"
 msgid_plural "%d invitations available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Content/Widget.php:154
-msgid "Networks"
+#: src/Content/Widget.php:158
+msgid "Protocols"
 msgstr ""
 
-#: src/Content/Widget.php:157
-msgid "All Networks"
+#: src/Content/Widget.php:161
+msgid "All Protocols"
 msgstr ""
 
-#: src/Content/Widget.php:198 src/Content/Widget.php:238
+#: src/Content/Widget.php:196
+msgid "Saved Folders"
+msgstr ""
+
+#: src/Content/Widget.php:199 src/Content/Widget.php:239
 msgid "Everything"
 msgstr ""
 
-#: src/Content/Widget.php:235
+#: src/Content/Widget.php:236
 msgid "Categories"
 msgstr ""
 
-#: src/Content/Widget.php:302
+#: src/Content/Widget.php:303
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Database/DBStructure.php:41
+#: src/Database/DBStructure.php:45
 msgid "There are no tables on MyISAM."
 msgstr ""
 
-#: src/Database/DBStructure.php:84
-#, php-format
-msgid ""
-"\n"
-"\t\t\t\tThe friendica developers released update %s recently,\n"
-"\t\t\t\tbut when I tried to install it, something went terribly wrong.\n"
-"\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact "
-"a\n"
-"\t\t\t\tfriendica developer if you can not help me on your own. My database "
-"might be invalid."
-msgstr ""
-
-#: src/Database/DBStructure.php:90
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
-msgstr ""
-
-#: src/Database/DBStructure.php:201
+#: src/Database/DBStructure.php:153
 #, php-format
 msgid ""
 "\n"
@@ -8525,436 +8440,475 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/Database/DBStructure.php:204
+#: src/Database/DBStructure.php:156
 msgid "Errors encountered performing database changes: "
 msgstr ""
 
-#: src/Database/DBStructure.php:220
+#: src/Database/DBStructure.php:172
 #, php-format
 msgid "%s: Database update"
 msgstr ""
 
-#: src/Database/DBStructure.php:482
+#: src/Database/DBStructure.php:435
 #, php-format
 msgid "%s: updating %s table."
 msgstr ""
 
-#: src/Model/Contact.php:954
+#: src/Model/Mail.php:40 src/Model/Mail.php:172
+msgid "[no subject]"
+msgstr ""
+
+#: src/Model/Contact.php:955
 msgid "Drop Contact"
 msgstr ""
 
-#: src/Model/Contact.php:1412
+#: src/Model/Contact.php:1418
 msgid "Organisation"
 msgstr ""
 
-#: src/Model/Contact.php:1416
+#: src/Model/Contact.php:1422
 msgid "News"
 msgstr ""
 
-#: src/Model/Contact.php:1420
+#: src/Model/Contact.php:1426
 msgid "Forum"
 msgstr ""
 
-#: src/Model/Contact.php:1602
+#: src/Model/Contact.php:1608
 msgid "Connect URL missing."
 msgstr ""
 
-#: src/Model/Contact.php:1611
+#: src/Model/Contact.php:1617
 msgid ""
 "The contact could not be added. Please check the relevant network "
 "credentials in your Settings -> Social Networks page."
 msgstr ""
 
-#: src/Model/Contact.php:1650
+#: src/Model/Contact.php:1656
 msgid ""
 "This site is not configured to allow communications with other networks."
 msgstr ""
 
-#: src/Model/Contact.php:1651 src/Model/Contact.php:1665
+#: src/Model/Contact.php:1657 src/Model/Contact.php:1671
 msgid "No compatible communication protocols or feeds were discovered."
 msgstr ""
 
-#: src/Model/Contact.php:1663
+#: src/Model/Contact.php:1669
 msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: src/Model/Contact.php:1668
+#: src/Model/Contact.php:1674
 msgid "An author or name was not found."
 msgstr ""
 
-#: src/Model/Contact.php:1671
+#: src/Model/Contact.php:1677
 msgid "No browser URL could be matched to this address."
 msgstr ""
 
-#: src/Model/Contact.php:1674
+#: src/Model/Contact.php:1680
 msgid ""
 "Unable to match @-style Identity Address with a known protocol or email "
 "contact."
 msgstr ""
 
-#: src/Model/Contact.php:1675
+#: src/Model/Contact.php:1681
 msgid "Use mailto: in front of address to force email check."
 msgstr ""
 
-#: src/Model/Contact.php:1681
+#: src/Model/Contact.php:1687
 msgid ""
 "The profile address specified belongs to a network which has been disabled "
 "on this site."
 msgstr ""
 
-#: src/Model/Contact.php:1686
+#: src/Model/Contact.php:1692
 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
 msgstr ""
 
-#: src/Model/Contact.php:1737
+#: src/Model/Contact.php:1743
 msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: src/Model/Contact.php:1984 src/Protocol/DFRN.php:1531
+#: src/Model/Contact.php:1990 src/Protocol/DFRN.php:1532
 #, php-format
 msgid "%s's birthday"
 msgstr ""
 
-#: src/Model/Contact.php:1985 src/Protocol/DFRN.php:1532
+#: src/Model/Contact.php:1991 src/Protocol/DFRN.php:1533
 #, php-format
 msgid "Happy Birthday %s"
 msgstr ""
 
-#: src/Model/Event.php:61 src/Model/Event.php:78 src/Model/Event.php:430
-#: src/Model/Event.php:905
+#: src/Model/Event.php:63 src/Model/Event.php:80 src/Model/Event.php:432
+#: src/Model/Event.php:907
 msgid "Starts:"
 msgstr ""
 
-#: src/Model/Event.php:64 src/Model/Event.php:84 src/Model/Event.php:431
-#: src/Model/Event.php:909
+#: src/Model/Event.php:66 src/Model/Event.php:86 src/Model/Event.php:433
+#: src/Model/Event.php:911
 msgid "Finishes:"
 msgstr ""
 
-#: src/Model/Event.php:379
+#: src/Model/Event.php:381
 msgid "all-day"
 msgstr ""
 
-#: src/Model/Event.php:402
+#: src/Model/Event.php:404
 msgid "Jun"
 msgstr ""
 
-#: src/Model/Event.php:405
+#: src/Model/Event.php:407
 msgid "Sept"
 msgstr ""
 
-#: src/Model/Event.php:428
+#: src/Model/Event.php:430
 msgid "No events to display"
 msgstr ""
 
-#: src/Model/Event.php:552
+#: src/Model/Event.php:554
 msgid "l, F j"
 msgstr ""
 
-#: src/Model/Event.php:583
+#: src/Model/Event.php:585
 msgid "Edit event"
 msgstr ""
 
-#: src/Model/Event.php:584
+#: src/Model/Event.php:586
 msgid "Duplicate event"
 msgstr ""
 
-#: src/Model/Event.php:585
+#: src/Model/Event.php:587
 msgid "Delete event"
 msgstr ""
 
-#: src/Model/Event.php:838
+#: src/Model/Event.php:619 src/Model/Item.php:3529 src/Model/Item.php:3536
+msgid "link to source"
+msgstr ""
+
+#: src/Model/Event.php:840
 msgid "D g:i A"
 msgstr ""
 
-#: src/Model/Event.php:839
+#: src/Model/Event.php:841
 msgid "g:i A"
 msgstr ""
 
-#: src/Model/Event.php:924 src/Model/Event.php:926
+#: src/Model/Event.php:926 src/Model/Event.php:928
 msgid "Show map"
 msgstr ""
 
-#: src/Model/Event.php:925
+#: src/Model/Event.php:927
 msgid "Hide map"
 msgstr ""
 
-#: src/Model/Group.php:46
+#: src/Model/FileTag.php:255
+msgid "Item filed"
+msgstr ""
+
+#: src/Model/Group.php:47
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
 "<strong>may</strong> apply to this group and any future members. If this is "
 "not what you intended, please create another group with a different name."
 msgstr ""
 
-#: src/Model/Group.php:332
+#: src/Model/Group.php:333
 msgid "Default privacy group for new contacts"
 msgstr ""
 
-#: src/Model/Group.php:365
+#: src/Model/Group.php:366
 msgid "Everybody"
 msgstr ""
 
-#: src/Model/Group.php:385
+#: src/Model/Group.php:386
 msgid "edit"
 msgstr ""
 
-#: src/Model/Group.php:409
+#: src/Model/Group.php:410
 msgid "Edit group"
 msgstr ""
 
-#: src/Model/Group.php:412
+#: src/Model/Group.php:413
 msgid "Create a new group"
 msgstr ""
 
-#: src/Model/Group.php:414
+#: src/Model/Group.php:415
 msgid "Edit groups"
 msgstr ""
 
-#: src/Model/Mail.php:40 src/Model/Mail.php:172
-msgid "[no subject]"
+#: src/Model/Item.php:3267
+msgid "activity"
+msgstr ""
+
+#: src/Model/Item.php:3269 src/Object/Post.php:446 src/Object/Post.php:458
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/Model/Item.php:3272
+msgid "post"
+msgstr ""
+
+#: src/Model/Item.php:3368
+#, php-format
+msgid "Content warning: %s"
+msgstr ""
+
+#: src/Model/Item.php:3447
+msgid "bytes"
+msgstr ""
+
+#: src/Model/Item.php:3523
+msgid "View on separate page"
+msgstr ""
+
+#: src/Model/Item.php:3524
+msgid "view on separate page"
 msgstr ""
 
-#: src/Model/Profile.php:111
+#: src/Model/Profile.php:114
 msgid "Requested account is not available."
 msgstr ""
 
-#: src/Model/Profile.php:177 src/Model/Profile.php:413
-#: src/Model/Profile.php:860
+#: src/Model/Profile.php:180 src/Model/Profile.php:416
+#: src/Model/Profile.php:863
 msgid "Edit profile"
 msgstr ""
 
-#: src/Model/Profile.php:347
+#: src/Model/Profile.php:350
 msgid "Atom feed"
 msgstr ""
 
-#: src/Model/Profile.php:386
+#: src/Model/Profile.php:389
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: src/Model/Profile.php:438 src/Module/Contact.php:650
+#: src/Model/Profile.php:441 src/Module/Contact.php:652
 msgid "XMPP:"
 msgstr ""
 
-#: src/Model/Profile.php:564 src/Model/Profile.php:653
+#: src/Model/Profile.php:567 src/Model/Profile.php:656
 msgid "g A l F d"
 msgstr ""
 
-#: src/Model/Profile.php:565
+#: src/Model/Profile.php:568
 msgid "F d"
 msgstr ""
 
-#: src/Model/Profile.php:618 src/Model/Profile.php:704
+#: src/Model/Profile.php:621 src/Model/Profile.php:707
 msgid "[today]"
 msgstr ""
 
-#: src/Model/Profile.php:629
+#: src/Model/Profile.php:632
 msgid "Birthday Reminders"
 msgstr ""
 
-#: src/Model/Profile.php:630
+#: src/Model/Profile.php:633
 msgid "Birthdays this week:"
 msgstr ""
 
-#: src/Model/Profile.php:691
+#: src/Model/Profile.php:694
 msgid "[No description]"
 msgstr ""
 
-#: src/Model/Profile.php:718
+#: src/Model/Profile.php:721
 msgid "Event Reminders"
 msgstr ""
 
-#: src/Model/Profile.php:719
+#: src/Model/Profile.php:722
 msgid "Upcoming events the next 7 days:"
 msgstr ""
 
-#: src/Model/Profile.php:742
+#: src/Model/Profile.php:745
 msgid "Member since:"
 msgstr ""
 
-#: src/Model/Profile.php:750
+#: src/Model/Profile.php:753
 msgid "j F, Y"
 msgstr ""
 
-#: src/Model/Profile.php:751
+#: src/Model/Profile.php:754
 msgid "j F"
 msgstr ""
 
-#: src/Model/Profile.php:766
+#: src/Model/Profile.php:769
 msgid "Age:"
 msgstr ""
 
-#: src/Model/Profile.php:779
+#: src/Model/Profile.php:782
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: src/Model/Profile.php:803
+#: src/Model/Profile.php:806
 msgid "Religion:"
 msgstr ""
 
-#: src/Model/Profile.php:811
+#: src/Model/Profile.php:814
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: src/Model/Profile.php:823
+#: src/Model/Profile.php:826
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: src/Model/Profile.php:827
+#: src/Model/Profile.php:830
 msgid "Musical interests:"
 msgstr ""
 
-#: src/Model/Profile.php:831
+#: src/Model/Profile.php:834
 msgid "Books, literature:"
 msgstr ""
 
-#: src/Model/Profile.php:835
+#: src/Model/Profile.php:838
 msgid "Television:"
 msgstr ""
 
-#: src/Model/Profile.php:839
+#: src/Model/Profile.php:842
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: src/Model/Profile.php:843
+#: src/Model/Profile.php:846
 msgid "Love/Romance:"
 msgstr ""
 
-#: src/Model/Profile.php:847
+#: src/Model/Profile.php:850
 msgid "Work/employment:"
 msgstr ""
 
-#: src/Model/Profile.php:851
+#: src/Model/Profile.php:854
 msgid "School/education:"
 msgstr ""
 
-#: src/Model/Profile.php:856
+#: src/Model/Profile.php:859
 msgid "Forums:"
 msgstr ""
 
-#: src/Model/Profile.php:900 src/Module/Contact.php:867
+#: src/Model/Profile.php:903 src/Module/Contact.php:877
 msgid "Profile Details"
 msgstr ""
 
-#: src/Model/Profile.php:950
+#: src/Model/Profile.php:953
 msgid "Only You Can See This"
 msgstr ""
 
-#: src/Model/Profile.php:958 src/Model/Profile.php:961
+#: src/Model/Profile.php:961 src/Model/Profile.php:964
 msgid "Tips for New Members"
 msgstr ""
 
-#: src/Model/Profile.php:1123
+#: src/Model/Profile.php:1126
 #, php-format
 msgid "OpenWebAuth: %1$s welcomes %2$s"
 msgstr ""
 
-#: src/Model/User.php:205
+#: src/Model/User.php:206
 msgid "Login failed"
 msgstr ""
 
-#: src/Model/User.php:236
+#: src/Model/User.php:237
 msgid "Not enough information to authenticate"
 msgstr ""
 
-#: src/Model/User.php:428
+#: src/Model/User.php:429
 msgid "An invitation is required."
 msgstr ""
 
-#: src/Model/User.php:432
+#: src/Model/User.php:433
 msgid "Invitation could not be verified."
 msgstr ""
 
-#: src/Model/User.php:439
+#: src/Model/User.php:440
 msgid "Invalid OpenID url"
 msgstr ""
 
-#: src/Model/User.php:452 src/Module/Login.php:106
+#: src/Model/User.php:453 src/Module/Login.php:108
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr ""
 
-#: src/Model/User.php:452 src/Module/Login.php:106
+#: src/Model/User.php:453 src/Module/Login.php:108
 msgid "The error message was:"
 msgstr ""
 
-#: src/Model/User.php:458
+#: src/Model/User.php:459
 msgid "Please enter the required information."
 msgstr ""
 
-#: src/Model/User.php:474
+#: src/Model/User.php:475
 #, php-format
 msgid ""
 "system.username_min_length (%s) and system.username_max_length (%s) are "
 "excluding each other, swapping values."
 msgstr ""
 
-#: src/Model/User.php:481
+#: src/Model/User.php:482
 #, php-format
 msgid "Username should be at least %s character."
 msgid_plural "Username should be at least %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Model/User.php:485
+#: src/Model/User.php:486
 #, php-format
 msgid "Username should be at most %s character."
 msgid_plural "Username should be at most %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Model/User.php:493
+#: src/Model/User.php:494
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: src/Model/User.php:498
+#: src/Model/User.php:499
 msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: src/Model/User.php:502
+#: src/Model/User.php:503
 msgid "Not a valid email address."
 msgstr ""
 
-#: src/Model/User.php:505
+#: src/Model/User.php:506
 msgid "The nickname was blocked from registration by the nodes admin."
 msgstr ""
 
-#: src/Model/User.php:509 src/Model/User.php:517
+#: src/Model/User.php:510 src/Model/User.php:518
 msgid "Cannot use that email."
 msgstr ""
 
-#: src/Model/User.php:524
+#: src/Model/User.php:525
 msgid "Your nickname can only contain a-z, 0-9 and _."
 msgstr ""
 
-#: src/Model/User.php:531 src/Model/User.php:588
+#: src/Model/User.php:532 src/Model/User.php:589
 msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: src/Model/User.php:541
+#: src/Model/User.php:542
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: src/Model/User.php:575 src/Model/User.php:579
+#: src/Model/User.php:576 src/Model/User.php:580
 msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: src/Model/User.php:604
+#: src/Model/User.php:605
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: src/Model/User.php:611
+#: src/Model/User.php:612
 msgid "An error occurred creating your self contact. Please try again."
 msgstr ""
 
-#: src/Model/User.php:620
+#: src/Model/User.php:621
 msgid ""
 "An error occurred creating your default contact group. Please try again."
 msgstr ""
 
-#: src/Model/User.php:695
+#: src/Model/User.php:696
 #, php-format
 msgid ""
 "\n"
@@ -8970,12 +8924,12 @@ msgid ""
 "\t\t"
 msgstr ""
 
-#: src/Model/User.php:712
+#: src/Model/User.php:713
 #, php-format
 msgid "Registration at %s"
 msgstr ""
 
-#: src/Model/User.php:730
+#: src/Model/User.php:731
 #, php-format
 msgid ""
 "\n"
@@ -8984,7 +8938,7 @@ msgid ""
 "\t\t"
 msgstr ""
 
-#: src/Model/User.php:736
+#: src/Model/User.php:737
 #, php-format
 msgid ""
 "\n"
@@ -9023,489 +8977,497 @@ msgid ""
 "\t\t\tThank you and welcome to %2$s."
 msgstr ""
 
-#: src/Protocol/Diaspora.php:2433
+#: src/Protocol/Diaspora.php:2434
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: src/Protocol/Diaspora.php:3527
+#: src/Protocol/Diaspora.php:3528
 msgid "Attachments:"
 msgstr ""
 
-#: src/Protocol/OStatus.php:1824
+#: src/Protocol/OStatus.php:1839
 #, php-format
 msgid "%s is now following %s."
 msgstr ""
 
-#: src/Protocol/OStatus.php:1825
+#: src/Protocol/OStatus.php:1840
 msgid "following"
 msgstr ""
 
-#: src/Protocol/OStatus.php:1828
+#: src/Protocol/OStatus.php:1843
 #, php-format
 msgid "%s stopped following %s."
 msgstr ""
 
-#: src/Protocol/OStatus.php:1829
+#: src/Protocol/OStatus.php:1844
 msgid "stopped following"
 msgstr ""
 
-#: src/Worker/Delivery.php:427
+#: src/Worker/Delivery.php:433
 msgid "(no subject)"
 msgstr ""
 
-#: src/Module/Contact.php:169
+#: src/Module/Logout.php:29
+msgid "Logged out."
+msgstr ""
+
+#: src/Module/Proxy.php:136
+msgid "Bad Request."
+msgstr ""
+
+#: src/Module/Contact.php:171
 #, php-format
 msgid "%d contact edited."
 msgid_plural "%d contacts edited."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Module/Contact.php:194 src/Module/Contact.php:377
+#: src/Module/Contact.php:196 src/Module/Contact.php:379
 msgid "Could not access contact record."
 msgstr ""
 
-#: src/Module/Contact.php:204
+#: src/Module/Contact.php:206
 msgid "Could not locate selected profile."
 msgstr ""
 
-#: src/Module/Contact.php:236
+#: src/Module/Contact.php:238
 msgid "Contact updated."
 msgstr ""
 
-#: src/Module/Contact.php:398
+#: src/Module/Contact.php:400
 msgid "Contact has been blocked"
 msgstr ""
 
-#: src/Module/Contact.php:398
+#: src/Module/Contact.php:400
 msgid "Contact has been unblocked"
 msgstr ""
 
-#: src/Module/Contact.php:408
+#: src/Module/Contact.php:410
 msgid "Contact has been ignored"
 msgstr ""
 
-#: src/Module/Contact.php:408
+#: src/Module/Contact.php:410
 msgid "Contact has been unignored"
 msgstr ""
 
-#: src/Module/Contact.php:418
+#: src/Module/Contact.php:420
 msgid "Contact has been archived"
 msgstr ""
 
-#: src/Module/Contact.php:418
+#: src/Module/Contact.php:420
 msgid "Contact has been unarchived"
 msgstr ""
 
-#: src/Module/Contact.php:442
+#: src/Module/Contact.php:444
 msgid "Drop contact"
 msgstr ""
 
-#: src/Module/Contact.php:445 src/Module/Contact.php:815
+#: src/Module/Contact.php:447 src/Module/Contact.php:825
 msgid "Do you really want to delete this contact?"
 msgstr ""
 
-#: src/Module/Contact.php:459
+#: src/Module/Contact.php:461
 msgid "Contact has been removed."
 msgstr ""
 
-#: src/Module/Contact.php:490
+#: src/Module/Contact.php:492
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr ""
 
-#: src/Module/Contact.php:495
+#: src/Module/Contact.php:497
 #, php-format
 msgid "You are sharing with %s"
 msgstr ""
 
-#: src/Module/Contact.php:500
+#: src/Module/Contact.php:502
 #, php-format
 msgid "%s is sharing with you"
 msgstr ""
 
-#: src/Module/Contact.php:524
+#: src/Module/Contact.php:526
 msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: src/Module/Contact.php:526
+#: src/Module/Contact.php:528
 msgid "Never"
 msgstr ""
 
-#: src/Module/Contact.php:529
+#: src/Module/Contact.php:531
 msgid "(Update was successful)"
 msgstr ""
 
-#: src/Module/Contact.php:529
+#: src/Module/Contact.php:531
 msgid "(Update was not successful)"
 msgstr ""
 
-#: src/Module/Contact.php:531 src/Module/Contact.php:1053
+#: src/Module/Contact.php:533 src/Module/Contact.php:1063
 msgid "Suggest friends"
 msgstr ""
 
-#: src/Module/Contact.php:535
+#: src/Module/Contact.php:537
 #, php-format
 msgid "Network type: %s"
 msgstr ""
 
-#: src/Module/Contact.php:540
+#: src/Module/Contact.php:542
 msgid "Communications lost with this contact!"
 msgstr ""
 
-#: src/Module/Contact.php:546
+#: src/Module/Contact.php:548
 msgid "Fetch further information for feeds"
 msgstr ""
 
-#: src/Module/Contact.php:548
+#: src/Module/Contact.php:550
 msgid ""
 "Fetch information like preview pictures, title and teaser from the feed "
 "item. You can activate this if the feed doesn't contain much text. Keywords "
 "are taken from the meta header in the feed item and are posted as hash tags."
 msgstr ""
 
-#: src/Module/Contact.php:551
+#: src/Module/Contact.php:553
 msgid "Fetch information"
 msgstr ""
 
-#: src/Module/Contact.php:552
+#: src/Module/Contact.php:554
 msgid "Fetch keywords"
 msgstr ""
 
-#: src/Module/Contact.php:553
+#: src/Module/Contact.php:555
 msgid "Fetch information and keywords"
 msgstr ""
 
-#: src/Module/Contact.php:585
+#: src/Module/Contact.php:587
 msgid "Profile Visibility"
 msgstr ""
 
-#: src/Module/Contact.php:586
+#: src/Module/Contact.php:588
 msgid "Contact Information / Notes"
 msgstr ""
 
-#: src/Module/Contact.php:587
+#: src/Module/Contact.php:589
 msgid "Contact Settings"
 msgstr ""
 
-#: src/Module/Contact.php:596
+#: src/Module/Contact.php:598
 msgid "Contact"
 msgstr ""
 
-#: src/Module/Contact.php:600
+#: src/Module/Contact.php:602
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: src/Module/Contact.php:602
+#: src/Module/Contact.php:604
 msgid "Their personal note"
 msgstr ""
 
-#: src/Module/Contact.php:604
+#: src/Module/Contact.php:606
 msgid "Edit contact notes"
 msgstr ""
 
-#: src/Module/Contact.php:608
+#: src/Module/Contact.php:610
 msgid "Block/Unblock contact"
 msgstr ""
 
-#: src/Module/Contact.php:609
+#: src/Module/Contact.php:611
 msgid "Ignore contact"
 msgstr ""
 
-#: src/Module/Contact.php:610
+#: src/Module/Contact.php:612
 msgid "Repair URL settings"
 msgstr ""
 
-#: src/Module/Contact.php:611
+#: src/Module/Contact.php:613
 msgid "View conversations"
 msgstr ""
 
-#: src/Module/Contact.php:616
+#: src/Module/Contact.php:618
 msgid "Last update:"
 msgstr ""
 
-#: src/Module/Contact.php:618
+#: src/Module/Contact.php:620
 msgid "Update public posts"
 msgstr ""
 
-#: src/Module/Contact.php:620 src/Module/Contact.php:1063
+#: src/Module/Contact.php:622 src/Module/Contact.php:1073
 msgid "Update now"
 msgstr ""
 
-#: src/Module/Contact.php:626 src/Module/Contact.php:820
-#: src/Module/Contact.php:1080
+#: src/Module/Contact.php:628 src/Module/Contact.php:830
+#: src/Module/Contact.php:1090
 msgid "Unignore"
 msgstr ""
 
-#: src/Module/Contact.php:630
+#: src/Module/Contact.php:632
 msgid "Currently blocked"
 msgstr ""
 
-#: src/Module/Contact.php:631
+#: src/Module/Contact.php:633
 msgid "Currently ignored"
 msgstr ""
 
-#: src/Module/Contact.php:632
+#: src/Module/Contact.php:634
 msgid "Currently archived"
 msgstr ""
 
-#: src/Module/Contact.php:633
+#: src/Module/Contact.php:635
 msgid "Awaiting connection acknowledge"
 msgstr ""
 
-#: src/Module/Contact.php:634
+#: src/Module/Contact.php:636
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: src/Module/Contact.php:635
+#: src/Module/Contact.php:637
 msgid "Notification for new posts"
 msgstr ""
 
-#: src/Module/Contact.php:635
+#: src/Module/Contact.php:637
 msgid "Send a notification of every new post of this contact"
 msgstr ""
 
-#: src/Module/Contact.php:638
+#: src/Module/Contact.php:640
 msgid "Blacklisted keywords"
 msgstr ""
 
-#: src/Module/Contact.php:638
+#: src/Module/Contact.php:640
 msgid ""
 "Comma separated list of keywords that should not be converted to hashtags, "
 "when \"Fetch information and keywords\" is selected"
 msgstr ""
 
-#: src/Module/Contact.php:655
+#: src/Module/Contact.php:657
 msgid "Actions"
 msgstr ""
 
-#: src/Module/Contact.php:701
+#: src/Module/Contact.php:703
 msgid "Suggestions"
 msgstr ""
 
-#: src/Module/Contact.php:704
+#: src/Module/Contact.php:706
 msgid "Suggest potential friends"
 msgstr ""
 
-#: src/Module/Contact.php:712
+#: src/Module/Contact.php:714
 msgid "Show all contacts"
 msgstr ""
 
-#: src/Module/Contact.php:717
+#: src/Module/Contact.php:719
 msgid "Unblocked"
 msgstr ""
 
-#: src/Module/Contact.php:720
+#: src/Module/Contact.php:722
 msgid "Only show unblocked contacts"
 msgstr ""
 
-#: src/Module/Contact.php:725
+#: src/Module/Contact.php:727
 msgid "Blocked"
 msgstr ""
 
-#: src/Module/Contact.php:728
+#: src/Module/Contact.php:730
 msgid "Only show blocked contacts"
 msgstr ""
 
-#: src/Module/Contact.php:733
+#: src/Module/Contact.php:735
 msgid "Ignored"
 msgstr ""
 
-#: src/Module/Contact.php:736
+#: src/Module/Contact.php:738
 msgid "Only show ignored contacts"
 msgstr ""
 
-#: src/Module/Contact.php:741
+#: src/Module/Contact.php:743
 msgid "Archived"
 msgstr ""
 
-#: src/Module/Contact.php:744
+#: src/Module/Contact.php:746
 msgid "Only show archived contacts"
 msgstr ""
 
-#: src/Module/Contact.php:749
+#: src/Module/Contact.php:751
 msgid "Hidden"
 msgstr ""
 
-#: src/Module/Contact.php:752
+#: src/Module/Contact.php:754
 msgid "Only show hidden contacts"
 msgstr ""
 
-#: src/Module/Contact.php:810
+#: src/Module/Contact.php:762
+msgid "Organize your contact groups"
+msgstr ""
+
+#: src/Module/Contact.php:820
 msgid "Search your contacts"
 msgstr ""
 
-#: src/Module/Contact.php:821 src/Module/Contact.php:1089
+#: src/Module/Contact.php:831 src/Module/Contact.php:1099
 msgid "Archive"
 msgstr ""
 
-#: src/Module/Contact.php:821 src/Module/Contact.php:1089
+#: src/Module/Contact.php:831 src/Module/Contact.php:1099
 msgid "Unarchive"
 msgstr ""
 
-#: src/Module/Contact.php:824
+#: src/Module/Contact.php:834
 msgid "Batch Actions"
 msgstr ""
 
-#: src/Module/Contact.php:851
+#: src/Module/Contact.php:861
 msgid "Conversations started by this contact"
 msgstr ""
 
-#: src/Module/Contact.php:856
+#: src/Module/Contact.php:866
 msgid "Posts and Comments"
 msgstr ""
 
-#: src/Module/Contact.php:879
+#: src/Module/Contact.php:889
 msgid "View all contacts"
 msgstr ""
 
-#: src/Module/Contact.php:890
+#: src/Module/Contact.php:900
 msgid "View all common friends"
 msgstr ""
 
-#: src/Module/Contact.php:900
+#: src/Module/Contact.php:910
 msgid "Advanced Contact Settings"
 msgstr ""
 
-#: src/Module/Contact.php:986
+#: src/Module/Contact.php:996
 msgid "Mutual Friendship"
 msgstr ""
 
-#: src/Module/Contact.php:991
+#: src/Module/Contact.php:1001
 msgid "is a fan of yours"
 msgstr ""
 
-#: src/Module/Contact.php:996
+#: src/Module/Contact.php:1006
 msgid "you are a fan of"
 msgstr ""
 
-#: src/Module/Contact.php:1020
+#: src/Module/Contact.php:1030
 msgid "Edit contact"
 msgstr ""
 
-#: src/Module/Contact.php:1074
+#: src/Module/Contact.php:1084
 msgid "Toggle Blocked status"
 msgstr ""
 
-#: src/Module/Contact.php:1082
+#: src/Module/Contact.php:1092
 msgid "Toggle Ignored status"
 msgstr ""
 
-#: src/Module/Contact.php:1091
+#: src/Module/Contact.php:1101
 msgid "Toggle Archive status"
 msgstr ""
 
-#: src/Module/Contact.php:1099
+#: src/Module/Contact.php:1109
 msgid "Delete contact"
 msgstr ""
 
-#: src/Module/Install.php:118
-msgid "Friendica Communctions Server - Setup"
+#: src/Module/Install.php:120
+msgid "Friendica Communications Server - Setup"
 msgstr ""
 
-#: src/Module/Install.php:129
+#: src/Module/Install.php:131
 msgid "System check"
 msgstr ""
 
-#: src/Module/Install.php:132
-msgid "Please see the file \"Install.txt\"."
-msgstr ""
-
-#: src/Module/Install.php:134
+#: src/Module/Install.php:136
 msgid "Check again"
 msgstr ""
 
-#: src/Module/Install.php:151
+#: src/Module/Install.php:153
 msgid "Database connection"
 msgstr ""
 
-#: src/Module/Install.php:152
+#: src/Module/Install.php:154
 msgid ""
 "In order to install Friendica we need to know how to connect to your "
 "database."
 msgstr ""
 
-#: src/Module/Install.php:153
+#: src/Module/Install.php:155
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr ""
 
-#: src/Module/Install.php:154
+#: src/Module/Install.php:156
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr ""
 
-#: src/Module/Install.php:157
+#: src/Module/Install.php:159
 msgid "Database Server Name"
 msgstr ""
 
-#: src/Module/Install.php:162
+#: src/Module/Install.php:164
 msgid "Database Login Name"
 msgstr ""
 
-#: src/Module/Install.php:168
+#: src/Module/Install.php:170
 msgid "Database Login Password"
 msgstr ""
 
-#: src/Module/Install.php:170
+#: src/Module/Install.php:172
 msgid "For security reasons the password must not be empty"
 msgstr ""
 
-#: src/Module/Install.php:173
+#: src/Module/Install.php:175
 msgid "Database Name"
 msgstr ""
 
-#: src/Module/Install.php:178 src/Module/Install.php:214
+#: src/Module/Install.php:180 src/Module/Install.php:216
 msgid "Site administrator email address"
 msgstr ""
 
-#: src/Module/Install.php:180 src/Module/Install.php:214
+#: src/Module/Install.php:182 src/Module/Install.php:216
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr ""
 
-#: src/Module/Install.php:184 src/Module/Install.php:215
+#: src/Module/Install.php:186 src/Module/Install.php:217
 msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: src/Module/Install.php:208
+#: src/Module/Install.php:210
 msgid "Site settings"
 msgstr ""
 
-#: src/Module/Install.php:217
+#: src/Module/Install.php:219
 msgid "System Language:"
 msgstr ""
 
-#: src/Module/Install.php:219
+#: src/Module/Install.php:221
 msgid ""
 "Set the default language for your Friendica installation interface and to "
 "send emails."
 msgstr ""
 
-#: src/Module/Install.php:231
+#: src/Module/Install.php:233
 msgid "Your Friendica site database has been installed."
 msgstr ""
 
-#: src/Module/Install.php:239
+#: src/Module/Install.php:241
 msgid "Installation finished"
 msgstr ""
 
-#: src/Module/Install.php:260
+#: src/Module/Install.php:262
 msgid "<h1>What next</h1>"
 msgstr ""
 
-#: src/Module/Install.php:261
+#: src/Module/Install.php:263
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the worker."
 msgstr ""
 
-#: src/Module/Install.php:264
+#: src/Module/Install.php:266
 #, php-format
 msgid ""
 "Go to your new Friendica node <a href=\"%s/register\">registration page</a> "
@@ -9513,55 +9475,47 @@ msgid ""
 "administrator email. This will allow you to enter the site admin panel."
 msgstr ""
 
-#: src/Module/Itemsource.php:32
+#: src/Module/Itemsource.php:33
 msgid "Item Guid"
 msgstr ""
 
-#: src/Module/Login.php:290
+#: src/Module/Login.php:292
 msgid "Create a New Account"
 msgstr ""
 
-#: src/Module/Login.php:323
+#: src/Module/Login.php:325
 msgid "Password: "
 msgstr ""
 
-#: src/Module/Login.php:324
+#: src/Module/Login.php:326
 msgid "Remember me"
 msgstr ""
 
-#: src/Module/Login.php:327
+#: src/Module/Login.php:329
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: src/Module/Login.php:333
+#: src/Module/Login.php:335
 msgid "Forgot your password?"
 msgstr ""
 
-#: src/Module/Login.php:336
+#: src/Module/Login.php:338
 msgid "Website Terms of Service"
 msgstr ""
 
-#: src/Module/Login.php:337
+#: src/Module/Login.php:339
 msgid "terms of service"
 msgstr ""
 
-#: src/Module/Login.php:339
+#: src/Module/Login.php:341
 msgid "Website Privacy Policy"
 msgstr ""
 
-#: src/Module/Login.php:340
+#: src/Module/Login.php:342
 msgid "privacy policy"
 msgstr ""
 
-#: src/Module/Logout.php:29
-msgid "Logged out."
-msgstr ""
-
-#: src/Module/Proxy.php:136
-msgid "Bad Request."
-msgstr ""
-
-#: src/Module/Tos.php:34 src/Module/Tos.php:74
+#: src/Module/Tos.php:35 src/Module/Tos.php:75
 msgid ""
 "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 "
@@ -9574,14 +9528,14 @@ msgid ""
 "settings, it is not necessary for communication."
 msgstr ""
 
-#: src/Module/Tos.php:35 src/Module/Tos.php:75
+#: src/Module/Tos.php:36 src/Module/Tos.php:76
 msgid ""
 "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."
 msgstr ""
 
-#: src/Module/Tos.php:36 src/Module/Tos.php:76
+#: src/Module/Tos.php:37 src/Module/Tos.php:77
 #, php-format
 msgid ""
 "At any point in time a logged in user can export their account data from the "
@@ -9591,147 +9545,146 @@ msgid ""
 "data will also be requested from the nodes of the communication partners."
 msgstr ""
 
-#: src/Module/Tos.php:39 src/Module/Tos.php:73
+#: src/Module/Tos.php:40 src/Module/Tos.php:74
 msgid "Privacy Statement"
 msgstr ""
 
-#: src/Object/Post.php:131
+#: src/Object/Post.php:134
 msgid "This entry was edited"
 msgstr ""
 
-#: src/Object/Post.php:191
+#: src/Object/Post.php:197
+msgid "Delete locally"
+msgstr ""
+
+#: src/Object/Post.php:200
 msgid "Delete globally"
 msgstr ""
 
-#: src/Object/Post.php:191
+#: src/Object/Post.php:200
 msgid "Remove locally"
 msgstr ""
 
-#: src/Object/Post.php:204
+#: src/Object/Post.php:214
 msgid "save to folder"
 msgstr ""
 
-#: src/Object/Post.php:239
+#: src/Object/Post.php:249
 msgid "I will attend"
 msgstr ""
 
-#: src/Object/Post.php:239
+#: src/Object/Post.php:249
 msgid "I will not attend"
 msgstr ""
 
-#: src/Object/Post.php:239
+#: src/Object/Post.php:249
 msgid "I might attend"
 msgstr ""
 
-#: src/Object/Post.php:266
+#: src/Object/Post.php:277
 msgid "ignore thread"
 msgstr ""
 
-#: src/Object/Post.php:267
+#: src/Object/Post.php:278
 msgid "unignore thread"
 msgstr ""
 
-#: src/Object/Post.php:268
+#: src/Object/Post.php:279
 msgid "toggle ignore status"
 msgstr ""
 
-#: src/Object/Post.php:279
+#: src/Object/Post.php:290
 msgid "add star"
 msgstr ""
 
-#: src/Object/Post.php:280
+#: src/Object/Post.php:291
 msgid "remove star"
 msgstr ""
 
-#: src/Object/Post.php:281
+#: src/Object/Post.php:292
 msgid "toggle star status"
 msgstr ""
 
-#: src/Object/Post.php:284
+#: src/Object/Post.php:295
 msgid "starred"
 msgstr ""
 
-#: src/Object/Post.php:289
+#: src/Object/Post.php:299
 msgid "add tag"
 msgstr ""
 
-#: src/Object/Post.php:300
+#: src/Object/Post.php:310
 msgid "like"
 msgstr ""
 
-#: src/Object/Post.php:301
+#: src/Object/Post.php:311
 msgid "dislike"
 msgstr ""
 
-#: src/Object/Post.php:304
+#: src/Object/Post.php:314
 msgid "Share this"
 msgstr ""
 
-#: src/Object/Post.php:304
+#: src/Object/Post.php:314
 msgid "share"
 msgstr ""
 
-#: src/Object/Post.php:371
+#: src/Object/Post.php:381
 msgid "to"
 msgstr ""
 
-#: src/Object/Post.php:372
+#: src/Object/Post.php:382
 msgid "via"
 msgstr ""
 
-#: src/Object/Post.php:373
+#: src/Object/Post.php:383
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: src/Object/Post.php:374
+#: src/Object/Post.php:384
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: src/Object/Post.php:433
+#: src/Object/Post.php:444
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/App.php:784
+#: src/BaseModule.php:133
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr ""
+
+#: src/App.php:752
 msgid "Delete this item?"
 msgstr ""
 
-#: src/App.php:786
+#: src/App.php:754
 msgid "show fewer"
 msgstr ""
 
-#: src/App.php:828
+#: src/App.php:796
 msgid "toggle mobile"
 msgstr ""
 
-#: src/App.php:1473
+#: src/App.php:1345
 msgid "No system theme config value set."
 msgstr ""
 
-#: src/BaseModule.php:133
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr ""
-
 #: src/LegacyModule.php:29
 #, php-format
 msgid "Legacy module file not found: %s"
 msgstr ""
 
-#: boot.php:549
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr ""
-
-#: update.php:194
+#: update.php:195
 #, php-format
 msgid "%s: Updating author-id and owner-id in item and thread table. "
 msgstr ""
 
-#: update.php:240
+#: update.php:241
 #, php-format
 msgid "%s: Updating post-type."
 msgstr ""