From 27cf228857a84cd5d4e87d8f9803f9589a33e9f7 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 28 Aug 2018 06:48:57 +0200
Subject: [PATCH 01/96] welcome 2018.08-rc

---
 VERSION  | 2 +-
 boot.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 607ef5eb6a..40284ee692 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2018.08-dev
+2018.08-rc
diff --git a/boot.php b/boot.php
index b1e98270c0..2236a4d5df 100644
--- a/boot.php
+++ b/boot.php
@@ -39,7 +39,7 @@ require_once 'include/text.php';
 
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
-define('FRIENDICA_VERSION',      '2018.08-dev');
+define('FRIENDICA_VERSION',      '2018.08-rc');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
 define('DB_UPDATE_VERSION',      1283);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);

From cf6140e86f64c651168c7687179adc7114770f40 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 28 Aug 2018 11:56:25 +0000
Subject: [PATCH 02/96] Ensure that the post update doesn't end prematurely
 (#5684)

---
 src/Database/PostUpdate.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index 09e940b149..674fe05531 100644
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -253,6 +253,12 @@ class PostUpdate
 		$condition = ["`id` > ?", $id];
 		$params = ['order' => ['id'], 'limit' => 10000];
 		$items = Item::select($fields, $condition, $params);
+
+		if (DBA::errorNo() != 0) {
+			logger('Database error ' . DBA::errorNo() . ':' . DBA::errorMessage());
+			return false;
+		}
+
 		while ($item = Item::fetch($items)) {
 			$id = $item['id'];
 
@@ -394,6 +400,12 @@ class PostUpdate
 		$condition = ["`id` > ?", $id];
 		$params = ['order' => ['id'], 'limit' => 10000];
 		$items = DBA::select('item', $fields, $condition, $params);
+
+		if (DBA::errorNo() != 0) {
+			logger('Database error ' . DBA::errorNo() . ':' . DBA::errorMessage());
+			return false;
+		}
+
 		while ($item = DBA::fetch($items)) {
 			$id = $item['id'];
 

From 8872d86f8d832a26c4f45eab515ffdaff21724db Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 28 Aug 2018 17:41:09 +0200
Subject: [PATCH 03/96] CS translation update THX Aditoo

---
 view/lang/cs/messages.po | 38 +++++++++++++++++++-------------------
 view/lang/cs/strings.php | 36 ++++++++++++++++++------------------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/view/lang/cs/messages.po b/view/lang/cs/messages.po
index 588fdc42ba..8852b2fc32 100644
--- a/view/lang/cs/messages.po
+++ b/view/lang/cs/messages.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-25 15:34+0000\n"
-"PO-Revision-Date: 2018-08-26 15:02+0000\n"
+"PO-Revision-Date: 2018-08-28 14:24+0000\n"
 "Last-Translator: Aditoo\n"
 "Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -72,27 +72,27 @@ msgstr "výchozí"
 
 #: view/theme/duepuntozero/config.php:55
 msgid "greenzero"
-msgstr "zelená nula"
+msgstr "greenzero"
 
 #: view/theme/duepuntozero/config.php:56
 msgid "purplezero"
-msgstr "fialová nula"
+msgstr "purplezero"
 
 #: view/theme/duepuntozero/config.php:57
 msgid "easterbunny"
-msgstr "velikonoční zajíček"
+msgstr "easterbunny"
 
 #: view/theme/duepuntozero/config.php:58
 msgid "darkzero"
-msgstr "tmavá nula"
+msgstr "darkzero"
 
 #: view/theme/duepuntozero/config.php:59
 msgid "comix"
-msgstr "komiksová"
+msgstr "comix"
 
 #: view/theme/duepuntozero/config.php:60
 msgid "slackr"
-msgstr "flákač"
+msgstr "slackr"
 
 #: view/theme/duepuntozero/config.php:71 view/theme/quattro/config.php:73
 #: view/theme/vier/config.php:119 view/theme/frio/config.php:118
@@ -146,7 +146,7 @@ msgstr "Seznam fór s pomocníky, oddělených čárkami"
 
 #: view/theme/vier/config.php:115 src/Core/ACL.php:298
 msgid "don't show"
-msgstr "nikdy nezobrazit"
+msgstr "nezobrazit"
 
 #: view/theme/vier/config.php:115 src/Core/ACL.php:297
 msgid "show"
@@ -193,7 +193,7 @@ msgstr "Zadejte jméno nebo zájmy"
 #: mod/allfriends.php:76 mod/contacts.php:604 mod/contacts.php:610
 #: mod/follow.php:143 src/Model/Contact.php:933 src/Content/Widget.php:61
 msgid "Connect/Follow"
-msgstr "Spojit/Sledovat"
+msgstr "Spojit/sledovat"
 
 #: view/theme/vier/theme.php:200 src/Content/Widget.php:62
 msgid "Examples: Robert Morgenstein, Fishing"
@@ -245,7 +245,7 @@ msgstr "zobrazit více"
 
 #: view/theme/vier/theme.php:289
 msgid "Quick Start"
-msgstr "Rychlý start"
+msgstr "Rychlý začátek"
 
 #: view/theme/vier/theme.php:295 mod/help.php:56 src/Content/Nav.php:134
 msgid "Help"
@@ -551,7 +551,7 @@ msgstr "%1$s šťouchnul/a uživatele %2$s"
 #: include/conversation.php:309 mod/tagger.php:108
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s označil/a %3$s uživatele %2$s jako %4$s"
+msgstr "%1$s označil/a %3$s uživatele %2$s štítkem %4$s"
 
 #: include/conversation.php:331
 msgid "post/item"
@@ -1093,7 +1093,7 @@ msgstr "[Friendica:Oznámení] %s označil/a Váš příspěvek"
 #: include/enotify.php:270
 #, php-format
 msgid "%1$s tagged your post at %2$s"
-msgstr "%1$s označil/a Váš příspěvek na%2$s"
+msgstr "%1$s označil/a Váš příspěvek na %2$s"
 
 #: include/enotify.php:271
 #, php-format
@@ -3818,7 +3818,7 @@ msgstr "Pro více informací o projektu Friendica, prosím, navštivte stránku
 
 #: mod/friendica.php:88
 msgid "Bug reports and issues: please visit"
-msgstr "Pro hlášení chyb a námětů na změny navštivte"
+msgstr "Pro hlášení chyb a námětů na změny prosím navštivte"
 
 #: mod/friendica.php:88
 msgid "the bugtracker at github"
@@ -4721,23 +4721,23 @@ msgstr "Normální účet"
 
 #: mod/admin.php:883
 msgid "Automatic Follower Account"
-msgstr "Automatický účet sledovatele"
+msgstr "Účet s automatickými sledovateli"
 
 #: mod/admin.php:884
 msgid "Public Forum Account"
-msgstr "Veřejný účet na fóru"
+msgstr "Účet veřejného fóra"
 
 #: mod/admin.php:885
 msgid "Automatic Friend Account"
-msgstr "Účet s automatickým schvalováním přátel"
+msgstr "Účet s automatickými přáteli"
 
 #: mod/admin.php:886
 msgid "Blog Account"
-msgstr "Účet Blogu"
+msgstr "Blogovací účet"
 
 #: mod/admin.php:887
 msgid "Private Forum Account"
-msgstr "Soukromá účet na fóru"
+msgstr "Účet soukromého fóra"
 
 #: mod/admin.php:909
 msgid "Message queues"
@@ -4822,7 +4822,7 @@ msgstr "Jeden rok"
 
 #: mod/admin.php:1368
 msgid "Multi user instance"
-msgstr "Více uživatelská instance"
+msgstr "Víceuživatelská instance"
 
 #: mod/admin.php:1394
 msgid "Closed"
diff --git a/view/lang/cs/strings.php b/view/lang/cs/strings.php
index d775ebe3de..f78c139ca2 100644
--- a/view/lang/cs/strings.php
+++ b/view/lang/cs/strings.php
@@ -13,12 +13,12 @@ $a->strings["Permission denied"] = "Nedostatečné oprávnění";
 $a->strings["Permission denied."] = "Přístup odmítnut.";
 $a->strings["toggle mobile"] = "přepínat mobilní zobrazení";
 $a->strings["default"] = "výchozí";
-$a->strings["greenzero"] = "zelená nula";
-$a->strings["purplezero"] = "fialová nula";
-$a->strings["easterbunny"] = "velikonoční zajíček";
-$a->strings["darkzero"] = "tmavá nula";
-$a->strings["comix"] = "komiksová";
-$a->strings["slackr"] = "flákač";
+$a->strings["greenzero"] = "greenzero";
+$a->strings["purplezero"] = "purplezero";
+$a->strings["easterbunny"] = "easterbunny";
+$a->strings["darkzero"] = "darkzero";
+$a->strings["comix"] = "comix";
+$a->strings["slackr"] = "slackr";
 $a->strings["Submit"] = "Odeslat";
 $a->strings["Theme settings"] = "Nastavení motivu";
 $a->strings["Variations"] = "Variace";
@@ -29,7 +29,7 @@ $a->strings["Color scheme"] = "Barevné schéma";
 $a->strings["Posts font size"] = "Velikost písma u příspěvků";
 $a->strings["Textareas font size"] = "Velikost písma textů";
 $a->strings["Comma separated list of helper forums"] = "Seznam fór s pomocníky, oddělených čárkami";
-$a->strings["don't show"] = "nikdy nezobrazit";
+$a->strings["don't show"] = "nezobrazit";
 $a->strings["show"] = "zobrazit";
 $a->strings["Set style"] = "Nastavit styl";
 $a->strings["Community Pages"] = "Komunitní stránky";
@@ -40,7 +40,7 @@ $a->strings["Find Friends"] = "Najít přátele";
 $a->strings["Last users"] = "Poslední uživatelé";
 $a->strings["Find People"] = "Najít lidi";
 $a->strings["Enter name or interest"] = "Zadejte jméno nebo zájmy";
-$a->strings["Connect/Follow"] = "Spojit/Sledovat";
+$a->strings["Connect/Follow"] = "Spojit/sledovat";
 $a->strings["Examples: Robert Morgenstein, Fishing"] = "Příklady: Josef Dvořák, rybaření";
 $a->strings["Find"] = "Najít";
 $a->strings["Friend Suggestions"] = "Návrhy přátel";
@@ -52,7 +52,7 @@ $a->strings["Local Directory"] = "Lokální adresář";
 $a->strings["Forums"] = "Fóra";
 $a->strings["External link to forum"] = "Externí odkaz na fórum";
 $a->strings["show more"] = "zobrazit více";
-$a->strings["Quick Start"] = "Rychlý start";
+$a->strings["Quick Start"] = "Rychlý začátek";
 $a->strings["Help"] = "Nápověda";
 $a->strings["Custom"] = "Vlastní";
 $a->strings["Note"] = "Poznámka";
@@ -117,7 +117,7 @@ $a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s se neúčastní %3\$s
 $a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "%1\$s se možná účastní %3\$s uživatele %2\$s";
 $a->strings["%1\$s is now friends with %2\$s"] = "%1\$s se nyní přátelí s uživatelem %2\$s";
 $a->strings["%1\$s poked %2\$s"] = "%1\$s šťouchnul/a uživatele %2\$s";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s označil/a %3\$s uživatele %2\$s jako %4\$s";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s označil/a %3\$s uživatele %2\$s štítkem %4\$s";
 $a->strings["post/item"] = "příspěvek/položka";
 $a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s označil/a %3\$s uživatele %2\$s jako oblíbené";
 $a->strings["Likes"] = "Libí se";
@@ -256,7 +256,7 @@ $a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica:Oznámení] %1\$
 $a->strings["%1\$s poked you at %2\$s"] = "%1\$s Vás šťouchnul/a na %2\$s";
 $a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s [url=%2\$s]Vás šťouchnul/a[/url].";
 $a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Oznámení] %s označil/a Váš příspěvek";
-$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s označil/a Váš příspěvek na%2\$s";
+$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s označil/a Váš příspěvek na %2\$s";
 $a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s označil/a [url=%2\$s]Váš příspěvek[/url]";
 $a->strings["[Friendica:Notify] Introduction received"] = "[Friendica:Oznámení] Obdrženo představení";
 $a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Obdržel/a jste představení od uživatele \"%1\$s\" na %2\$s";
@@ -899,7 +899,7 @@ $a->strings["Ignore/Hide"] = "Ignorovat/skrýt";
 $a->strings["- select -"] = "- vyberte -";
 $a->strings["This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s."] = "Tohle je Friendica, verze %s, běžící na webové adrese %s. Verze databáze je %s, verze post update je %s.";
 $a->strings["Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more about the Friendica project."] = "Pro více informací o projektu Friendica, prosím, navštivte stránku <a href=\"https://friendi.ca\">Friendi.ca</a>";
-$a->strings["Bug reports and issues: please visit"] = "Pro hlášení chyb a námětů na změny navštivte";
+$a->strings["Bug reports and issues: please visit"] = "Pro hlášení chyb a námětů na změny prosím navštivte";
 $a->strings["the bugtracker at github"] = "sledování chyb na GitHubu";
 $a->strings["Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"] = "Návrhy, pochvaly atd., prosím, posílejte na adresu \"info\" zavináč \"friendi\"-tečka-\"ca\"";
 $a->strings["Installed addons/apps:"] = "Nainstalované doplňky/aplikace:";
@@ -1090,11 +1090,11 @@ $a->strings["The last worker execution was on %s UTC. This is older than one hou
 $a->strings["Friendica's configuration now is stored in config/local.ini.php, please copy config/local-sample.ini.php and move your config from <code>.htconfig.php</code>. See <a href=\"%s\">the Config help page</a> for help with the transition."] = "Konfigurace Friendica je nyní uložena v souboru config/local.ini.php, prosím zkopírujte soubor config/local-sample.ini.php a přesuňte svou konfiguraci ze souboru <code>.htconfig.php</code>. Pro pomoc při přechodu navštivte <a href=\"%s\">stránku Config v sekci nápovědy</a>.";
 $a->strings["<a href=\"%s\">%s</a> is not reachable on your system. This is a servere configuration issue that prevents the communication.. See <a href=\"%s\">the installation page</a> for help."] = "<a href=\"%s\">%s</a> není na Vašem systému dosažitelné. Tohle je závažná chyba konfigurace, která brání komunikaci. Pro pomoc navštivte <a href=\"%s\">stránku instalace</a>.";
 $a->strings["Normal Account"] = "Normální účet";
-$a->strings["Automatic Follower Account"] = "Automatický účet sledovatele";
-$a->strings["Public Forum Account"] = "Veřejný účet na fóru";
-$a->strings["Automatic Friend Account"] = "Účet s automatickým schvalováním přátel";
-$a->strings["Blog Account"] = "Účet Blogu";
-$a->strings["Private Forum Account"] = "Soukromá účet na fóru";
+$a->strings["Automatic Follower Account"] = "Účet s automatickými sledovateli";
+$a->strings["Public Forum Account"] = "Účet veřejného fóra";
+$a->strings["Automatic Friend Account"] = "Účet s automatickými přáteli";
+$a->strings["Blog Account"] = "Blogovací účet";
+$a->strings["Private Forum Account"] = "Účet soukromého fóra";
 $a->strings["Message queues"] = "Fronty zpráv";
 $a->strings["Summary"] = "Shrnutí";
 $a->strings["Registered users"] = "Registrovaní uživatelé";
@@ -1115,7 +1115,7 @@ $a->strings["One month"] = "Jeden měsíc";
 $a->strings["Three months"] = "Tři měsíce";
 $a->strings["Half a year"] = "Půl roku";
 $a->strings["One year"] = "Jeden rok";
-$a->strings["Multi user instance"] = "Více uživatelská instance";
+$a->strings["Multi user instance"] = "Víceuživatelská instance";
 $a->strings["Closed"] = "Uzavřeno";
 $a->strings["Requires approval"] = "Vyžaduje schválení";
 $a->strings["Open"] = "Otevřená";

From 91a3bf5610910da8709f0fe9aa3de2201efb124e Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 28 Aug 2018 18:15:25 +0000
Subject: [PATCH 04/96] Fix: The profile page is now ordered after the creation
 date again (#5690)

---
 mod/profile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/profile.php b/mod/profile.php
index 4f2e22d674..2e3ccd28c5 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -333,7 +333,7 @@ function profile_content(App $a, $update = 0)
 		}
 	}
 
-	$o .= conversation($a, $items, 'profile', $update, false, 'commented', local_user());
+	$o .= conversation($a, $items, 'profile', $update, false, 'created', local_user());
 
 	if (!$update) {
 		$o .= alt_pager($a, count($items));

From 99b8f856242346a046152ebe9033846e06c35f3b Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 28 Aug 2018 19:38:28 +0000
Subject: [PATCH 05/96] Poke is fixed (#5689)

* Fix: Poke hasn't worked. It does work now partially

* Poke are now displayed good again

* removed code
---
 include/conversation.php |  3 +--
 mod/poke.php             | 37 ++++++++++++++++++-------------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index ca01997f6a..f10c79d4be 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -229,12 +229,11 @@ function localize_item(&$item)
 		$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
 
 		$obj = XML::parseString($xmlhead.$item['object']);
-		$links = XML::parseString($xmlhead."<links>".unxmlify($obj->link)."</links>");
 
 		$Bname = $obj->title;
 		$Blink = "";
 		$Bphoto = "";
-		foreach ($links->link as $l) {
+		foreach ($obj->link as $l) {
 			$atts = $l->attributes();
 			switch ($atts['rel']) {
 				case "alternate": $Blink = $atts['href'];
diff --git a/mod/poke.php b/mod/poke.php
index a9dfc73f4e..91f33c0def 100644
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -24,19 +24,20 @@ use Friendica\Model\Item;
 require_once 'include/security.php';
 require_once 'include/items.php';
 
-function poke_init(App $a) {
-
+function poke_init(App $a)
+{
 	if (!local_user()) {
 		return;
 	}
 
 	$uid = local_user();
-	$verb = notags(trim($_GET['verb']));
 
-	if (!$verb) {
+	if (empty($_GET['verb'])) {
 		return;
 	}
 
+	$verb = notags(trim($_GET['verb']));
+
 	$verbs = get_poke_verbs();
 
 	if (!array_key_exists($verb, $verbs)) {
@@ -99,7 +100,7 @@ function poke_init(App $a) {
 	$arr['guid']          = System::createGUID(32);
 	$arr['uid']           = $uid;
 	$arr['uri']           = $uri;
-	$arr['parent-uri']    = ($parent_uri ? $parent_uri : $uri);
+	$arr['parent-uri']    = (!empty($parent_uri) ? $parent_uri : $uri);
 	$arr['wall']          = 1;
 	$arr['contact-id']    = $poster['id'];
 	$arr['owner-name']    = $poster['name'];
@@ -121,7 +122,7 @@ function poke_init(App $a) {
 	$arr['origin']        = 1;
 	$arr['body']          = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . L10n::t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]';
 
-	$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . System::baseUrl() . '/contact/' . $target['id'] . '</id>';
+	$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . $target['url'] . '</id>';
 	$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $target['url'] . '" />' . "\n");
 
 	$arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $target['photo'] . '" />' . "\n");
@@ -137,10 +138,8 @@ function poke_init(App $a) {
 	return;
 }
 
-
-
-function poke_content(App $a) {
-
+function poke_content(App $a)
+{
 	if (!local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
 		return;
@@ -149,17 +148,17 @@ function poke_content(App $a) {
 	$name = '';
 	$id = '';
 
-	if (intval($_GET['c'])) {
-		$r = q("SELECT `id`,`name` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($_GET['c']),
-			intval(local_user())
-		);
-		if (DBA::isResult($r)) {
-			$name = $item['name'];
-			$id = $item['id'];
-		}
+	if (empty($_GET['c'])) {
+		return;
 	}
 
+	$contact = DBA::selectFirst('contact', ['id', 'name'], ['id' => $_GET['c'], 'uid' => local_user()]);
+	if (!DBA::isResult($contact)) {
+		return;
+	}
+
+	$name = $contact['name'];
+	$id = $contact['id'];
 
 	$base = System::baseUrl();
 

From d489712824a8f3fe9840ae793a2be16149afcfcb Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 29 Aug 2018 11:48:40 +0000
Subject: [PATCH 06/96] The post update version can now be set.

---
 src/Core/Console/PostUpdate.php | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/Core/Console/PostUpdate.php b/src/Core/Console/PostUpdate.php
index 97c19b0c1e..2ae640d483 100644
--- a/src/Core/Console/PostUpdate.php
+++ b/src/Core/Console/PostUpdate.php
@@ -3,6 +3,7 @@
 namespace Friendica\Core\Console;
 
 use Friendica\Core\L10n;
+use Friendica\Core\Config;
 
 /**
  * @brief tool to block an account from the node
@@ -17,12 +18,39 @@ use Friendica\Core\L10n;
  */
 class PostUpdate extends \Asika\SimpleConsole\Console
 {
+        protected $helpOptions = ['h', 'help', '?'];
+
+        protected function getHelp()
+        {
+                $help = <<<HELP
+console postupdate - Does database post updates
+Usage
+        bin/console postupdate [-h|--help|-?] [--reset <version>]
+
+Options
+    -h|--help|-?      Show help information
+    --reset <version> Reset the post update version
+HELP;
+                return $help;
+        }
+
 	protected function doExecute()
 	{
 		$a = get_app();
 
-		if (count($this->args) > 0) {
-			throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
+		if ($this->getOption($this->helpOptions)) {
+			$this->out($this->getHelp());
+			return 0;
+		}
+
+		$reset_version = $this->getOption('reset');
+		if (is_bool($reset_version)) {
+			$this->out($this->getHelp());
+			return 0;
+		} elseif ($reset_version) {
+			Config::set('system', 'post_update_version', $reset_version);
+			echo L10n::t('Post update version number has been set to %s.', $reset_version) . "\n";
+			return 0;
 		}
 
 		if ($a->isInstallMode()) {

From 601851f3d0b5439f75c6e984733e850c7beed40c Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Wed, 29 Aug 2018 13:00:01 +0000
Subject: [PATCH 07/96] Removed notice - pokes do now work mostly (#5693)

---
 include/conversation.php | 3 ++-
 src/Protocol/DFRN.php    | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/include/conversation.php b/include/conversation.php
index f10c79d4be..45e5d1caa3 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -231,8 +231,9 @@ function localize_item(&$item)
 		$obj = XML::parseString($xmlhead.$item['object']);
 
 		$Bname = $obj->title;
-		$Blink = "";
+		$Blink = $obj->id;
 		$Bphoto = "";
+
 		foreach ($obj->link as $l) {
 			$atts = $l->attributes();
 			switch ($atts['rel']) {
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 0b228b045b..759f7f5f28 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2252,6 +2252,11 @@ class DFRN
 			if ($Blink && link_compare($Blink, System::baseUrl() . "/profile/" . $importer["nickname"])) {
 				$author = DBA::selectFirst('contact', ['name', 'thumb', 'url'], ['id' => $item['author-id']]);
 
+				$item['id'] = $posted_id;
+
+				$parent = Item::selectFirst(['id'], ['uri' => $item['parent-uri'], 'uid' => $importer["importer_uid"]]);
+				$item["parent"] = $parent['id'];
+
 				// send a notification
 				notification(
 					[

From 67227570d8e9e769fdc5c0383cf56b207372302c Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 29 Aug 2018 13:06:56 +0000
Subject: [PATCH 08/96] "Does" is now "perform"

---
 src/Core/Console/DatabaseStructure.php | 4 ++--
 src/Core/Console/PostUpdate.php        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Core/Console/DatabaseStructure.php b/src/Core/Console/DatabaseStructure.php
index 1b64622dbf..13ed29b9df 100644
--- a/src/Core/Console/DatabaseStructure.php
+++ b/src/Core/Console/DatabaseStructure.php
@@ -11,7 +11,7 @@ require_once 'boot.php';
 require_once 'include/dba.php';
 
 /**
- * @brief Does database updates from the command line
+ * @brief Performs database updates from the command line
  *
  * @author Hypolite Petovan <mrpetovan@gmail.com>
  */
@@ -22,7 +22,7 @@ class DatabaseStructure extends \Asika\SimpleConsole\Console
 	protected function getHelp()
 	{
 		$help = <<<HELP
-console dbstructure - Does database updates
+console dbstructure - Performs database updates
 Usage
 	bin/console dbstructure <command> [-h|--help|-?] [-v]
 
diff --git a/src/Core/Console/PostUpdate.php b/src/Core/Console/PostUpdate.php
index 2ae640d483..3162a725c0 100644
--- a/src/Core/Console/PostUpdate.php
+++ b/src/Core/Console/PostUpdate.php
@@ -23,7 +23,7 @@ class PostUpdate extends \Asika\SimpleConsole\Console
         protected function getHelp()
         {
                 $help = <<<HELP
-console postupdate - Does database post updates
+console postupdate - Performs database post updates
 Usage
         bin/console postupdate [-h|--help|-?] [--reset <version>]
 

From c7f8f190b9f14c28fe811a2f244534027344e7cc Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Wed, 29 Aug 2018 18:28:13 +0000
Subject: [PATCH 09/96] Oh no, even more notices ... (#5697)

---
 mod/videos.php     | 3 ++-
 src/Model/User.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mod/videos.php b/mod/videos.php
index e622e17f0f..e00df10a24 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -367,11 +367,12 @@ function videos_content(App $a)
 		foreach ($r as $rr) {
 			$alt_e = $rr['filename'];
 			/// @todo The album isn't part of the above query. This seems to be some unfinished code that needs to be reworked completely.
+			$rr['album'] = '';
 			$name_e = $rr['album'];
 
 			$videos[] = [
 				'id'       => $rr['id'],
-				'link'     => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['resource-id'],
+				'link'     => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['hash'],
 				'title'    => L10n::t('View Video'),
 				'src'      => System::baseUrl() . '/attach/' . $rr['id'] . '?attachment=0',
 				'alt'      => $alt_e,
diff --git a/src/Model/User.php b/src/Model/User.php
index a43ef06f97..d65e7d8f96 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -730,7 +730,7 @@ class User
 		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($t . " + 7 day")], ['uid' => $uid]);
+		DBA::update('user', ['account_removed' => true, 'account_expires_on' => DateTimeFormat::utc(DateTimeFormat::utcNow() . " + 7 day")], ['uid' => $uid]);
 		Worker::add(PRIORITY_HIGH, "Notifier", "removeme", $uid);
 
 		// Send an update to the directory

From b8e8b771d4ead88ae08b062fa9fce9352ba3b5b4 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 29 Aug 2018 18:52:48 +0000
Subject: [PATCH 10/96] Issue 5696: Removed old forum link

---
 doc/Developers-Intro.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/Developers-Intro.md b/doc/Developers-Intro.md
index 1e077902d6..5deaf98ff0 100644
--- a/doc/Developers-Intro.md
+++ b/doc/Developers-Intro.md
@@ -33,7 +33,7 @@ If you don't want to translate the UI, or it is already done to your satisfactio
 Are you good at designing things?
 If you have seen Friendica you probably have ideas to improve it, haven't you?
 
-* If you would like to work with us on enhancing the user interface, please join the [UX Watchdogs forum](https://fc.oscp.info/profile/ux-watchdogs)
+* If you would like to work with us on enhancing the user interface, please join the [forum for Friendica development](https://forum.friendi.ca/profile/developers).
 * Make plans for a better Friendica interface design and share them with us.
 * Tell us if you are able to realize your ideas or what kind of help you need.
 	We can't promise we have the right skills in the group but we'll try.

From 9bff31f18f35acba405724f0dacdf20b0c6e8ba4 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 29 Aug 2018 19:11:43 +0000
Subject: [PATCH 11/96] Issue 5691: Post dates of feeds sometimes had been
 wrong

---
 src/Protocol/Feed.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index c9c750a83f..0709a9550e 100644
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -271,9 +271,14 @@ class Feed {
 			}
 			$updated = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $entry);
 
-			if (empty($updated)) {
+			if (empty($updated) && !empty($published)) {
 				$updated = $published;
 			}
+
+			if (empty($published) && !empty($updated)) {
+				$published = $updated;
+			}
+
 			if ($published != "") {
 				$item["created"] = $published;
 			}

From c72d1bc8fda4f1088657885fbb47d128a9f4bcad Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 29 Aug 2018 20:46:52 +0000
Subject: [PATCH 12/96] Issue 5653: The mastodonemoji addon hadn't got all
 needed data.

---
 src/Model/Item.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Model/Item.php b/src/Model/Item.php
index d235f0a7f9..d10a211a59 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1462,15 +1462,6 @@ class Item extends BaseObject
 			return 0;
 		}
 
-		// These fields aren't stored anymore in the item table, they are fetched upon request
-		unset($item['author-link']);
-		unset($item['author-name']);
-		unset($item['author-avatar']);
-
-		unset($item['owner-link']);
-		unset($item['owner-name']);
-		unset($item['owner-avatar']);
-
 		if ($item['network'] == Protocol::PHANTOM) {
 			logger('Missing network. Called by: '.System::callstack(), LOGGER_DEBUG);
 
@@ -1708,6 +1699,15 @@ class Item extends BaseObject
 		unset($item['postopts']);
 		unset($item['inform']);
 
+		// These fields aren't stored anymore in the item table, they are fetched upon request
+		unset($item['author-link']);
+		unset($item['author-name']);
+		unset($item['author-avatar']);
+
+		unset($item['owner-link']);
+		unset($item['owner-name']);
+		unset($item['owner-avatar']);
+
 		DBA::transaction();
 		$ret = DBA::insert('item', $item);
 

From 02da8275602ab7b360ebfab8e0e2072d2c39aa42 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 30 Aug 2018 04:05:32 +0000
Subject: [PATCH 13/96] and now for something completely different: A removed
 notice

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

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 7052205e17..551b4ad887 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -351,7 +351,7 @@ class OStatus
 		$header["origin"] = 0;
 		$header["gravity"] = GRAVITY_COMMENT;
 
-		if (!is_object($doc->firstChild)) {
+		if (!is_object($doc->firstChild) || empty($doc->firstChild->tagName)) {
 			return false;
 		}
 

From a3570d00273b974270620ccbd5e080d628f422ec Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 30 Aug 2018 09:52:38 +0000
Subject: [PATCH 14/96] Fix: Missing gserver entries - show correct server
 platform

---
 src/Model/Contact.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 3e70a5cbde..d53126f6ff 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1076,6 +1076,11 @@ class Contact extends BaseObject
 
 		if (empty($data)) {
 			$data = Probe::uri($url, "", $uid);
+
+			// Ensure that there is a gserver entry
+			if (!empty($data['baseurl']) && ($data['network'] != Protocol::PHANTOM)) {
+				PortableContact::checkServer($data['baseurl']);
+			}
 		}
 
 		// Last try in gcontact for unsupported networks

From e480da788e7d44f0704441f8879c5ff93d98eaf0 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 30 Aug 2018 08:27:31 -0400
Subject: [PATCH 15/96] Fix unfollow for sharing-only contacts

- Add removal when unfollowing sharing-only contacts
---
 mod/unfollow.php | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/mod/unfollow.php b/mod/unfollow.php
index 5c00726e27..5942171247 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -27,29 +27,37 @@ function unfollow_post(App $a)
 	$url = notags(trim($_REQUEST['url']));
 	$return_url = $_SESSION['return_url'];
 
-	$condition = ["`uid` = ? AND `rel` = ? AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
-			$uid, Contact::FRIEND, normalise_link($url),
+	$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
+			$uid, Contact::SHARING, Contact::FRIEND, normalise_link($url),
 			normalise_link($url), $url, Protocol::STATUSNET];
 	$contact = DBA::selectFirst('contact', [], $condition);
 
 	if (!DBA::isResult($contact)) {
 		notice(L10n::t("Contact wasn't found or can't be unfollowed."));
-	} else {
-		if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN])) {
-			$r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
-				WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
-				intval($uid)
-			);
-			if (DBA::isResult($r)) {
-				Contact::terminateFriendship($r[0], $contact);
-			}
-		}
-		DBA::update('contact', ['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);
-
-		info(L10n::t('Contact unfollowed').EOL);
-		goaway(System::baseUrl().'/contacts/'.$contact['id']);
+		goaway($return_url);
 	}
-	goaway($return_url);
+
+	if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN])) {
+		$r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
+			WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
+			intval($uid)
+		);
+		if (DBA::isResult($r)) {
+			Contact::terminateFriendship($r[0], $contact);
+		}
+	}
+
+	// Sharing-only contacts get deleted as there no relationship any more
+	if ($contact['rel'] == Contact::SHARING) {
+		Contact::remove($contact['id']);
+		$return_path = 'contacts';
+	} else {
+		DBA::update('contact', ['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);
+		$return_path = 'contacts/' . $contact['id'];
+	}
+
+	info(L10n::t('Contact unfollowed'));
+	goaway($return_path);
 	// NOTREACHED
 }
 
@@ -66,8 +74,8 @@ function unfollow_content(App $a)
 
 	$submit = L10n::t('Submit Request');
 
-	$condition = ["`uid` = ? AND `rel` = ? AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
-			local_user(), Contact::FRIEND, normalise_link($url),
+	$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
+			local_user(), Contact::SHARING, Contact::FRIEND, normalise_link($url),
 			normalise_link($url), $url, Protocol::STATUSNET];
 
 	$contact = DBA::selectFirst('contact', ['url', 'network', 'addr', 'name'], $condition);

From b81eaec88576dbbfa5f447df18a36a1866d19a1d Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 30 Aug 2018 08:52:15 -0400
Subject: [PATCH 16/96] Enable unfollowing contacts from all networks (but
 Statusnet)

---
 mod/contacts.php |  2 +-
 mod/unfollow.php | 29 ++++++++++++++++++-----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/mod/contacts.php b/mod/contacts.php
index 4e87697172..38896a611a 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -595,7 +595,7 @@ function contacts_content(App $a, $update = 0)
 		/// @todo Only show the following link with DFRN when the remote version supports it
 		$follow = '';
 		$follow_text = '';
-		if (in_array($contact['network'], [Protocol::DIASPORA, Protocol::OSTATUS, Protocol::DFRN])) {
+		if ($contact['network'] != Protocol::STATUSNET) {
 			if (in_array($contact['rel'], [Contact::FRIEND, Contact::SHARING])) {
 				$follow = System::baseUrl(true) . "/unfollow?url=" . urlencode($contact["url"]);
 				$follow_text = L10n::t("Disconnect/Unfollow");
diff --git a/mod/unfollow.php b/mod/unfollow.php
index 5942171247..4bc64e4fc3 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -28,13 +28,20 @@ function unfollow_post(App $a)
 	$return_url = $_SESSION['return_url'];
 
 	$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
-			$uid, Contact::SHARING, Contact::FRIEND, normalise_link($url),
-			normalise_link($url), $url, Protocol::STATUSNET];
+		$uid, Contact::SHARING, Contact::FRIEND, normalise_link($url),
+		normalise_link($url), $url];
 	$contact = DBA::selectFirst('contact', [], $condition);
 
 	if (!DBA::isResult($contact)) {
-		notice(L10n::t("Contact wasn't found or can't be unfollowed."));
+		notice(L10n::t("You aren't following this contact."));
 		goaway($return_url);
+		// NOTREACHED
+	}
+
+	if ($contact['network'] == Protocol::STATUSNET) {
+		notice(L10n::t('Unfollowing is currently not supported by your network.'));
+		goaway($return_url);
+		// NOTREACHED
 	}
 
 	if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN])) {
@@ -74,21 +81,21 @@ function unfollow_content(App $a)
 
 	$submit = L10n::t('Submit Request');
 
-	$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
-			local_user(), Contact::SHARING, Contact::FRIEND, normalise_link($url),
-			normalise_link($url), $url, Protocol::STATUSNET];
+	$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
+		local_user(), Contact::SHARING, Contact::FRIEND, normalise_link($url),
+		normalise_link($url), $url];
 
 	$contact = DBA::selectFirst('contact', ['url', 'network', 'addr', 'name'], $condition);
 
 	if (!DBA::isResult($contact)) {
-		notice(L10n::t("You aren't a friend of this contact.").EOL);
-		$submit = "";
+		notice(L10n::t("You aren't following this contact."));
+		goaway('contacts');
 		// NOTREACHED
 	}
 
-	if (!in_array($contact['network'], [Protocol::DIASPORA, Protocol::OSTATUS, Protocol::DFRN])) {
-		notice(L10n::t("Unfollowing is currently not supported by your network.").EOL);
-		$submit = "";
+	if ($contact['network'] == Protocol::STATUSNET) {
+		notice(L10n::t('Unfollowing is currently not supported by your network.'));
+		goaway('contacts/' . $contact['id']);
 		// NOTREACHED
 	}
 

From 55c676d8b0074bf534049cd54dd1eae646a6c590 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 30 Aug 2018 08:54:12 -0400
Subject: [PATCH 17/96] Source cleaning mod/unfollow.php

- Normalize quotes
- Remove unneeded EOL
- Use DBA method where tasteful
---
 mod/unfollow.php | 89 +++++++++++++++++++++++-------------------------
 1 file changed, 43 insertions(+), 46 deletions(-)

diff --git a/mod/unfollow.php b/mod/unfollow.php
index 4bc64e4fc3..f82796a6b7 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -11,21 +11,22 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 
-function unfollow_post(App $a)
+function unfollow_post()
 {
+	$return_url = $_SESSION['return_url'];
+
 	if (!local_user()) {
-		notice(L10n::t('Permission denied.') . EOL);
-		goaway($_SESSION['return_url']);
+		notice(L10n::t('Permission denied.'));
+		goaway($return_url);
 		// NOTREACHED
 	}
 
 	if ($_REQUEST['cancel']) {
-		goaway($_SESSION['return_url']);
+		goaway($return_url);
 	}
 
 	$uid = local_user();
-	$url = notags(trim($_REQUEST['url']));
-	$return_url = $_SESSION['return_url'];
+	$url = notags(trim(defaults($_REQUEST, 'url', '')));
 
 	$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
 		$uid, Contact::SHARING, Contact::FRIEND, normalise_link($url),
@@ -70,8 +71,8 @@ function unfollow_post(App $a)
 
 function unfollow_content(App $a)
 {
-	if (! local_user()) {
-		notice(L10n::t('Permission denied.') . EOL);
+	if (!local_user()) {
+		notice(L10n::t('Permission denied.'));
 		goaway($_SESSION['return_url']);
 		// NOTREACHED
 	}
@@ -79,8 +80,6 @@ function unfollow_content(App $a)
 	$uid = local_user();
 	$url = notags(trim($_REQUEST['url']));
 
-	$submit = L10n::t('Submit Request');
-
 	$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
 		local_user(), Contact::SHARING, Contact::FRIEND, normalise_link($url),
 		normalise_link($url), $url];
@@ -99,58 +98,56 @@ function unfollow_content(App $a)
 		// NOTREACHED
 	}
 
-	$request = System::baseUrl()."/unfollow";
+	$request = System::baseUrl() . '/unfollow';
 	$tpl = get_markup_template('auto_request.tpl');
 
-	$r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($uid));
+	$self = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
 
-	if (!$r) {
-		notice(L10n::t('Permission denied.') . EOL);
+	if (!DBA::isResult($self)) {
+		notice(L10n::t('Permission denied.'));
 		goaway($_SESSION['return_url']);
 		// NOTREACHED
 	}
 
-	$myaddr = $r[0]["url"];
-
 	// Makes the connection request for friendica contacts easier
-	$_SESSION["fastlane"] = $contact["url"];
+	$_SESSION['fastlane'] = $contact['url'];
 
-	$header = L10n::t("Disconnect/Unfollow");
+	$header = L10n::t('Disconnect/Unfollow');
 
-	$o  = replace_macros($tpl, [
-			'$header' => htmlentities($header),
-			'$desc' => "",
-			'$pls_answer' => "",
-			'$does_know_you' => "",
-			'$add_note' => "",
-			'$page_desc' => "",
-			'$friendica' => "",
-			'$statusnet' => "",
-			'$diaspora' => "",
-			'$diasnote' => "",
-			'$your_address' => L10n::t('Your Identity Address:'),
-			'$invite_desc' => "",
-			'$emailnet' => "",
-			'$submit' => $submit,
-			'$cancel' => L10n::t('Cancel'),
-			'$nickname' => "",
-			'$name' => $contact["name"],
-			'$url' => $contact["url"],
-			'$zrl' => Contact::magicLink($contact["url"]),
-			'$url_label' => L10n::t("Profile URL"),
-			'$myaddr' => $myaddr,
-			'$request' => $request,
-			'$keywords' => "",
-			'$keywords_label' => ""
+	$o = replace_macros($tpl, [
+		'$header'        => htmlentities($header),
+		'$desc'          => '',
+		'$pls_answer'    => '',
+		'$does_know_you' => '',
+		'$add_note'      => '',
+		'$page_desc'     => '',
+		'$friendica'     => '',
+		'$statusnet'     => '',
+		'$diaspora'      => '',
+		'$diasnote'      => '',
+		'$your_address'  => L10n::t('Your Identity Address:'),
+		'$invite_desc'   => '',
+		'$emailnet'      => '',
+		'$submit'        => L10n::t('Submit Request'),
+		'$cancel'        => L10n::t('Cancel'),
+		'$nickname'      => '',
+		'$name'          => $contact['name'],
+		'$url'           => $contact['url'],
+		'$zrl'           => Contact::magicLink($contact['url']),
+		'$url_label'     => L10n::t('Profile URL'),
+		'$myaddr'        => $self['url'],
+		'$request'       => $request,
+		'$keywords'      => '',
+		'$keywords_label'=> ''
 	]);
 
-	$a->page['aside'] = "";
-	Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
+	$a->page['aside'] = '';
+	Profile::load($a, '', 0, Contact::getDetailsByURL($contact['url']));
 
 	$o .= replace_macros(get_markup_template('section_title.tpl'), ['$title' => L10n::t('Status Messages and Posts')]);
 
 	// Show last public posts
-	$o .= Contact::getPostsFromUrl($contact["url"]);
+	$o .= Contact::getPostsFromUrl($contact['url']);
 
 	return $o;
 }

From 804cfa03200456116db0c96b7f2ae6e3b7bdbfd8 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 30 Aug 2018 17:47:48 -0400
Subject: [PATCH 18/96] Reorganize Protocol constants

- Add ActivityPub protocol constant
- Add Protocol::NATIVE_SUPPORT
- Sort/group constant names
---
 src/Core/Protocol.php | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/Core/Protocol.php b/src/Core/Protocol.php
index 4467bf0027..9e96b7db2f 100644
--- a/src/Core/Protocol.php
+++ b/src/Core/Protocol.php
@@ -13,27 +13,33 @@ use Friendica\Util\Network;
  */
 class Protocol
 {
-	const DFRN      = 'dfrn';    // Friendica, Mistpark, other DFRN implementations
-	const DIASPORA  = 'dspr';    // Diaspora
-	const DIASPORA2 = 'dspc';    // Diaspora connector
-	const STATUSNET = 'stac';    // Statusnet connector
-	const OSTATUS   = 'stat';    // GNU-social, Pleroma, Mastodon, other OStatus implementations
-	const FEED      = 'feed';    // RSS/Atom feeds with no known "post/notify" protocol
-	const MAIL      = 'mail';    // IMAP/POP
-	const XMPP      = 'xmpp';    // XMPP - Currently unsupported
+	// Native support
+	const ACTIVITYPUB = 'apub';    // ActivityPub
+	const DFRN        = 'dfrn';    // Friendica, Mistpark, other DFRN implementations
+	const DIASPORA    = 'dspr';    // Diaspora
+	const FEED        = 'feed';    // RSS/Atom feeds with no known "post/notify" protocol
+	const MAIL        = 'mail';    // IMAP/POP
+	const OSTATUS     = 'stat';    // GNU-social, Pleroma, Mastodon, other OStatus implementations
 
-	const FACEBOOK  = 'face';    // Facebook API
-	const LINKEDIN  = 'lnkd';    // LinkedIn
-	const MYSPACE   = 'mysp';    // MySpace - Currently unsupported
-	const GPLUS     = 'goog';    // Google+
-	const PUMPIO    = 'pump';    // pump.io
-	const TWITTER   = 'twit';    // Twitter
+	const NATIVE_SUPPORT = [self::DFRN, self::DIASPORA, self::OSTATUS, self::FEED, self::MAIL, self::ACTIVITYPUB];
+
+	// Supported through a connector
 	const APPNET    = 'apdn';    // app.net - Dead protocol
+	const DIASPORA2 = 'dspc';    // Diaspora connector
+	const FACEBOOK  = 'face';    // Facebook API
+	const GPLUS     = 'goog';    // Google+
+	const LINKEDIN  = 'lnkd';    // LinkedIn
+	const PUMPIO    = 'pump';    // pump.io
+	const STATUSNET = 'stac';    // Statusnet connector
+	const TWITTER   = 'twit';    // Twitter
 
-	const NEWS      = 'nntp';    // Network News Transfer Protocol - Currently unsupported
-	const ICALENDAR = 'ical';    // iCalendar - Currently unsupported
-	const PNUT      = 'pnut';    // pnut.io - Currently unsupported
-	const ZOT       = 'zot!';    // Zot! - Currently unsupported
+	// Currently unsupported
+	const ICALENDAR = 'ical';    // iCalendar
+	const MYSPACE   = 'mysp';    // MySpace
+	const NEWS      = 'nntp';    // Network News Transfer Protocol
+	const PNUT      = 'pnut';    // pnut.io
+	const XMPP      = 'xmpp';    // XMPP
+	const ZOT       = 'zot!';    // Zot!
 
 	const PHANTOM   = 'unkn';    // Place holder
 

From 92c4ca091193e571d76a9db7b2d4078e2b3dc473 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 30 Aug 2018 17:53:23 -0400
Subject: [PATCH 19/96] Prevent unfollowing contacts from networks not
 supported natively

---
 mod/unfollow.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/mod/unfollow.php b/mod/unfollow.php
index f82796a6b7..30aca5688e 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -39,20 +39,18 @@ function unfollow_post()
 		// NOTREACHED
 	}
 
-	if ($contact['network'] == Protocol::STATUSNET) {
+	if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
 		notice(L10n::t('Unfollowing is currently not supported by your network.'));
 		goaway($return_url);
 		// NOTREACHED
 	}
 
-	if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN])) {
-		$r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
-			WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
-			intval($uid)
-		);
-		if (DBA::isResult($r)) {
-			Contact::terminateFriendship($r[0], $contact);
-		}
+	$r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
+		WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
+		intval($uid)
+	);
+	if (DBA::isResult($r)) {
+		Contact::terminateFriendship($r[0], $contact);
 	}
 
 	// Sharing-only contacts get deleted as there no relationship any more
@@ -92,7 +90,7 @@ function unfollow_content(App $a)
 		// NOTREACHED
 	}
 
-	if ($contact['network'] == Protocol::STATUSNET) {
+	if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
 		notice(L10n::t('Unfollowing is currently not supported by your network.'));
 		goaway('contacts/' . $contact['id']);
 		// NOTREACHED

From e25c579c76b0721b06c477f82356cc2e824ce53a Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 30 Aug 2018 21:03:57 -0400
Subject: [PATCH 20/96] Add Protocol::NATIVE_SUPPORT constant usage to
 mod/contacts

---
 mod/contacts.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/mod/contacts.php b/mod/contacts.php
index 38896a611a..227a48b965 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -595,17 +595,12 @@ function contacts_content(App $a, $update = 0)
 		/// @todo Only show the following link with DFRN when the remote version supports it
 		$follow = '';
 		$follow_text = '';
-		if ($contact['network'] != Protocol::STATUSNET) {
-			if (in_array($contact['rel'], [Contact::FRIEND, Contact::SHARING])) {
+		if (in_array($contact['rel'], [Contact::FRIEND, Contact::SHARING])) {
+			if (in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
 				$follow = System::baseUrl(true) . "/unfollow?url=" . urlencode($contact["url"]);
 				$follow_text = L10n::t("Disconnect/Unfollow");
-			} else {
-				$follow = System::baseUrl(true) . "/follow?url=" . urlencode($contact["url"]);
-				$follow_text = L10n::t("Connect/Follow");
 			}
-		}
-
-		if ($contact['uid'] == 0) {
+		} else {
 			$follow = System::baseUrl(true) . "/follow?url=" . urlencode($contact["url"]);
 			$follow_text = L10n::t("Connect/Follow");
 		}

From 380eeaab88febb7f76e69bb6cdf4b44bf2618f13 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 31 Aug 2018 05:08:22 +0000
Subject: [PATCH 21/96] Still there had been notices - must have a good
 camouflage

---
 mod/contacts.php      | 5 +++--
 src/Module/Proxy.php  | 4 ++++
 src/Object/Image.php  | 2 +-
 src/Protocol/DFRN.php | 5 ++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/mod/contacts.php b/mod/contacts.php
index 4e87697172..cfe968226d 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -122,11 +122,12 @@ function contacts_init(App $a)
 
 function contacts_batch_actions(App $a)
 {
-	$contacts_id = $_POST['contact_batch'];
-	if (!is_array($contacts_id)) {
+	if (empty($_POST['contact_batch']) || !is_array($_POST['contact_batch'])) {
 		return;
 	}
 
+	$contacts_id = $_POST['contact_batch'];
+
 	$orig_records = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND `uid` = %d AND `self` = 0",
 		implode(",", $contacts_id),
 		intval(local_user())
diff --git a/src/Module/Proxy.php b/src/Module/Proxy.php
index ccd00c6040..7983e01f7a 100644
--- a/src/Module/Proxy.php
+++ b/src/Module/Proxy.php
@@ -133,6 +133,10 @@ class Proxy extends BaseModule
 			$direct_cache = false;
 		}
 
+		if (empty($_REQUEST['url'])) {
+			System::httpExit(400, ["title" => L10n::t('Bad Request.')]);
+		}
+
 		if (!$direct_cache) {
 			$urlhash = 'pic:' . sha1($_REQUEST['url']);
 
diff --git a/src/Object/Image.php b/src/Object/Image.php
index 9506aedc22..620929df51 100644
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -792,7 +792,7 @@ class Image
 
 			try {
 				if (function_exists("getimagesizefromstring")) {
-					$data = getimagesizefromstring($img_str);
+					$data = @getimagesizefromstring($img_str);
 				} else {
 					$tempfile = tempnam(get_temppath(), "cache");
 
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 759f7f5f28..c435550313 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2407,8 +2407,11 @@ class DFRN
 						break;
 					case "enclosure":
 						$enclosure = $href;
-						if (strlen($item["attach"])) {
+
+						if (!empty($item["attach"])) {
 							$item["attach"] .= ",";
+						} else {
+							$item["attach"] = "";
 						}
 
 						$item["attach"] .= '[attach]href="' . $href . '" length="' . $length . '" type="' . $type . '" title="' . $title . '"[/attach]';

From 38fd21019be46189ac7cccadca0159f6a34c56c0 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 31 Aug 2018 07:48:44 +0000
Subject: [PATCH 22/96] Invalid pictures could lead to notices, this is removed
 now

---
 include/items.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/items.php b/include/items.php
index 2d7597dcd6..9fd557a778 100644
--- a/include/items.php
+++ b/include/items.php
@@ -72,7 +72,8 @@ function add_page_info_data(array $data, $no_photos = false)
 		$text .= " title='".$data["title"]."'";
 	}
 
-	if (!empty($data["images"])) {
+	// Only embedd a picture link when it seems to be a valid picture ("width" is set)
+	if (!empty($data["images"]) && !empty($data["images"][0]["width"])) {
 		$preview = str_replace(["[", "]"], ["&#91;", "&#93;"], htmlentities($data["images"][0]["src"], ENT_QUOTES, 'UTF-8', false));
 		// if the preview picture is larger than 500 pixels then show it in a larger mode
 		// But only, if the picture isn't higher than large (To prevent huge posts)

From 76b40cf05ec201811aedb22df0217bd027ebcbd1 Mon Sep 17 00:00:00 2001
From: Benjamin Lorteau <benjamin.lorteau@cbsinteractive.com>
Date: Fri, 31 Aug 2018 11:22:51 -0400
Subject: [PATCH 23/96] Use User::getOwnerDataById in mod/unfollow

---
 mod/unfollow.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/mod/unfollow.php b/mod/unfollow.php
index 30aca5688e..0af16ec671 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -10,6 +10,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Model\User;
 
 function unfollow_post()
 {
@@ -45,12 +46,9 @@ function unfollow_post()
 		// NOTREACHED
 	}
 
-	$r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
-		WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
-		intval($uid)
-	);
-	if (DBA::isResult($r)) {
-		Contact::terminateFriendship($r[0], $contact);
+	$owner = User::getOwnerDataById($uid);
+	if ($owner) {
+		Contact::terminateFriendship($owner, $contact);
 	}
 
 	// Sharing-only contacts get deleted as there no relationship any more

From 4fcae18289aecfd9bd4abd2df15381eaf64403ca Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 1 Sep 2018 03:23:12 +0000
Subject: [PATCH 24/96] Issue 5262: Comments to a forum post aren't distributed
 via push

---
 src/Worker/Notifier.php | 45 +++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 401178ec26..6d2733b8ee 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -217,24 +217,16 @@ class Notifier
 			}
 
 			// Special treatment for forum posts
-			if (($target_item['author-id'] != $target_item['owner-id']) &&
-				($owner['id'] != $target_item['contact-id']) &&
-				($target_item['uri'] === $target_item['parent-uri'])) {
-
-				$fields = ['forum', 'prv'];
-				$condition = ['id' => $target_item['contact-id']];
-				$contact = DBA::selectFirst('contact', $fields, $condition);
-				if (!DBA::isResult($contact)) {
-					// Should never happen
-					return false;
-				}
-
-				// Is the post from a forum?
-				if ($contact['forum'] || $contact['prv']) {
-					$relay_to_owner = true;
-					$direct_forum_delivery = true;
-				}
+			if (self::isForumPost($target_item, $owner)) {
+				$relay_to_owner = true;
+				$direct_forum_delivery = true;
 			}
+
+			// Avoid that comments in a forum thread are sent to OStatus
+			if (self::isForumPost($parent, $owner)) {
+				$direct_forum_delivery = true;
+			}
+
 			if ($relay_to_owner) {
 				// local followup to remote post
 				$followup = true;
@@ -504,4 +496,23 @@ class Notifier
 
 		return;
 	}
+
+	private static function isForumPost($item, $owner) {
+		if (($item['author-id'] == $item['owner-id']) ||
+			($owner['id'] == $item['contact-id']) ||
+			($item['uri'] != $item['parent-uri'])) {
+			return false;
+		}
+
+		$fields = ['forum', 'prv'];
+		$condition = ['id' => $item['contact-id']];
+		$contact = DBA::selectFirst('contact', $fields, $condition);
+		if (!DBA::isResult($contact)) {
+			// Should never happen
+			return false;
+		}
+
+		// Is the post from a forum?
+		return ($contact['forum'] || $contact['prv']);
+	}
 }

From 4bb45f611f1a43294859dae1c81bf0aff923cf20 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 2 Sep 2018 07:20:04 +0000
Subject: [PATCH 25/96] Fix for timeout issues when posting to the API

---
 include/api.php | 38 +++++++++++++++++++++-----------------
 mod/item.php    | 10 +++++++---
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/include/api.php b/include/api.php
index f40674b894..18027c2434 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1056,10 +1056,10 @@ function api_statuses_mediap($type)
 
 	// now that we have the img url in bbcode we can add it to the status and insert the wall item.
 	$_REQUEST['body'] = $txt . "\n\n" . '[url=' . $picture["albumpage"] . '][img]' . $picture["preview"] . "[/img][/url]";
-	item_post($a);
+	$item_id = item_post($a);
 
-	// this should output the last post (the one we just posted).
-	return api_status_show($type);
+	// output the post that we just posted.
+	return api_status_show($type, $item_id);
 }
 
 /// @TODO move this to top of file or somewhere better!
@@ -1075,7 +1075,6 @@ api_register_func('api/statuses/mediap', 'api_statuses_mediap', true, API_METHOD
  */
 function api_statuses_update($type)
 {
-
 	$a = get_app();
 
 	if (api_user() === false) {
@@ -1129,7 +1128,7 @@ function api_statuses_update($type)
 		if ($throttle_day > 0) {
 			$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60);
 
-			$condition = ["`uid` = ? AND `wall` AND `created` > ? AND `id` = `parent`", api_user(), $datefrom];
+			$condition = ["`uid` = ? AND `wall` AND `changed` > ? AND `gravity` = ?", api_user(), $datefrom, GRAVITY_PARENT];
 			$posts_day = DBA::count('item', $condition);
 
 			if ($posts_day > $throttle_day) {
@@ -1143,7 +1142,7 @@ function api_statuses_update($type)
 		if ($throttle_week > 0) {
 			$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*7);
 
-			$condition = ["`uid` = ? AND `wall` AND `created` > ? AND `id` = `parent`", api_user(), $datefrom];
+			$condition = ["`uid` = ? AND `wall` AND `changed` > ? AND `gravity` = ?", api_user(), $datefrom, GRAVITY_PARENT];
 			$posts_week = DBA::count('item', $condition);
 
 			if ($posts_week > $throttle_week) {
@@ -1157,7 +1156,7 @@ function api_statuses_update($type)
 		if ($throttle_month > 0) {
 			$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*30);
 
-			$condition = ["`uid` = ? AND `wall` AND `created` > ? AND `id` = `parent`", api_user(), $datefrom];
+			$condition = ["`uid` = ? AND `wall` AND `changed` > ? AND `gravity` = ?", api_user(), $datefrom, GRAVITY_PARENT];
 			$posts_month = DBA::count('item', $condition);
 
 			if ($posts_month > $throttle_month) {
@@ -1200,10 +1199,10 @@ function api_statuses_update($type)
 	}
 
 	// call out normal post function
-	item_post($a);
+	$item_id = item_post($a);
 
-	// this should output the last post (the one we just posted).
-	return api_status_show($type);
+	// output the post that we just posted.
+	return api_status_show($type, $item_id);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -1260,7 +1259,7 @@ api_register_func('api/media/upload', 'api_media_upload', true, API_METHOD_POST)
  *
  * @return array|string
  */
-function api_status_show($type)
+function api_status_show($type, $item_id = 0)
 {
 	$a = get_app();
 
@@ -1274,9 +1273,14 @@ function api_status_show($type)
 		$privacy_sql = "";
 	}
 
-	// get last public wall message
-	$condition = ['owner-id' => $user_info['pid'], 'uid' => api_user(),
-		'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]];
+	if (!empty($item_id)) {
+		// Get the item with the given id
+		$condition = ['id' => $item_id];
+	} else {
+		// get last public wall message
+		$condition = ['owner-id' => $user_info['pid'], 'uid' => api_user(),
+			'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]];
+	}
 	$lastwall = Item::selectFirst(Item::ITEM_FIELDLIST, $condition, ['order' => ['id' => true]]);
 
 	if (DBA::isResult($lastwall)) {
@@ -1993,14 +1997,14 @@ function api_statuses_repeat($type)
 			$_REQUEST["source"] = api_source();
 		}
 
-		item_post($a);
+		$item_id = item_post($a);
 	} else {
 		throw new ForbiddenException();
 	}
 
-	// this should output the last post (the one we just posted).
+	// output the last post tha we just posted.
 	$called_api = [];
-	return api_status_show($type);
+	return api_status_show($type, $item_id);
 }
 
 /// @TODO move to top of file or somewhere better
diff --git a/mod/item.php b/mod/item.php
index 733c6aee85..213a990789 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -39,7 +39,7 @@ require_once 'include/items.php';
 
 function item_post(App $a) {
 	if (!local_user() && !remote_user()) {
-		return;
+		return 0;
 	}
 
 	require_once 'include/security.php';
@@ -154,7 +154,7 @@ function item_post(App $a) {
 	if (($message_id != '') && ($profile_uid != 0)) {
 		if (Item::exists(['uri' => $message_id, 'uid' => $profile_uid])) {
 			logger("Message with URI ".$message_id." already exists for user ".$profile_uid, LOGGER_DEBUG);
-			return;
+			return 0;
 		}
 	}
 
@@ -183,7 +183,7 @@ function item_post(App $a) {
 	$user = DBA::selectFirst('user', [], ['uid' => $profile_uid]);
 
 	if (!DBA::isResult($user) && !$parent) {
-		return;
+		return 0;
 	}
 
 	$categories = '';
@@ -843,6 +843,10 @@ function item_post(App $a) {
 
 	logger('post_complete');
 
+	if ($api_source) {
+		return $post_id;
+	}
+
 	item_post_return(System::baseUrl(), $api_source, $return_path);
 	// NOTREACHED
 }

From 394526db747eb7419e07ae2ba8d8d63f44788ebb Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 2 Sep 2018 07:35:12 +0000
Subject: [PATCH 26/96] Typo corrected / use the thread table instead

---
 include/api.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/api.php b/include/api.php
index 18027c2434..c8cb57f54d 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1128,8 +1128,8 @@ function api_statuses_update($type)
 		if ($throttle_day > 0) {
 			$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60);
 
-			$condition = ["`uid` = ? AND `wall` AND `changed` > ? AND `gravity` = ?", api_user(), $datefrom, GRAVITY_PARENT];
-			$posts_day = DBA::count('item', $condition);
+			$condition = ["`uid` = ? AND `wall` AND `created` > ?", api_user(), $datefrom];
+			$posts_day = DBA::count('thread', $condition);
 
 			if ($posts_day > $throttle_day) {
 				logger('Daily posting limit reached for user '.api_user(), LOGGER_DEBUG);
@@ -1142,8 +1142,8 @@ function api_statuses_update($type)
 		if ($throttle_week > 0) {
 			$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*7);
 
-			$condition = ["`uid` = ? AND `wall` AND `changed` > ? AND `gravity` = ?", api_user(), $datefrom, GRAVITY_PARENT];
-			$posts_week = DBA::count('item', $condition);
+			$condition = ["`uid` = ? AND `wall` AND `created` > ?", api_user(), $datefrom];
+			$posts_week = DBA::count('thread', $condition);
 
 			if ($posts_week > $throttle_week) {
 				logger('Weekly posting limit reached for user '.api_user(), LOGGER_DEBUG);
@@ -1156,8 +1156,8 @@ function api_statuses_update($type)
 		if ($throttle_month > 0) {
 			$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*30);
 
-			$condition = ["`uid` = ? AND `wall` AND `changed` > ? AND `gravity` = ?", api_user(), $datefrom, GRAVITY_PARENT];
-			$posts_month = DBA::count('item', $condition);
+			$condition = ["`uid` = ? AND `wall` AND `created` > ?", api_user(), $datefrom];
+			$posts_month = DBA::count('thread', $condition);
 
 			if ($posts_month > $throttle_month) {
 				logger('Monthly posting limit reached for user '.api_user(), LOGGER_DEBUG);
@@ -2002,7 +2002,7 @@ function api_statuses_repeat($type)
 		throw new ForbiddenException();
 	}
 
-	// output the last post tha we just posted.
+	// output the post that we just posted.
 	$called_api = [];
 	return api_status_show($type, $item_id);
 }

From fd7e45042a66ce9c2d1465044014033efe04dbae Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 2 Sep 2018 07:47:48 +0000
Subject: [PATCH 27/96] The days are getting shorter, like the list of removed
 notices ...

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

diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index 4fa5e29057..1dd513c42f 100644
--- a/src/Util/Emailer.php
+++ b/src/Util/Emailer.php
@@ -49,7 +49,7 @@ class Emailer
 				.rand(10000, 99999);
 
 		// generate a multipart/alternative message header
-		$messageHeader = $params['additionalMailHeader'] .
+		$messageHeader = defaults($params, 'additionalMailHeader', '') .
 						"From: $fromName <{$params['fromEmail']}>\n" .
 						"Reply-To: $fromName <{$params['replyTo']}>\n" .
 						"MIME-Version: 1.0\n" .

From 703c668a37781f0d976c7e8c4de893b48c6da78d Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 2 Sep 2018 08:01:13 +0000
Subject: [PATCH 28/96] More notices ...

---
 include/api.php       | 7 +++++--
 mod/notifications.php | 3 +--
 mod/ping.php          | 2 +-
 src/Model/Profile.php | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/api.php b/include/api.php
index f40674b894..3bae11e57d 100644
--- a/include/api.php
+++ b/include/api.php
@@ -581,7 +581,10 @@ function api_get_user(App $a, $contact_id = null)
 	if (is_null($user) && ($a->argc > (count($called_api) - 1)) && (count($called_api) > 0)) {
 		$argid = count($called_api);
 		if (!empty($a->argv[$argid])) {
-			list($user, $null) = explode(".", $a->argv[$argid]);
+			$data = explode(".", $a->argv[$argid]);
+			if (count($data) > 1) {
+				list($user, $null) = $data;
+			}
 		}
 		if (is_numeric($user)) {
 			$user = DBA::escape(api_unique_id_to_nurl(intval($user)));
@@ -4396,7 +4399,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
 	if ($filetype == "") {
 		$filetype=Image::guessType($filename);
 	}
-	$imagedata = getimagesize($src);
+	$imagedata = @getimagesize($src);
 	if ($imagedata) {
 		$filetype = $imagedata['mime'];
 	}
diff --git a/mod/notifications.php b/mod/notifications.php
index 145c384350..bc581b6dd3 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -115,7 +115,6 @@ function notifications_content(App $a)
 	} elseif (($a->argc > 1) && ($a->argv[1] == 'home')) {
 		$notif_header = L10n::t('Home Notifications');
 		$notifs = $nm->homeNotifs($show, $startrec, $perpage);
-
 	}
 
 
@@ -134,7 +133,7 @@ function notifications_content(App $a)
 	$notif_tpl = get_markup_template('notifications.tpl');
 
 	if (!isset($notifs['ident'])) {
-		logger('Missing data in notifs: ' . System::callstack(20), LOGGER_DEBUG);
+		logger('Missing data in notifs: ' . json_encode($a->argv), LOGGER_DEBUG);
 	}
 
 	// Process the data for template creation
diff --git a/mod/ping.php b/mod/ping.php
index 99ebde70c1..9867f03f9a 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -519,7 +519,7 @@ function ping_get_notifications($uid)
  * @param int   $forums_unseen Number of unseen forum items
  * @return array XML-transform ready data array
  */
-function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen)
+function ping_format_xml_data($data, $sysnotify_count, $notifs, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen)
 {
 	$notifications = [];
 	foreach ($notifs as $key => $notif) {
diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index f6e116fa79..29bc7e680d 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -492,7 +492,7 @@ class Profile
 
 		if (isset($p['address'])) {
 			$p['address'] = BBCode::convert($p['address']);
-		} else {
+		} elseif (isset($p['location'])) {
 			$p['address'] = BBCode::convert($p['location']);
 		}
 

From 58148905f14398895b7a1960beb67a98ec137561 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 2 Sep 2018 17:48:07 +0000
Subject: [PATCH 29/96] Changed documention

---
 mod/ping.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/mod/ping.php b/mod/ping.php
index 9867f03f9a..968751a7da 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -510,13 +510,14 @@ function ping_get_notifications($uid)
  * @brief Backward-compatible XML formatting for ping.php output
  * @deprecated
  *
- * @param array $data          The initial ping data array
- * @param int   $sysnotify     Number of unseen system notifications
- * @param array $notifs        Complete list of notification
- * @param array $sysmsgs       List of system notice messages
- * @param array $sysmsgs_info  List of system info messages
- * @param int   $groups_unseen Number of unseen group items
- * @param int   $forums_unseen Number of unseen forum items
+ * @param array $data            The initial ping data array
+ * @param int   $sysnotify_count Number of unseen system notifications
+ * @param array $notifs          Complete list of notification
+ * @param array $sysmsgs         List of system notice messages
+ * @param array $sysmsgs_info    List of system info messages
+ * @param int   $groups_unseen   Number of unseen group items
+ * @param int   $forums_unseen   Number of unseen forum items
+ *
  * @return array XML-transform ready data array
  */
 function ping_format_xml_data($data, $sysnotify_count, $notifs, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen)

From 5250552fe28cd4a5d2b148ca7a431233191e92c9 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 2 Sep 2018 17:48:25 +0000
Subject: [PATCH 30/96] Removed obsolete post update that sometimes never
 finishes

---
 src/Database/PostUpdate.php | 85 -------------------------------------
 1 file changed, 85 deletions(-)

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index 674fe05531..dbadcbbb1b 100644
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -27,9 +27,6 @@ class PostUpdate
 		if (!self::update1194()) {
 			return false;
 		}
-		if (!self::update1198()) {
-			return false;
-		}
 		if (!self::update1206()) {
 			return false;
 		}
@@ -111,88 +108,6 @@ class PostUpdate
 		logger("Done", LOGGER_DEBUG);
 	}
 
-	/**
-	 * @brief set the author-id and owner-id in all item entries
-	 *
-	 * This job has to be started multiple times until all entries are set.
-	 * It isn't started in the update function since it would consume too much time and can be done in the background.
-	 *
-	 * @return bool "true" when the job is done
-	 */
-	private static function update1198()
-	{
-		// Was the script completed?
-		if (Config::get("system", "post_update_version") >= 1198) {
-			return true;
-		}
-
-		logger("Start", LOGGER_DEBUG);
-
-		// Check if the first step is done (Setting "author-id" and "owner-id" in the item table)
-		$fields = ['author-link', 'author-name', 'author-avatar', 'owner-link', 'owner-name', 'owner-avatar', 'network', 'uid'];
-		$r = DBA::select('item', $fields, ['author-id' => 0, 'owner-id' => 0], ['limit' => 1000]);
-		if (!$r) {
-			// Are there unfinished entries in the thread table?
-			$r = q("SELECT COUNT(*) AS `total` FROM `thread`
-				INNER JOIN `item` ON `item`.`id` =`thread`.`iid`
-				WHERE `thread`.`author-id` = 0 AND `thread`.`owner-id` = 0 AND
-					(`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");
-
-			if ($r && ($r[0]["total"] == 0)) {
-				Config::set("system", "post_update_version", 1198);
-				logger("Done", LOGGER_DEBUG);
-				return true;
-			}
-
-			// Update the thread table from the item table
-			$r = q("UPDATE `thread` INNER JOIN `item` ON `item`.`id`=`thread`.`iid`
-					SET `thread`.`author-id` = `item`.`author-id`,
-					`thread`.`owner-id` = `item`.`owner-id`
-				WHERE `thread`.`author-id` = 0 AND `thread`.`owner-id` = 0 AND
-					(`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");
-
-			logger("Updated threads", LOGGER_DEBUG);
-			if (DBA::isResult($r)) {
-				Config::set("system", "post_update_version", 1198);
-				logger("Done", LOGGER_DEBUG);
-				return true;
-			}
-			return false;
-		}
-
-		logger("Query done", LOGGER_DEBUG);
-
-		$item_arr = [];
-		foreach ($r as $item) {
-			$index = $item["author-link"]."-".$item["owner-link"]."-".$item["uid"];
-			$item_arr[$index] = ["author-link" => $item["author-link"],
-							"owner-link" => $item["owner-link"],
-							"uid" => $item["uid"]];
-		}
-
-		// Set the "author-id" and "owner-id" in the item table and add a new public contact entry if needed
-		foreach ($item_arr as $item) {
-			$default = ['url' => $item['author-link'], 'name' => $item['author-name'],
-				'photo' => $item['author-avatar'], 'network' => $item['network']];
-			$author_id = Contact::getIdForURL($item["author-link"], 0, false, $default);
-
-			$default = ['url' => $item['owner-link'], 'name' => $item['owner-name'],
-				'photo' => $item['owner-avatar'], 'network' => $item['network']];
-			$owner_id = Contact::getIdForURL($item["owner-link"], 0, false, $default);
-
-			if ($author_id == 0) {
-				$author_id = -1;
-			}
-			if ($owner_id == 0) {
-				$owner_id = -1;
-			}
-			DBA::update('item', ['author-id' => $author_id, 'owner-id' => $owner_id], ['uid' => $item['uid'], 'author-link' => $item['author-link'], 'owner-link' => $item['owner-link'], 'author-id' => 0, 'owner-id' => 0]);
-		}
-
-		logger("Updated items", LOGGER_DEBUG);
-		return false;
-	}
-
 	/**
 	 * @brief update the "last-item" field in the "self" contact
 	 *

From 475d3f8f3a71afb94315bbc3264a950a61b26b52 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 2 Sep 2018 17:24:56 -0400
Subject: [PATCH 31/96] Fix formatting in mod/parse_url

---
 mod/parse_url.php | 102 +++++++++++++++++++++++-----------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/mod/parse_url.php b/mod/parse_url.php
index 3309a74b9f..ebe34875b7 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -8,128 +8,127 @@
  * information and does format this information to BBCode
  *
  * @see ParseUrl::getSiteinfo() for more information about scraping embeddable content
-*/
-
+ */
 use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
 
-require_once("include/items.php");
-
-function parse_url_content(App $a) {
+require_once 'include/items.php';
 
+function parse_url_content(App $a)
+{
 	$text = null;
-	$str_tags = "";
+	$str_tags = '';
 
 	$br = "\n";
 
-	if (!empty($_GET["binurl"])) {
-		$url = trim(hex2bin($_GET["binurl"]));
+	if (!empty($_GET['binurl'])) {
+		$url = trim(hex2bin($_GET['binurl']));
 	} else {
-		$url = trim($_GET["url"]);
+		$url = trim($_GET['url']);
 	}
 
-	if (!empty($_GET["title"])) {
-		$title = strip_tags(trim($_GET["title"]));
+	if (!empty($_GET['title'])) {
+		$title = strip_tags(trim($_GET['title']));
 	}
 
-	if (!empty($_GET["description"])) {
-		$text = strip_tags(trim($_GET["description"]));
+	if (!empty($_GET['description'])) {
+		$text = strip_tags(trim($_GET['description']));
 	}
 
-	if (!empty($_GET["tags"])) {
-		$arr_tags = ParseUrl::convertTagsToArray($_GET["tags"]);
+	if (!empty($_GET['tags'])) {
+		$arr_tags = ParseUrl::convertTagsToArray($_GET['tags']);
 		if (count($arr_tags)) {
-			$str_tags = $br . implode(" ", $arr_tags) . $br;
+			$str_tags = $br . implode(' ', $arr_tags) . $br;
 		}
 	}
 
 	// Add url scheme if it is missing
 	$arrurl = parse_url($url);
-	if (!x($arrurl, "scheme")) {
-		if (x($arrurl, "host")) {
-			$url = "http:".$url;
+	if (!x($arrurl, 'scheme')) {
+		if (x($arrurl, 'host')) {
+			$url = 'http:' . $url;
 		} else {
-			$url = "http://".$url;
+			$url = 'http://' . $url;
 		}
 	}
 
-	logger("prse_url: " . $url);
+	logger($url);
 
 	// Check if the URL is an image, video or audio file. If so format
 	// the URL with the corresponding BBCode media tag
 	$redirects = 0;
 	// Fetch the header of the URL
-	$result = Network::curl($url, false, $redirects, ["novalidate" => true, "nobody" => true]);
-	if($result["success"]) {
+	$result = Network::curl($url, false, $redirects, ['novalidate' => true, 'nobody' => true]);
+
+	if ($result['success']) {
 		// Convert the header fields into an array
 		$hdrs = [];
-		$h = explode("\n", $result["header"]);
+		$h = explode("\n", $result['header']);
 		foreach ($h as $l) {
-			$header = array_map("trim", explode(":", trim($l), 2));
+			$header = array_map('trim', explode(':', trim($l), 2));
 			if (count($header) == 2) {
-				list($k,$v) = $header;
+				list($k, $v) = $header;
 				$hdrs[$k] = $v;
 			}
 		}
-		if (array_key_exists("Content-Type", $hdrs)) {
-			$type = $hdrs["Content-Type"];
+		if (array_key_exists('Content-Type', $hdrs)) {
+			$type = $hdrs['Content-Type'];
 		}
 		if ($type) {
-			if(stripos($type, "image/") !== false) {
-				echo $br . "[img]" . $url . "[/img]" . $br;
-				killme();
+			if (stripos($type, 'image/') !== false) {
+				echo $br . '[img]' . $url . '[/img]' . $br;
+				exit();
 			}
-			if (stripos($type, "video/") !== false) {
-				echo $br . "[video]" . $url . "[/video]" . $br;
-				killme();
+			if (stripos($type, 'video/') !== false) {
+				echo $br . '[video]' . $url . '[/video]' . $br;
+				exit();
 			}
-			if (stripos($type, "audio/") !== false) {
-				echo $br . "[audio]" . $url . "[/audio]" . $br;
-				killme();
+			if (stripos($type, 'audio/') !== false) {
+				echo $br . '[audio]' . $url . '[/audio]' . $br;
+				exit();
 			}
 		}
 	}
 
-	$template = "[bookmark=%s]%s[/bookmark]%s";
+	$template = '[bookmark=%s]%s[/bookmark]%s';
 
-	$arr = ["url" => $url, "text" => ""];
+	$arr = ['url' => $url, 'text' => ''];
 
-	Addon::callHooks("parse_link", $arr);
+	Addon::callHooks('parse_link', $arr);
 
-	if (strlen($arr["text"])) {
-		echo $arr["text"];
-		killme();
+	if (strlen($arr['text'])) {
+		echo $arr['text'];
+		exit();
 	}
 
 	// If there is already some content information submitted we don't
 	// need to parse the url for content.
 	if (!empty($url) && !empty($title) && !empty($text)) {
+		$title = str_replace(["\r", "\n"], ['', ''], $title);
 
-		$title = str_replace(["\r","\n"],["",""],$title);
-
-		$text = "[quote]" . trim($text) . "[/quote]" . $br;
+		$text = '[quote]' . trim($text) . '[/quote]' . $br;
 
 		$result = sprintf($template, $url, ($title) ? $title : $url, $text) . $str_tags;
 
-		logger("parse_url (unparsed): returns: " . $result);
+		logger('(unparsed): returns: ' . $result);
 
 		echo $result;
-		killme();
+		exit();
 	}
 
 	// Fetch the information directly from the webpage
 	$siteinfo = ParseUrl::getSiteinfo($url);
 
-	unset($siteinfo["keywords"]);
+	unset($siteinfo['keywords']);
 
 	// Format it as BBCode attachment
 	$info = add_page_info_data($siteinfo);
 
 	echo $info;
 
-	killme();
+	exit();
 }
 
 /**
@@ -151,7 +150,8 @@ function parse_url_content(App $a) {
  * @todo Remove this function after all Addons has been changed to use
  *    ParseUrl::getSiteinfoCached
  */
-function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = true) {
+function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = true)
+{
 	$siteinfo = ParseUrl::getSiteinfoCached($url, $no_guessing, $do_oembed);
 	return $siteinfo;
 }

From 69e7c7fecac5d315930c52bfa9fb21954dcf8b5e Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 2 Sep 2018 17:26:05 -0400
Subject: [PATCH 32/96] Fix photo attachment display

- Remove double image display
- Add domain link display to all attachments
---
 src/Content/Text/BBCode.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 41f89e65dc..55fc24273d 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -578,9 +578,7 @@ class BBCode extends BaseObject
 					$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], self::proxyUrl($data["preview"], $simplehtml), $data["title"]);
 				}
 
-				if (($data["type"] == "photo") && !empty($data["url"]) && !empty($data["image"])) {
-					$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a>', $data["url"], self::proxyUrl($data["image"], $simplehtml), $data["title"]);
-				} else {
+				if (!empty($data['title']) && !empty($data['url'])) {
 					$return .= sprintf('<h4><a href="%s">%s</a></h4>', $data['url'], $data['title']);
 				}
 
@@ -589,7 +587,8 @@ class BBCode extends BaseObject
 					$bbcode = HTML::toBBCode($data["description"]);
 					$return .= sprintf('<blockquote>%s</blockquote>', trim(self::convert($bbcode)));
 				}
-				if ($data["type"] == "link") {
+
+				if (!empty($data['url'])) {
 					$return .= sprintf('<sup><a href="%s">%s</a></sup>', $data['url'], parse_url($data['url'], PHP_URL_HOST));
 				}
 

From 8bcc3c68602cb7df05ccf8241dff5d53cfa71afb Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 2 Sep 2018 17:35:55 -0400
Subject: [PATCH 33/96] Fix formatting in Util/ParseUrl

- Remove commented out code
- Replace double quotes with simple quotes
- Remove parentheses for language construct
- Add spaces around operators
- Rename variables
---
 src/Util/ParseUrl.php | 265 +++++++++++++++++++++---------------------
 1 file changed, 132 insertions(+), 133 deletions(-)

diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index 3be372767b..b897c54ee7 100644
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -118,13 +118,13 @@ class ParseUrl
 		// Check if the URL does contain a scheme
 		$scheme = parse_url($url, PHP_URL_SCHEME);
 
-		if ($scheme == "") {
-			$url = "http://".trim($url, "/");
+		if ($scheme == '') {
+			$url = 'http://' . trim($url, '/');
 		}
 
 		if ($count > 10) {
-			logger("parseurl_getsiteinfo: Endless loop detected for ".$url, LOGGER_DEBUG);
-			return($siteinfo);
+			logger('Endless loop detected for ' . $url, LOGGER_DEBUG);
+			return $siteinfo;
 		}
 
 		$url = trim($url, "'");
@@ -132,220 +132,217 @@ class ParseUrl
 
 		$url = Network::stripTrackingQueryParams($url);
 
-		$siteinfo["url"] = $url;
-		$siteinfo["type"] = "link";
+		$siteinfo['url'] = $url;
+		$siteinfo['type'] = 'link';
 
 		$data = Network::curl($url);
 		if (!$data['success']) {
-			return($siteinfo);
+			return $siteinfo;
 		}
 
 		// If the file is too large then exit
-		if ($data["info"]["download_content_length"] > 1000000) {
-			return($siteinfo);
+		if ($data['info']['download_content_length'] > 1000000) {
+			return $siteinfo;
 		}
 
 		// If it isn't a HTML file then exit
-		if (($data["info"]["content_type"] != "") && !strstr(strtolower($data["info"]["content_type"]), "html")) {
-			return($siteinfo);
+		if (($data['info']['content_type'] != '') && !strstr(strtolower($data['info']['content_type']), 'html')) {
+			return $siteinfo;
 		}
 
-		$header = $data["header"];
-		$body = $data["body"];
+		$header = $data['header'];
+		$body = $data['body'];
 
 		if ($do_oembed) {
 			$oembed_data = OEmbed::fetchURL($url);
 
 			if (!empty($oembed_data->type)) {
-				if (!in_array($oembed_data->type, ["error", "rich", ""])) {
-					$siteinfo["type"] = $oembed_data->type;
+				if (!in_array($oembed_data->type, ['error', 'rich', ''])) {
+					$siteinfo['type'] = $oembed_data->type;
 				}
 
-				if (($oembed_data->type == "link") && ($siteinfo["type"] != "photo")) {
+				if (($oembed_data->type == 'link') && ($siteinfo['type'] != 'photo')) {
 					if (isset($oembed_data->title)) {
-						$siteinfo["title"] = trim($oembed_data->title);
+						$siteinfo['title'] = trim($oembed_data->title);
 					}
 					if (isset($oembed_data->description)) {
-						$siteinfo["text"] = trim($oembed_data->description);
+						$siteinfo['text'] = trim($oembed_data->description);
 					}
 					if (isset($oembed_data->thumbnail_url)) {
-						$siteinfo["image"] = $oembed_data->thumbnail_url;
+						$siteinfo['image'] = $oembed_data->thumbnail_url;
 					}
 				}
 			}
 		}
 
 		// Fetch the first mentioned charset. Can be in body or header
-		$charset = "";
-		if (preg_match('/charset=(.*?)['."'".'"\s\n]/', $header, $matches)) {
+		$charset = '';
+		if (preg_match('/charset=(.*?)[\'"\s\n]/', $header, $matches)) {
 			$charset = trim(trim(trim(array_pop($matches)), ';,'));
 		}
 
-		if ($charset == "") {
-			$charset = "utf-8";
+		if ($charset == '') {
+			$charset = 'utf-8';
 		}
 
-		if (($charset != "") && (strtoupper($charset) != "UTF-8")) {
-			logger("parseurl_getsiteinfo: detected charset ".$charset, LOGGER_DEBUG);
-			//$body = mb_convert_encoding($body, "UTF-8", $charset);
-			$body = iconv($charset, "UTF-8//TRANSLIT", $body);
+		if (($charset != '') && (strtoupper($charset) != 'UTF-8')) {
+			logger('detected charset ' . $charset, LOGGER_DEBUG);
+			$body = iconv($charset, 'UTF-8//TRANSLIT', $body);
 		}
 
-		$body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8");
+		$body = mb_convert_encoding($body, 'HTML-ENTITIES', 'UTF-8');
 
 		$doc = new DOMDocument();
 		@$doc->loadHTML($body);
 
-		XML::deleteNode($doc, "style");
-		XML::deleteNode($doc, "script");
-		XML::deleteNode($doc, "option");
-		XML::deleteNode($doc, "h1");
-		XML::deleteNode($doc, "h2");
-		XML::deleteNode($doc, "h3");
-		XML::deleteNode($doc, "h4");
-		XML::deleteNode($doc, "h5");
-		XML::deleteNode($doc, "h6");
-		XML::deleteNode($doc, "ol");
-		XML::deleteNode($doc, "ul");
+		XML::deleteNode($doc, 'style');
+		XML::deleteNode($doc, 'script');
+		XML::deleteNode($doc, 'option');
+		XML::deleteNode($doc, 'h1');
+		XML::deleteNode($doc, 'h2');
+		XML::deleteNode($doc, 'h3');
+		XML::deleteNode($doc, 'h4');
+		XML::deleteNode($doc, 'h5');
+		XML::deleteNode($doc, 'h6');
+		XML::deleteNode($doc, 'ol');
+		XML::deleteNode($doc, 'ul');
 
 		$xpath = new DOMXPath($doc);
 
-		$list = $xpath->query("//meta[@content]");
+		$list = $xpath->query('//meta[@content]');
 		foreach ($list as $node) {
-			$attr = [];
+			$meta_tag = [];
 			if ($node->attributes->length) {
 				foreach ($node->attributes as $attribute) {
-					$attr[$attribute->name] = $attribute->value;
+					$meta_tag[$attribute->name] = $attribute->value;
 				}
 			}
 
-			if (@$attr["http-equiv"] == "refresh") {
-				$path = $attr["content"];
-				$pathinfo = explode(";", $path);
-				$content = "";
+			if (@$meta_tag['http-equiv'] == 'refresh') {
+				$path = $meta_tag['content'];
+				$pathinfo = explode(';', $path);
+				$content = '';
 				foreach ($pathinfo as $value) {
-					if (substr(strtolower($value), 0, 4) == "url=") {
+					if (substr(strtolower($value), 0, 4) == 'url=') {
 						$content = substr($value, 4);
 					}
 				}
-				if ($content != "") {
+				if ($content != '') {
 					$siteinfo = self::getSiteinfo($content, $no_guessing, $do_oembed, ++$count);
-					return($siteinfo);
+					return $siteinfo;
 				}
 			}
 		}
 
-		$list = $xpath->query("//title");
+		$list = $xpath->query('//title');
 		if ($list->length > 0) {
-			$siteinfo["title"] = trim($list->item(0)->nodeValue);
+			$siteinfo['title'] = trim($list->item(0)->nodeValue);
 		}
 
-		//$list = $xpath->query("head/meta[@name]");
-		$list = $xpath->query("//meta[@name]");
+		$list = $xpath->query('//meta[@name]');
 		foreach ($list as $node) {
-			$attr = [];
+			$meta_tag = [];
 			if ($node->attributes->length) {
 				foreach ($node->attributes as $attribute) {
-					$attr[$attribute->name] = $attribute->value;
+					$meta_tag[$attribute->name] = $attribute->value;
 				}
 			}
 
-			if (!empty($attr["content"])) {
-				$attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8"));
+			if (!empty($meta_tag['content'])) {
+				$meta_tag['content'] = trim(html_entity_decode($meta_tag['content'], ENT_QUOTES, 'UTF-8'));
 
-				switch (strtolower($attr["name"])) {
-					case "fulltitle":
-						$siteinfo["title"] = trim($attr["content"]);
+				switch (strtolower($meta_tag['name'])) {
+					case 'fulltitle':
+						$siteinfo['title'] = trim($meta_tag['content']);
 						break;
-					case "description":
-						$siteinfo["text"] = trim($attr["content"]);
+					case 'description':
+						$siteinfo['text'] = trim($meta_tag['content']);
 						break;
-					case "thumbnail":
-						$siteinfo["image"] = $attr["content"];
+					case 'thumbnail':
+						$siteinfo['image'] = $meta_tag['content'];
 						break;
-					case "twitter:image":
-						$siteinfo["image"] = $attr["content"];
+					case 'twitter:image':
+						$siteinfo['image'] = $meta_tag['content'];
 						break;
-					case "twitter:image:src":
-						$siteinfo["image"] = $attr["content"];
+					case 'twitter:image:src':
+						$siteinfo['image'] = $meta_tag['content'];
 						break;
-					case "twitter:card":
-						if (($siteinfo["type"] == "") || ($attr["content"] == "photo")) {
-							$siteinfo["type"] = $attr["content"];
+					case 'twitter:card':
+						if (($siteinfo['type'] == '') || ($meta_tag['content'] == 'photo')) {
+							$siteinfo['type'] = $meta_tag['content'];
 						}
 						break;
-					case "twitter:description":
-						$siteinfo["text"] = trim($attr["content"]);
+					case 'twitter:description':
+						$siteinfo['text'] = trim($meta_tag['content']);
 						break;
-					case "twitter:title":
-						$siteinfo["title"] = trim($attr["content"]);
+					case 'twitter:title':
+						$siteinfo['title'] = trim($meta_tag['content']);
 						break;
-					case "dc.title":
-						$siteinfo["title"] = trim($attr["content"]);
+					case 'dc.title':
+						$siteinfo['title'] = trim($meta_tag['content']);
 						break;
-					case "dc.description":
-						$siteinfo["text"] = trim($attr["content"]);
+					case 'dc.description':
+						$siteinfo['text'] = trim($meta_tag['content']);
 						break;
-					case "keywords":
-						$keywords = explode(",", $attr["content"]);
+					case 'keywords':
+						$keywords = explode(',', $meta_tag['content']);
 						break;
-					case "news_keywords":
-						$keywords = explode(",", $attr["content"]);
+					case 'news_keywords':
+						$keywords = explode(',', $meta_tag['content']);
 						break;
 				}
 			}
-			if ($siteinfo["type"] == "summary") {
-				$siteinfo["type"] = "link";
+			if ($siteinfo['type'] == 'summary') {
+				$siteinfo['type'] = 'link';
 			}
 		}
 
 		if (isset($keywords)) {
-			$siteinfo["keywords"] = [];
+			$siteinfo['keywords'] = [];
 			foreach ($keywords as $keyword) {
-				if (!in_array(trim($keyword), $siteinfo["keywords"])) {
-					$siteinfo["keywords"][] = trim($keyword);
+				if (!in_array(trim($keyword), $siteinfo['keywords'])) {
+					$siteinfo['keywords'][] = trim($keyword);
 				}
 			}
 		}
 
-		//$list = $xpath->query("head/meta[@property]");
-		$list = $xpath->query("//meta[@property]");
+		$list = $xpath->query('//meta[@property]');
 		foreach ($list as $node) {
-			$attr = [];
+			$meta_tag = [];
 			if ($node->attributes->length) {
 				foreach ($node->attributes as $attribute) {
-					$attr[$attribute->name] = $attribute->value;
+					$meta_tag[$attribute->name] = $attribute->value;
 				}
 			}
 
-			if (!empty($attr["content"])) {
-				$attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8"));
+			if (!empty($meta_tag['content'])) {
+				$meta_tag['content'] = trim(html_entity_decode($meta_tag['content'], ENT_QUOTES, 'UTF-8'));
 
-				switch (strtolower($attr["property"])) {
-					case "og:image":
-						$siteinfo["image"] = $attr["content"];
+				switch (strtolower($meta_tag['property'])) {
+					case 'og:image':
+						$siteinfo['image'] = $meta_tag['content'];
 						break;
-					case "og:title":
-						$siteinfo["title"] = trim($attr["content"]);
+					case 'og:title':
+						$siteinfo['title'] = trim($meta_tag['content']);
 						break;
-					case "og:description":
-						$siteinfo["text"] = trim($attr["content"]);
+					case 'og:description':
+						$siteinfo['text'] = trim($meta_tag['content']);
 						break;
 				}
 			}
 		}
 
-		if ((@$siteinfo["image"] == "") && !$no_guessing) {
-			$list = $xpath->query("//img[@src]");
+		if ((@$siteinfo['image'] == '') && !$no_guessing) {
+			$list = $xpath->query('//img[@src]');
 			foreach ($list as $node) {
-				$attr = [];
+				$img_tag = [];
 				if ($node->attributes->length) {
 					foreach ($node->attributes as $attribute) {
-						$attr[$attribute->name] = $attribute->value;
+						$img_tag[$attribute->name] = $attribute->value;
 					}
 				}
 
-				$src = self::completeUrl($attr["src"], $url);
+				$src = self::completeUrl($img_tag['src'], $url);
 				$photodata = Image::getInfoFromURL($src);
 
 				if (($photodata) && ($photodata[0] > 150) && ($photodata[1] > 150)) {
@@ -357,70 +354,72 @@ class ParseUrl
 						$photodata[0] = round($photodata[0] * (300 / $photodata[1]));
 						$photodata[1] = 300;
 					}
-					$siteinfo["images"][] = ["src" => $src,
-									"width" => $photodata[0],
-									"height" => $photodata[1]];
+					$siteinfo['images'][] = [
+						'src'    => $src,
+						'width'  => $photodata[0],
+						'height' => $photodata[1]
+					];
 				}
 			}
-		} elseif (!empty($siteinfo["image"])) {
-			$src = self::completeUrl($siteinfo["image"], $url);
+		} elseif (!empty($siteinfo['image'])) {
+			$src = self::completeUrl($siteinfo['image'], $url);
 
-			unset($siteinfo["image"]);
+			unset($siteinfo['image']);
 
 			$photodata = Image::getInfoFromURL($src);
 
 			if (($photodata) && ($photodata[0] > 10) && ($photodata[1] > 10)) {
-				$siteinfo["images"][] = ["src" => $src,
-								"width" => $photodata[0],
-								"height" => $photodata[1]];
+				$siteinfo['images'][] = ['src' => $src,
+					'width' => $photodata[0],
+					'height' => $photodata[1]];
 			}
 		}
 
-		if ((@$siteinfo["text"] == "") && (@$siteinfo["title"] != "") && !$no_guessing) {
-			$text = "";
+		if ((@$siteinfo['text'] == '') && (@$siteinfo['title'] != '') && !$no_guessing) {
+			$text = '';
 
-			$list = $xpath->query("//div[@class='article']");
+			$list = $xpath->query('//div[@class="article"]');
 			foreach ($list as $node) {
 				if (strlen($node->nodeValue) > 40) {
-					$text .= " ".trim($node->nodeValue);
+					$text .= ' ' . trim($node->nodeValue);
 				}
 			}
 
-			if ($text == "") {
-				$list = $xpath->query("//div[@class='content']");
+			if ($text == '') {
+				$list = $xpath->query('//div[@class="content"]');
 				foreach ($list as $node) {
 					if (strlen($node->nodeValue) > 40) {
-						$text .= " ".trim($node->nodeValue);
+						$text .= ' ' . trim($node->nodeValue);
 					}
 				}
 			}
 
 			// If none text was found then take the paragraph content
-			if ($text == "") {
-				$list = $xpath->query("//p");
+			if ($text == '') {
+				$list = $xpath->query('//p');
 				foreach ($list as $node) {
 					if (strlen($node->nodeValue) > 40) {
-						$text .= " ".trim($node->nodeValue);
+						$text .= ' ' . trim($node->nodeValue);
 					}
 				}
 			}
 
-			if ($text != "") {
-				$text = trim(str_replace(["\n", "\r"], [" ", " "], $text));
+			if ($text != '') {
+				$text = trim(str_replace(["\n", "\r"], [' ', ' '], $text));
 
-				while (strpos($text, "  ")) {
-					$text = trim(str_replace("  ", " ", $text));
+				while (strpos($text, '  ')) {
+					$text = trim(str_replace('  ', ' ', $text));
 				}
 
-				$siteinfo["text"] = trim(html_entity_decode(substr($text, 0, 350), ENT_QUOTES, "UTF-8").'...');
+				$siteinfo['text'] = trim(html_entity_decode(substr($text, 0, 350), ENT_QUOTES, 'UTF-8') . '...');
 			}
 		}
 
-		logger("parseurl_getsiteinfo: Siteinfo for ".$url." ".print_r($siteinfo, true), LOGGER_DEBUG);
+		logger('Siteinfo for ' . $url . ' ' . print_r($siteinfo, true), LOGGER_DEBUG);
 
-		Addon::callHooks("getsiteinfo", $siteinfo);
+		Addon::callHooks('getsiteinfo', $siteinfo);
 
-		return($siteinfo);
+		return $siteinfo;
 	}
 
 	/**

From 9744f0e7809873bf3bed76b72bcef25e34ebcdd6 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 2 Sep 2018 17:50:27 -0400
Subject: [PATCH 34/96] Update ParseUrl::getSiteinfo type recognition

- Added obsolete twitter card type provision
---
 src/Util/ParseUrl.php | 96 +++++++++++++++++++++++--------------------
 1 file changed, 51 insertions(+), 45 deletions(-)

diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index b897c54ee7..2c134542a0 100644
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -248,55 +248,61 @@ class ParseUrl
 				}
 			}
 
-			if (!empty($meta_tag['content'])) {
-				$meta_tag['content'] = trim(html_entity_decode($meta_tag['content'], ENT_QUOTES, 'UTF-8'));
+			if (empty($meta_tag['content'])) {
+				continue;
+			}
 
-				switch (strtolower($meta_tag['name'])) {
-					case 'fulltitle':
-						$siteinfo['title'] = trim($meta_tag['content']);
-						break;
-					case 'description':
-						$siteinfo['text'] = trim($meta_tag['content']);
-						break;
-					case 'thumbnail':
-						$siteinfo['image'] = $meta_tag['content'];
-						break;
-					case 'twitter:image':
-						$siteinfo['image'] = $meta_tag['content'];
-						break;
-					case 'twitter:image:src':
-						$siteinfo['image'] = $meta_tag['content'];
-						break;
-					case 'twitter:card':
-						if (($siteinfo['type'] == '') || ($meta_tag['content'] == 'photo')) {
-							$siteinfo['type'] = $meta_tag['content'];
-						}
-						break;
-					case 'twitter:description':
-						$siteinfo['text'] = trim($meta_tag['content']);
-						break;
-					case 'twitter:title':
-						$siteinfo['title'] = trim($meta_tag['content']);
-						break;
-					case 'dc.title':
-						$siteinfo['title'] = trim($meta_tag['content']);
-						break;
-					case 'dc.description':
-						$siteinfo['text'] = trim($meta_tag['content']);
-						break;
-					case 'keywords':
-						$keywords = explode(',', $meta_tag['content']);
-						break;
-					case 'news_keywords':
-						$keywords = explode(',', $meta_tag['content']);
-						break;
-				}
-			}
-			if ($siteinfo['type'] == 'summary') {
-				$siteinfo['type'] = 'link';
+			$meta_tag['content'] = trim(html_entity_decode($meta_tag['content'], ENT_QUOTES, 'UTF-8'));
+
+			switch (strtolower($meta_tag['name'])) {
+				case 'fulltitle':
+					$siteinfo['title'] = trim($meta_tag['content']);
+					break;
+				case 'description':
+					$siteinfo['text'] = trim($meta_tag['content']);
+					break;
+				case 'thumbnail':
+					$siteinfo['image'] = $meta_tag['content'];
+					break;
+				case 'twitter:image':
+					$siteinfo['image'] = $meta_tag['content'];
+					break;
+				case 'twitter:image:src':
+					$siteinfo['image'] = $meta_tag['content'];
+					break;
+				case 'twitter:card':
+					// Obsolete card type
+					if ($meta_tag['content'] == 'photo') {
+						$siteinfo['type'] = 'summary_large_image';
+					} else {
+						$siteinfo['type'] = $meta_tag['content'];
+					}
+					break;
+				case 'twitter:description':
+					$siteinfo['text'] = trim($meta_tag['content']);
+					break;
+				case 'twitter:title':
+					$siteinfo['title'] = trim($meta_tag['content']);
+					break;
+				case 'dc.title':
+					$siteinfo['title'] = trim($meta_tag['content']);
+					break;
+				case 'dc.description':
+					$siteinfo['text'] = trim($meta_tag['content']);
+					break;
+				case 'keywords':
+					$keywords = explode(',', $meta_tag['content']);
+					break;
+				case 'news_keywords':
+					$keywords = explode(',', $meta_tag['content']);
+					break;
 			}
 		}
 
+		if ($siteinfo['type'] == 'summary' || $siteinfo['type'] == 'summary_large_image') {
+			$siteinfo['type'] = 'link';
+		}
+
 		if (isset($keywords)) {
 			$siteinfo['keywords'] = [];
 			foreach ($keywords as $keyword) {

From 821429fdf13ca1bcd442b389d390287921b65e0b Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 4 Sep 2018 17:48:09 +0000
Subject: [PATCH 35/96] Good news, everyone - again somce notices removed

---
 mod/events.php             | 18 ++++++++++--------
 mod/notifications.php      | 11 ++++-------
 mod/unfollow.php           |  2 +-
 src/App.php                |  6 +++++-
 src/Util/HTTPSignature.php |  2 ++
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/mod/events.php b/mod/events.php
index 91474022fc..21cf70d20f 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -54,11 +54,11 @@ function events_post(App $a) {
 	$cid = (x($_POST, 'cid') ? intval($_POST['cid']) : 0);
 	$uid = local_user();
 
-	$start_text  = escape_tags($_REQUEST['start_text']);
-	$finish_text = escape_tags($_REQUEST['finish_text']);
+	$start_text  = escape_tags(defaults($_REQUEST, 'start_text', ''));
+	$finish_text = escape_tags(defaults($_REQUEST, 'finish_text', ''));
 
-	$adjust   = intval($_POST['adjust']);
-	$nofinish = intval($_POST['nofinish']);
+	$adjust   = intval(defaults($_POST, 'adjust', 0));
+	$nofinish = intval(defaults($_POST, 'nofinish', 0));
 
 	// The default setting for the `private` field in event_store() is false, so mirror that
 	$private_event = false;
@@ -91,9 +91,9 @@ function events_post(App $a) {
 	// and we'll waste a bunch of time responding to it. Time that
 	// could've been spent doing something else.
 
-	$summary  = escape_tags(trim($_POST['summary']));
-	$desc     = escape_tags(trim($_POST['desc']));
-	$location = escape_tags(trim($_POST['location']));
+	$summary  = escape_tags(trim(defaults($_POST, 'summary', '')));
+	$desc     = escape_tags(trim(defaults($_POST, 'desc', '')));
+	$location = escape_tags(trim(defaults($_POST, 'location', '')));
 	$type     = 'event';
 
 	$action = ($event_id == '') ? 'new' : "event/" . $event_id;
@@ -117,7 +117,7 @@ function events_post(App $a) {
 		goaway($onerror_url);
 	}
 
-	$share = (intval($_POST['share']) ? intval($_POST['share']) : 0);
+	$share = intval(defaults($_POST, 'share', 0));
 
 	$c = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
 		intval(local_user())
@@ -484,6 +484,8 @@ function events_content(App $a) {
 
 		if ($mode === 'new' || $mode === 'copy') {
 			$acl = ($cid ? '' : ACL::getFullSelectorHTML($a->user, false, $orig_event));
+		} else {
+			$acl = '';
 		}
 
 		// If we copy an old event, we need to remove the ID and URI
diff --git a/mod/notifications.php b/mod/notifications.php
index bc581b6dd3..091323d998 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -87,10 +87,11 @@ function notifications_content(App $a)
 	$perpage = 20;
 	$startrec = ($page * $perpage) - $perpage;
 
+	$notif_header = L10n::t('Notifications');
+
 	// Get introductions
 	if ((($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) {
 		Nav::setSelected('introductions');
-		$notif_header = L10n::t('Notifications');
 
 		$all = (($a->argc > 2) && ($a->argv[2] == 'all'));
 
@@ -132,12 +133,8 @@ function notifications_content(App $a)
 
 	$notif_tpl = get_markup_template('notifications.tpl');
 
-	if (!isset($notifs['ident'])) {
-		logger('Missing data in notifs: ' . json_encode($a->argv), LOGGER_DEBUG);
-	}
-
 	// Process the data for template creation
-	if ($notifs['ident'] === 'introductions') {
+	if (defaults($notifs, 'ident', '') === 'introductions') {
 		$sugg = get_markup_template('suggestions.tpl');
 		$tpl = get_markup_template("intros.tpl");
 
@@ -280,7 +277,7 @@ function notifications_content(App $a)
 		}
 
 	// Normal notifications (no introductions)
-	} else {
+	} elseif (!empty($notifs['notifications'])) {
 		// The template files we need in different cases for formatting the content
 		$tpl_item_like = 'notifications_likes_item.tpl';
 		$tpl_item_dislike = 'notifications_dislikes_item.tpl';
diff --git a/mod/unfollow.php b/mod/unfollow.php
index 0af16ec671..956b6fbdb7 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -22,7 +22,7 @@ function unfollow_post()
 		// NOTREACHED
 	}
 
-	if ($_REQUEST['cancel']) {
+	if (!empty($_REQUEST['cancel'])) {
 		goaway($return_url);
 	}
 
diff --git a/src/App.php b/src/App.php
index 2a5fba8541..488c2301b6 100644
--- a/src/App.php
+++ b/src/App.php
@@ -1074,7 +1074,11 @@ class App
 
 		$meminfo = [];
 		foreach ($memdata as $line) {
-			list($key, $val) = explode(':', $line);
+			$data = explode(':', $line);
+			if (count($data) != 2) {
+				continue;
+			}
+			list($key, $val) = $data;
 			$meminfo[$key] = (int) trim(str_replace('kB', '', $val));
 			$meminfo[$key] = (int) ($meminfo[$key] / 1024);
 		}
diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index f88b0423c5..911de4308e 100644
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -125,6 +125,8 @@ class HTTPSignature
 			$key = $key($sig_block['keyId']);
 		}
 
+		logger('Got keyID ' . $sig_block['keyId']);
+
 		// We don't use Activity Pub at the moment.
 //		if (!$key) {
 //			$result['signer'] = $sig_block['keyId'];

From 635c8d7450866cb8b77a6d1d42260257e286a940 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 4 Sep 2018 21:24:30 +0000
Subject: [PATCH 36/96] Beautified the code

---
 mod/events.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/events.php b/mod/events.php
index 21cf70d20f..c4d40252d3 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -482,8 +482,8 @@ function events_content(App $a) {
 
 		$perms = ACL::getDefaultUserPermissions($orig_event);
 
-		if ($mode === 'new' || $mode === 'copy') {
-			$acl = ($cid ? '' : ACL::getFullSelectorHTML($a->user, false, $orig_event));
+		if (!$cid && in_array($mode, ['new', 'copy'])) {
+			$acl = ACL::getFullSelectorHTML($a->user, false, $orig_event);
 		} else {
 			$acl = '';
 		}

From 9de0d354506fdb20929e68d10cf3680181d4382c Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Tue, 4 Sep 2018 19:29:36 -0400
Subject: [PATCH 37/96] Remove extraneous SQL condition part in mod/unfollow

---
 mod/unfollow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/unfollow.php b/mod/unfollow.php
index 0af16ec671..f9b0a2fcba 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -29,7 +29,7 @@ function unfollow_post()
 	$uid = local_user();
 	$url = notags(trim(defaults($_REQUEST, 'url', '')));
 
-	$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
+	$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
 		$uid, Contact::SHARING, Contact::FRIEND, normalise_link($url),
 		normalise_link($url), $url];
 	$contact = DBA::selectFirst('contact', [], $condition);

From 9ef1d827f35dfcd779015003bc359e3dd7d6fef6 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 5 Sep 2018 05:02:06 +0000
Subject: [PATCH 38/96] Restore the behaviour to remove the remote contact upon
 termination

---
 mod/contacts.php        |  2 +-
 mod/dfrn_notify.php     |  4 ++--
 mod/dirfind.php         |  2 +-
 mod/unfollow.php        |  6 ++++--
 src/Model/Contact.php   | 12 ++++++++----
 src/Protocol/DFRN.php   | 13 ++++++++-----
 src/Worker/Notifier.php |  2 +-
 7 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/mod/contacts.php b/mod/contacts.php
index 70a582c6ee..68f68fec3b 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -368,7 +368,7 @@ function _contact_drop($orig_record)
 		return;
 	}
 
-	Contact::terminateFriendship($r[0], $orig_record);
+	Contact::terminateFriendship($r[0], $orig_record, true);
 	Contact::remove($orig_record['id']);
 }
 
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 88f706385b..f653faca95 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -322,8 +322,8 @@ function dfrn_notify_content(App $a) {
 		$encrypted_id = '';
 		$id_str       = $my_id . '.' . mt_rand(1000,9999);
 
-		$prv_key = trim($importer['prvkey']);
-		$pub_key = trim($importer['pubkey']);
+		$prv_key = trim($importer['cprvkey']);
+		$pub_key = trim($importer['cpubkey']);
 		$dplx    = intval($importer['duplex']);
 
 		if (($dplx && strlen($prv_key)) || (strlen($prv_key) && !strlen($pub_key))) {
diff --git a/mod/dirfind.php b/mod/dirfind.php
index f4ddba45d4..332fe90f6c 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -44,7 +44,7 @@ function dirfind_content(App $a, $prefix = "") {
 
 	$local = Config::get('system','poco_local_search');
 
-	$search = $prefix.notags(trim($_REQUEST['search']));
+	$search = $prefix.notags(trim(defaults($_REQUEST, 'search', '')));
 
 	$header = '';
 
diff --git a/mod/unfollow.php b/mod/unfollow.php
index 956b6fbdb7..0aa114759f 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -46,13 +46,15 @@ function unfollow_post()
 		// NOTREACHED
 	}
 
+	$dissolve = ($contact['rel'] == Contact::SHARING);
+
 	$owner = User::getOwnerDataById($uid);
 	if ($owner) {
-		Contact::terminateFriendship($owner, $contact);
+		Contact::terminateFriendship($owner, $contact, $dissolve);
 	}
 
 	// Sharing-only contacts get deleted as there no relationship any more
-	if ($contact['rel'] == Contact::SHARING) {
+	if ($dissolve) {
 		Contact::remove($contact['id']);
 		$return_path = 'contacts';
 	} else {
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index d53126f6ff..1bbc0228a8 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -17,6 +17,7 @@ use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
 use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
@@ -528,13 +529,16 @@ class Contact extends BaseObject
 	/**
 	 * @brief Sends an unfriend message. Does not remove the contact
 	 *
-	 * @param array $user    User unfriending
-	 * @param array $contact Contact unfriended
+	 * @param array   $user     User unfriending
+	 * @param array   $contact  Contact unfriended
+	 * @param boolean $dissolve Remove the contact on the remote side
 	 * @return void
 	 */
-	public static function terminateFriendship(array $user, array $contact)
+	public static function terminateFriendship(array $user, array $contact, $dissolve = false)
 	{
-		if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {
+		if (($contact['network'] == Protocol::DFRN) && $dissolve) {
+			DFRN::deliver($user, $contact, 'placeholder', true);
+		} elseif (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {
 			// create an unfollow slap
 			$item = [];
 			$item['verb'] = NAMESPACE_OSTATUS . "/unfollow";
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index c435550313..b207c3ca87 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -81,7 +81,8 @@ class DFRN
 				return [];
 			}
 
-			$user['importer_uid']  = $user['uid'];
+			$user['importer_uid'] = $user['uid'];
+			$user['uprvkey'] = $user['prvkey'];
 		} else {
 			$user = ['importer_uid' => 0, 'uprvkey' => '', 'timezone' => 'UTC',
 				'nickname' => '', 'sprvkey' => '', 'spubkey' => '',
@@ -1168,10 +1169,12 @@ class DFRN
 		$a = get_app();
 
 		// At first try the Diaspora transport layer
-		$ret = self::transmit($owner, $contact, $atom);
-		if ($ret >= 200) {
-			logger('Delivery via Diaspora transport layer was successful with status ' . $ret);
-			return $ret;
+		if (!$dissolve) {
+			$ret = self::transmit($owner, $contact, $atom);
+			if ($ret >= 200) {
+				logger('Delivery via Diaspora transport layer was successful with status ' . $ret);
+				return $ret;
+			}
 		}
 
 		$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 6d2733b8ee..61eaba388b 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -96,7 +96,7 @@ class Notifier
 				return;
 			}
 			foreach ($r as $contact) {
-				Contact::terminateFriendship($user, $contact);
+				Contact::terminateFriendship($user, $contact, true);
 			}
 			return;
 		} elseif ($cmd == Delivery::RELOCATION) {

From 88d25f977a078dd3e5dfb7d0461cf231ff64358f Mon Sep 17 00:00:00 2001
From: rabuzarus <rabuzarus@t-online.de>
Date: Wed, 5 Sep 2018 14:12:56 +0200
Subject: [PATCH 39/96] fix lockview for photos - use the private field only
 for items because other tables than the item table don't have the private
 field

---
 mod/lockview.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mod/lockview.php b/mod/lockview.php
index 893764c4d9..7617d6f736 100644
--- a/mod/lockview.php
+++ b/mod/lockview.php
@@ -24,11 +24,12 @@ function lockview_content(App $a) {
 	if (!in_array($type, ['item','photo','event']))
 		killme();
 
-	$fields = ['uid', 'private', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
+	$fields = ['uid', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
 	$condition = ['id' => $item_id];
 	if ($type != 'item') {
 		$item = DBA::selectFirst($type, $fields, $condition);
 	} else {
+		$fields[] = 'private';
 		$item = Item::selectFirst($fields, $condition);
 	}
 

From bd9d102da254f723436adc544f510a92a8935925 Mon Sep 17 00:00:00 2001
From: rabuzarus <rabuzarus@t-online.de>
Date: Wed, 5 Sep 2018 14:24:51 +0200
Subject: [PATCH 40/96] apply coding standards to lockview module

---
 mod/lockview.php | 61 +++++++++++++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 24 deletions(-)

diff --git a/mod/lockview.php b/mod/lockview.php
index 7617d6f736..0d87e15510 100644
--- a/mod/lockview.php
+++ b/mod/lockview.php
@@ -8,24 +8,27 @@ use Friendica\Core\L10n;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
 
-function lockview_content(App $a) {
-
+function lockview_content(App $a)
+{
 	$type = (($a->argc > 1) ? $a->argv[1] : 0);
 	if (is_numeric($type)) {
 		$item_id = intval($type);
-		$type='item';
+		$type = 'item';
 	} else {
 		$item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
 	}
 
-	if (!$item_id)
+	if (!$item_id) {
 		killme();
+	}
 
-	if (!in_array($type, ['item','photo','event']))
+	if (!in_array($type, ['item','photo','event'])) {
 		killme();
+	}
 
 	$fields = ['uid', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
 	$condition = ['id' => $item_id];
+
 	if ($type != 'item') {
 		$item = DBA::selectFirst($type, $fields, $condition);
 	} else {
@@ -44,18 +47,20 @@ function lockview_content(App $a) {
 		killme();
 	}
 
-
-	if (($item['private'] == 1) && empty($item['allow_cid']) && empty($item['allow_gid'])
-		&& empty($item['deny_cid']) && empty($item['deny_gid'])) {
-
+	if ($item['private'] == 1
+		&& empty($item['allow_cid'])
+		&& empty($item['allow_gid'])
+		&& empty($item['deny_cid'])
+		&& empty($item['deny_gid']))
+	{
 		echo L10n::t('Remote privacy information not available.') . '<br />';
 		killme();
 	}
 
-	$allowed_users = expand_acl($item['allow_cid']);
+	$allowed_users  = expand_acl($item['allow_cid']);
 	$allowed_groups = expand_acl($item['allow_gid']);
-	$deny_users = expand_acl($item['deny_cid']);
-	$deny_groups = expand_acl($item['deny_gid']);
+	$deny_users     = expand_acl($item['deny_cid']);
+	$deny_groups    = expand_acl($item['deny_gid']);
 
 	$o = L10n::t('Visible to:') . '<br />';
 	$l = [];
@@ -64,36 +69,44 @@ function lockview_content(App $a) {
 		$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
 			DBA::escape(implode(', ', $allowed_groups))
 		);
-		if (DBA::isResult($r))
-			foreach($r as $rr)
+		if (DBA::isResult($r)) {
+			foreach ($r as $rr) {
 				$l[] = '<b>' . $rr['name'] . '</b>';
+			}
+		}
 	}
+
 	if (count($allowed_users)) {
 		$r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )",
-			DBA::escape(implode(', ',$allowed_users))
+			DBA::escape(implode(', ', $allowed_users))
 		);
-		if (DBA::isResult($r))
-			foreach($r as $rr)
+		if (DBA::isResult($r)) {
+			foreach ($r as $rr) {
 				$l[] = $rr['name'];
-
+			}
+		}
 	}
 
 	if (count($deny_groups)) {
 		$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
 			DBA::escape(implode(', ', $deny_groups))
 		);
-		if (DBA::isResult($r))
-			foreach($r as $rr)
+		if (DBA::isResult($r)) {
+			foreach ($r as $rr) {
 				$l[] = '<b><strike>' . $rr['name'] . '</strike></b>';
+			}
+		}
 	}
+
 	if (count($deny_users)) {
 		$r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )",
-			DBA::escape(implode(', ',$deny_users))
+			DBA::escape(implode(', ', $deny_users))
 		);
-		if (DBA::isResult($r))
-			foreach($r as $rr)
+		if (DBA::isResult($r)) {
+			foreach ($r as $rr) {
 				$l[] = '<strike>' . $rr['name'] . '</strike>';
-
+			}
+		}
 	}
 
 	echo $o . implode(', ', $l);

From 85fed927c3e827d471a1c5f6b49d6e7da49a075c Mon Sep 17 00:00:00 2001
From: rabuzarus <rabuzarus@t-online.de>
Date: Wed, 5 Sep 2018 17:30:07 +0200
Subject: [PATCH 41/96] Frio - addToModal() can now be used with an element ID
 as a parameter

---
 view/theme/frio/js/modal.js | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/view/theme/frio/js/modal.js b/view/theme/frio/js/modal.js
index 2b3059eaf1..9a15cab52a 100644
--- a/view/theme/frio/js/modal.js
+++ b/view/theme/frio/js/modal.js
@@ -188,14 +188,25 @@ function loadModalTitle() {
 	}
 }
 
-// This function loads html content from a friendica page
-// into a modal.
-function addToModal(url) {
+
+/**
+ * This function loads html content from a friendica page into a modal.
+ * 
+ * @param {string} url The url with html content.
+ * @param {string} id The ID of a html element (can be undefined).
+ * @returns {void}
+ */
+function addToModal(url, id) {
 	var char = qOrAmp(url);
 
 	url = url + char + 'mode=none';
 	var modal = $('#modal').modal();
 
+	// Only search for an element if we have an ID.
+	if (typeof id !== "undefined") {
+		url = url + " div#" + id;
+	}
+
 	modal
 		.find('#modal-body')
 		.load(url, function (responseText, textStatus) {
@@ -215,7 +226,7 @@ function addToModal(url) {
 		});
 }
 
-// Add a element (by it's id) to a bootstrap modal.
+// Add an element (by its id) to a bootstrap modal.
 function addElmToModal(id) {
 	var elm = $(id).html();
 	var modal = $('#modal').modal();

From 7c5e964581480902d7f0571ff92936beda36f4e2 Mon Sep 17 00:00:00 2001
From: rabuzarus <rabuzarus@t-online.de>
Date: Wed, 5 Sep 2018 18:24:04 +0200
Subject: [PATCH 42/96] Frio - fix missing modal for editing albums

---
 view/theme/frio/js/mod_photos.js          |  7 +++++++
 view/theme/frio/templates/album_edit.tpl  | 23 ++++++++++++-----------
 view/theme/frio/templates/photo_album.tpl |  4 ++--
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/view/theme/frio/js/mod_photos.js b/view/theme/frio/js/mod_photos.js
index b8d03b5db9..77173385b1 100644
--- a/view/theme/frio/js/mod_photos.js
+++ b/view/theme/frio/js/mod_photos.js
@@ -15,7 +15,14 @@ $(document).ready(function() {
 
 	}).trigger('change');
 
+	// Click event listener for the album edit link/button.
+	$("body").on('click', '#album-edit-link', function() {
+		var modalUrl = $(this).attr("data-modal-url");
 
+		if (typeof modalUrl !== "undefined") {
+			addToModal(modalUrl, 'photo-album-edit-wrapper');
+		}
+	});
 });
 
 $(window).load(function() {
diff --git a/view/theme/frio/templates/album_edit.tpl b/view/theme/frio/templates/album_edit.tpl
index 583eb6d1b7..f4a60b7d03 100644
--- a/view/theme/frio/templates/album_edit.tpl
+++ b/view/theme/frio/templates/album_edit.tpl
@@ -1,14 +1,15 @@
 <div id="photo-album-edit-wrapper">
-<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
-	<label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
-	<div class="pull-left photo-album-edit-name">
-	<input class="form-control" type="text" size="64" name="albumname" value="{{$album|escape:'html'}}" id="photo-album-edit-name" style="width: 100%;">
-	</div>
-	
-	<div class="pull-right">
-	<input class="btn-primary btn btn-small" id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
-	<input class="btn-primary btn btn-small" id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit|escape:'html'}}" onclick="return confirmDelete();" />
-	</div>
-</form>
+	<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
+		<label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
+		<div class="pull-left photo-album-edit-name">
+			<input class="form-control" type="text" size="64" name="albumname" value="{{$album|escape:'html'}}" id="photo-album-edit-name">
+		</div>
+
+		<div class="pull-right">
+			<input class="btn-primary btn btn-small" id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+			<input class="btn-primary btn btn-small" id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit|escape:'html'}}" onclick="return confirmDelete();" />
+		</div>
+	</form>
+	<div class="clear"></div>
 </div>
 <div class="clear"></div>
diff --git a/view/theme/frio/templates/photo_album.tpl b/view/theme/frio/templates/photo_album.tpl
index c991b03cfc..235b9c46db 100644
--- a/view/theme/frio/templates/photo_album.tpl
+++ b/view/theme/frio/templates/photo_album.tpl
@@ -12,9 +12,9 @@
 
 		{{if $edit}}
 		<span class="icon-padding"> </span>
-		<a id="album-edit-link" class="page-action faded-icon" href="{{$edit.1}}" title="{{$edit.0}}" data-toggle="tooltip">
+		<button id="album-edit-link" class="btn-link page-action faded-icon" type="button" data-modal-url="{{$edit.1}}" title="{{$edit.0}}" data-toggle="tooltip">
 			<i class="fa fa-pencil"></i>
-		</a>
+		</button>
 		{{/if}}
 
 		{{if ! $noorder}}

From f9fe162f2fa4a2142e8157ca2a7f20f7b0efeced Mon Sep 17 00:00:00 2001
From: rabuzarus <rabuzarus@t-online.de>
Date: Wed, 5 Sep 2018 18:31:09 +0200
Subject: [PATCH 43/96] Frio - rise version

---
 view/theme/frio/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 4e01289624..72e5ab0b61 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -2,7 +2,7 @@
 /*
  * Name: frio
  * Description: Bootstrap V3 theme. The theme is currently under construction, so it is far from finished. For further information have a look at the <a href="https://github.com/friendica/friendica/tree/develop/view/theme/frio/README.md">ReadMe</a>.
- * Version: V.0.8
+ * Version: V.0.8.5
  * Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus>
  *
  */

From 1fe16282370ebec7218537e763e35f608bb68a17 Mon Sep 17 00:00:00 2001
From: rabuzarus <trebor@central-unit>
Date: Wed, 5 Sep 2018 18:44:47 +0200
Subject: [PATCH 44/96] lockview - prevent notices

---
 mod/lockview.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mod/lockview.php b/mod/lockview.php
index 0d87e15510..a2301b4ccb 100644
--- a/mod/lockview.php
+++ b/mod/lockview.php
@@ -47,7 +47,8 @@ function lockview_content(App $a)
 		killme();
 	}
 
-	if ($item['private'] == 1
+	if (isset($item['private'])
+		&& $item['private'] == 1
 		&& empty($item['allow_cid'])
 		&& empty($item['allow_gid'])
 		&& empty($item['deny_cid'])

From 75a2576f7896d97d1e4127ee9563c0c8927bb5f8 Mon Sep 17 00:00:00 2001
From: rabuzarus <rabuzarus@t-online.de>
Date: Thu, 6 Sep 2018 01:42:35 +0200
Subject: [PATCH 45/96] use magic links in single event view

---
 src/Model/Event.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Model/Event.php b/src/Model/Event.php
index 992b77bada..016d1f8d9e 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -12,6 +12,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
 
@@ -589,6 +590,12 @@ class Event extends BaseObject
 				$title = strip_tags(html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
 			}
 
+			$author_link = $event['author-link'];
+			$plink       = $event['plink'];
+
+			$event['author-link'] = Contact::magicLink($author_link);
+			$event['plink']       = Contact::magicLink($author_link, $plink);
+
 			$html = self::getHTML($event);
 			$event['desc']     = BBCode::convert($event['desc']);
 			$event['location'] = BBCode::convert($event['location']);

From 04fb88585783f4883b40ec9d49a4a7fa644fb294 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 6 Sep 2018 04:24:34 +0000
Subject: [PATCH 46/96] Fix: Posts with pictures will now look good again on
 connector networks

---
 mod/photos.php              |  2 +-
 src/Content/Text/BBCode.php |  5 ++++-
 src/Util/ParseUrl.php       | 10 +++-------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index 5fb6ba3683..16af455997 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1633,7 +1633,7 @@ function photos_content(App $a)
 			'$paginate' => $paginate,
 		]);
 
-		$a->page['htmlhead'] .= "\n" . '<meta name="twitter:card" content="photo" />' . "\n";
+		$a->page['htmlhead'] .= "\n" . '<meta name="twitter:card" content="summary_large_image" />' . "\n";
 		$a->page['htmlhead'] .= '<meta name="twitter:title" content="' . $photo["album"] . '" />' . "\n";
 		$a->page['htmlhead'] .= '<meta name="twitter:image" content="' . $photo["href"] . '" />' . "\n";
 		$a->page['htmlhead'] .= '<meta name="twitter:image:width" content="' . $photo["width"] . '" />' . "\n";
diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 55fc24273d..3054170fc0 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -578,7 +578,10 @@ class BBCode extends BaseObject
 					$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], self::proxyUrl($data["preview"], $simplehtml), $data["title"]);
 				}
 
-				if (!empty($data['title']) && !empty($data['url'])) {
+				// Show a picture only when the BBCode is meant for posts to connector networks
+				if (($simplehtml != 0) && ($data["type"] == "photo") && !empty($data["url"]) && !empty($data["image"])) {
+					$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a>', $data["url"], self::proxyUrl($data["image"], $simplehtml), $data["title"]);
+				} elseif (!empty($data['title']) && !empty($data['url'])) {
 					$return .= sprintf('<h4><a href="%s">%s</a></h4>', $data['url'], $data['title']);
 				}
 
diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index 2c134542a0..520100b6d7 100644
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -271,9 +271,9 @@ class ParseUrl
 					$siteinfo['image'] = $meta_tag['content'];
 					break;
 				case 'twitter:card':
-					// Obsolete card type
-					if ($meta_tag['content'] == 'photo') {
-						$siteinfo['type'] = 'summary_large_image';
+					// Convert Twitter types in our own
+					if ($meta_tag['content'] == 'summary_large_image') {
+						$siteinfo['type'] = 'photo';
 					} else {
 						$siteinfo['type'] = $meta_tag['content'];
 					}
@@ -299,10 +299,6 @@ class ParseUrl
 			}
 		}
 
-		if ($siteinfo['type'] == 'summary' || $siteinfo['type'] == 'summary_large_image') {
-			$siteinfo['type'] = 'link';
-		}
-
 		if (isset($keywords)) {
 			$siteinfo['keywords'] = [];
 			foreach ($keywords as $keyword) {

From f84b39be0b4e7d037c41157537f2864d3f6b7ef4 Mon Sep 17 00:00:00 2001
From: Aditoo17 <42938951+Aditoo17@users.noreply.github.com>
Date: Thu, 6 Sep 2018 10:43:15 +0200
Subject: [PATCH 47/96] Fix iframe address

---
 doc/Quick-Start-groupsandpages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/Quick-Start-groupsandpages.md b/doc/Quick-Start-groupsandpages.md
index 652407d642..d4680f65f2 100644
--- a/doc/Quick-Start-groupsandpages.md
+++ b/doc/Quick-Start-groupsandpages.md
@@ -15,6 +15,6 @@ Remember the link at the top of this page will bring you back here.
 
 Once you've added some groups, <a href="help/Quick-Start-andfinally">move on to the next section</a>.
 
-<iframe src="http://dir.friendica.com/directory/forum" width="950" height="600"></iframe>
+<iframe src="http://dir.friendica.social/directory" width="950" height="600"></iframe>
 
 

From 6113fdc940d77fba1871463ee0c5a27e1f22eda7 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 6 Sep 2018 09:20:45 +0000
Subject: [PATCH 48/96] Issue 5733: Changing relationship values does work now
 again with DFRN

---
 mod/dfrn_notify.php       |  2 +-
 src/Protocol/Diaspora.php | 37 +++++++++++++++++++++++++++++--------
 src/Protocol/OStatus.php  | 14 ++++++++++++--
 3 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index f653faca95..666c388a4a 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -182,7 +182,7 @@ function dfrn_notify_post(App $a) {
 
 function dfrn_dispatch_public($postdata)
 {
-	$msg = Diaspora::decodeRaw([], $postdata);
+	$msg = Diaspora::decodeRaw([], $postdata, true);
 	if (!$msg) {
 		// We have to fail silently to be able to hand it over to the salmon parser
 		return false;
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index c25eb96898..7af8dbd424 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -365,15 +365,16 @@ class Diaspora
 	/**
 	 * @brief: Decodes incoming Diaspora message in the new format
 	 *
-	 * @param array  $importer Array of the importer user
-	 * @param string $raw      raw post message
+	 * @param array   $importer Array of the importer user
+	 * @param string  $raw      raw post message
+	 * @param boolean $no_exit  Don't do an http exit on error
 	 *
 	 * @return array
 	 * 'message' -> decoded Diaspora XML message
 	 * 'author' -> author diaspora handle
 	 * 'key' -> author public key (converted to pkcs#8)
 	 */
-	public static function decodeRaw(array $importer, $raw)
+	public static function decodeRaw(array $importer, $raw, $no_exit = false)
 	{
 		$data = json_decode($raw);
 
@@ -388,7 +389,11 @@ class Diaspora
 
 			if (!is_object($j_outer_key_bundle)) {
 				logger('Outer Salmon did not verify. Discarding.');
-				System::httpExit(400);
+				if ($no_exit) {
+					return false;
+				} else {
+					System::httpExit(400);
+				}
 			}
 
 			$outer_iv = base64_decode($j_outer_key_bundle->iv);
@@ -403,7 +408,11 @@ class Diaspora
 
 		if (!is_object($basedom)) {
 			logger('Received data does not seem to be an XML. Discarding. '.$xml);
-			System::httpExit(400);
+			if ($no_exit) {
+				return false;
+			} else {
+				System::httpExit(400);
+			}
 		}
 
 		$base = $basedom->children(NAMESPACE_SALMON_ME);
@@ -425,19 +434,31 @@ class Diaspora
 		$author_addr = base64_decode($key_id);
 		if ($author_addr == '') {
 			logger('No author could be decoded. Discarding. Message: ' . $xml);
-			System::httpExit(400);
+			if ($no_exit) {
+				return false;
+			} else {
+				System::httpExit(400);
+			}
 		}
 
 		$key = self::key($author_addr);
 		if ($key == '') {
 			logger("Couldn't get a key for handle " . $author_addr . ". Discarding.");
-			System::httpExit(400);
+			if ($no_exit) {
+				return false;
+			} else {
+				System::httpExit(400);
+			}
 		}
 
 		$verify = Crypto::rsaVerify($signed_data, $signature, $key);
 		if (!$verify) {
 			logger('Message did not verify. Discarding.');
-			System::httpExit(400);
+			if ($no_exit) {
+				return false;
+			} else {
+				System::httpExit(400);
+			}
 		}
 
 		return ['message' => (string)base64url_decode($base->data),
diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 551b4ad887..ece265c99b 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -74,6 +74,16 @@ class OStatus
 		$author["contact-id"] = $contact["id"];
 
 		$contact = null;
+
+/*
+		This here would be better, but we would get problems with contacts from the statusnet addon
+		This is kept here as a reminder for the future
+
+		$cid = Contact::getIdForURL($author["author-link"], $importer["uid"]);
+		if ($cid) {
+			$contact = DBA::selectFirst('contact', [], ['id' => $cid]);
+		}
+*/
 		if ($aliaslink != '') {
 			$condition = ["`uid` = ? AND `alias` = ? AND `network` != ? AND `rel` IN (?, ?)",
 					$importer["uid"], $aliaslink, Protocol::STATUSNET,
@@ -219,7 +229,7 @@ class OStatus
 			$gcid = GContact::update($contact);
 
 			GContact::link($gcid, $contact["uid"], $contact["id"]);
-		} else {
+		} elseif ($contact["network"] != Protocol::DFRN) {
 			$contact = null;
 		}
 
@@ -312,7 +322,7 @@ class OStatus
 			self::$conv_list = [];
 		}
 
-		logger("Import OStatus message", LOGGER_DEBUG);
+		logger('Import OStatus message for user ' . $importer['uid'], LOGGER_DEBUG);
 
 		if ($xml == "") {
 			return false;

From 26607d4a275c6f2973287836439f5e9b805511d1 Mon Sep 17 00:00:00 2001
From: rabuzarus <trebor@central-unit>
Date: Thu, 6 Sep 2018 14:40:34 +0200
Subject: [PATCH 49/96] Frio - bugfix - don't show new event button if the
 button isn't available

---
 view/theme/frio/templates/events_js.tpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/view/theme/frio/templates/events_js.tpl b/view/theme/frio/templates/events_js.tpl
index 31debbe310..a4ca9004cd 100644
--- a/view/theme/frio/templates/events_js.tpl
+++ b/view/theme/frio/templates/events_js.tpl
@@ -3,11 +3,13 @@
 	{{include file="section_title.tpl" title=$title pullright=1}}
 
 	{{* The link to create a new event *}}
+	{{if $new_event.0}}
 	<div class="pull-right" id="new-event-link">
 		<button type="button" class="btn-link page-action faded-icon" onclick="addToModal('{{$new_event.0}}')" title="{{$new_event.1}}" data-toggle="tooltip">
 			<i class="fa fa-plus"></i>
 		</button>
 	</div>
+	{{/if}}
 
 	{{* We create our own fullcallendar header (with title & calendar view *}}
 	<div id="fc-header" class="clear">

From e9a73e4480154fd69195401c970e444159f87964 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 6 Sep 2018 13:27:03 +0000
Subject: [PATCH 50/96] Fix fatal error due to missing "use"

---
 src/Module/Proxy.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Module/Proxy.php b/src/Module/Proxy.php
index 7983e01f7a..0de45b3325 100644
--- a/src/Module/Proxy.php
+++ b/src/Module/Proxy.php
@@ -8,6 +8,7 @@ namespace Friendica\Module;
 use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Photo;

From 1d4a5402ff1a63ea3f2bd17d834ebce74f44379f Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 6 Sep 2018 20:30:16 +0000
Subject: [PATCH 51/96] Picture posts do work again - everything else should
 work as well

---
 src/Content/Text/BBCode.php | 22 +++++++++++-----------
 src/Util/ParseUrl.php       |  9 ++++++---
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 3054170fc0..2dc13ae5e0 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -572,17 +572,17 @@ class BBCode extends BaseObject
 					$return = sprintf('<div class="type-%s">', $data["type"]);
 				}
 
-				if (!empty($data["image"])) {
-					$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a><br />', $data["url"], self::proxyUrl($data["image"], $simplehtml), $data["title"]);
-				} elseif (!empty($data["preview"])) {
-					$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], self::proxyUrl($data["preview"], $simplehtml), $data["title"]);
-				}
-
-				// Show a picture only when the BBCode is meant for posts to connector networks
-				if (($simplehtml != 0) && ($data["type"] == "photo") && !empty($data["url"]) && !empty($data["image"])) {
-					$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a>', $data["url"], self::proxyUrl($data["image"], $simplehtml), $data["title"]);
-				} elseif (!empty($data['title']) && !empty($data['url'])) {
-					$return .= sprintf('<h4><a href="%s">%s</a></h4>', $data['url'], $data['title']);
+				if (!empty($data['title']) && !empty($data['url'])) {
+					if (!empty($data["image"]) && empty($data["text"]) && ($data["type"] == "photo")) {
+						$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a>', $data["url"], self::proxyUrl($data["image"], $simplehtml), $data["title"]);
+					} else {
+						if (!empty($data["image"])) {
+							$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a><br />', $data["url"], self::proxyUrl($data["image"], $simplehtml), $data["title"]);
+						} elseif (!empty($data["preview"])) {
+							$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], self::proxyUrl($data["preview"], $simplehtml), $data["title"]);
+						}
+						$return .= sprintf('<h4><a href="%s">%s</a></h4>', $data['url'], $data['title']);
+					}
 				}
 
 				if (!empty($data["description"]) && $data["description"] != $data["title"]) {
diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index 520100b6d7..4443da7564 100644
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -271,11 +271,9 @@ class ParseUrl
 					$siteinfo['image'] = $meta_tag['content'];
 					break;
 				case 'twitter:card':
-					// Convert Twitter types in our own
+					// Detect photo pages
 					if ($meta_tag['content'] == 'summary_large_image') {
 						$siteinfo['type'] = 'photo';
-					} else {
-						$siteinfo['type'] = $meta_tag['content'];
 					}
 					break;
 				case 'twitter:description':
@@ -334,6 +332,11 @@ class ParseUrl
 			}
 		}
 
+		// Prevent to have a photo type without an image
+		if (empty($siteinfo['image']) && (siteinfo['type'] == 'photo')) {
+			$siteinfo['type'] = 'link';
+		}
+
 		if ((@$siteinfo['image'] == '') && !$no_guessing) {
 			$list = $xpath->query('//img[@src]');
 			foreach ($list as $node) {

From 2592c3891ce3134d591c890c7bd7f789f554f208 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 6 Sep 2018 21:10:48 +0000
Subject: [PATCH 52/96] forgotten $

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

diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index 4443da7564..dd39a052a0 100644
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -333,7 +333,7 @@ class ParseUrl
 		}
 
 		// Prevent to have a photo type without an image
-		if (empty($siteinfo['image']) && (siteinfo['type'] == 'photo')) {
+		if (empty($siteinfo['image']) && ($siteinfo['type'] == 'photo')) {
 			$siteinfo['type'] = 'link';
 		}
 

From 2f7ba1370226bbcb97fd6b9f9b737b8462ce97ac Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 6 Sep 2018 18:42:57 -0400
Subject: [PATCH 53/96] Restore display when there aren't unread notifications

---
 mod/notifications.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/mod/notifications.php b/mod/notifications.php
index 091323d998..5feb3be19a 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -308,18 +308,15 @@ function notifications_content(App $a)
 				'$item_seen' => $it['seen'],
 			]);
 		}
-
-		$notif_show_lnk = [
-			'href' => ($show ? 'notifications/'.$notifs['ident'] : 'notifications/'.$notifs['ident'].'?show=all' ),
-			'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
-		];
-
-		// Output if there aren't any notifications available
-		if (count($notifs['notifications']) == 0) {
-			$notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']);
-		}
+	} else {
+		$notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']);
 	}
 
+	$notif_show_lnk = [
+		'href' => ($show ? 'notifications/'.$notifs['ident'] : 'notifications/'.$notifs['ident'].'?show=all' ),
+		'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
+	];
+
 	$o .= replace_macros($notif_tpl, [
 		'$notif_header' => $notif_header,
 		'$tabs' => $tabs,

From f85af78097d2ab73a9ee4b020a6a366f3a147de3 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 6 Sep 2018 18:55:06 -0400
Subject: [PATCH 54/96] Source format mod/notifications

- Add array alignment
- Convert remaining double quotes to quotes
- Replace x() with defaults()
- Add missing spaces
---
 mod/notifications.php | 221 +++++++++++++++++++-----------------------
 1 file changed, 101 insertions(+), 120 deletions(-)

diff --git a/mod/notifications.php b/mod/notifications.php
index 5feb3be19a..212736305f 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -21,7 +21,7 @@ function notifications_post(App $a)
 
 	$request_id = (($a->argc > 1) ? $a->argv[1] : 0);
 
-	if ($request_id === "all") {
+	if ($request_id === 'all') {
 		return;
 	}
 
@@ -68,8 +68,8 @@ function notifications_content(App $a)
 		return;
 	}
 
-	$page	=	(x($_REQUEST,'page')		? $_REQUEST['page']		: 1);
-	$show	=	(x($_REQUEST,'show')		? $_REQUEST['show']		: 0);
+	$page = defaults($_REQUEST, 'page', 1);
+	$show = defaults($_REQUEST, 'show', 0);
 
 	Nav::setSelected('notifications');
 
@@ -118,7 +118,6 @@ function notifications_content(App $a)
 		$notifs = $nm->homeNotifs($show, $startrec, $perpage);
 	}
 
-
 	// Set the pager
 	$a->set_pager_itemspage($perpage);
 
@@ -136,7 +135,7 @@ function notifications_content(App $a)
 	// Process the data for template creation
 	if (defaults($notifs, 'ident', '') === 'introductions') {
 		$sugg = get_markup_template('suggestions.tpl');
-		$tpl = get_markup_template("intros.tpl");
+		$tpl = get_markup_template('intros.tpl');
 
 		// The link to switch between ignored and normal connection requests
 		$notif_show_lnk = [
@@ -146,127 +145,121 @@ function notifications_content(App $a)
 
 		// Loop through all introduction notifications.This creates an array with the output html for each
 		// introduction
-		foreach ($notifs['notifications'] as $it) {
+		foreach ($notifs['notifications'] as $notif) {
 
 			// There are two kind of introduction. Contacts suggested by other contacts and normal connection requests.
 			// We have to distinguish between these two because they use different data.
-			switch ($it['label']) {
+			switch ($notif['label']) {
 				case 'friend_suggestion':
 					$notif_content[] = replace_macros($sugg, [
-						'$type' => $it['label'],
+						'$type'       => $notif['label'],
 						'$str_notifytype' => L10n::t('Notification type:'),
-						'$notify_type' => $it['notify_type'],
-						'$intro_id' => $it['intro_id'],
+						'$notify_type'=> $notif['notify_type'],
+						'$intro_id'   => $notif['intro_id'],
 						'$lbl_madeby' => L10n::t('Suggested by:'),
-						'$madeby' => $it['madeby'],
-						'$madeby_url' => $it['madeby_url'],
-						'$madeby_zrl' => $it['madeby_zrl'],
-						'$madeby_addr' => $it['madeby_addr'],
-						'$contact_id' => $it['contact_id'],
-						'$photo' => $it['photo'],
-						'$fullname' => $it['name'],
-						'$url' => $it['url'],
-						'$zrl' => $it['zrl'],
-						'$lbl_url' => L10n::t('Profile URL'),
-						'$addr' => $it['addr'],
-						'$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($it['hidden'] == 1), ''],
-
-						'$knowyou' => $it['knowyou'],
-						'$approve' => L10n::t('Approve'),
-						'$note' => $it['note'],
-						'$request' => $it['request'],
-						'$ignore' => L10n::t('Ignore'),
-						'$discard' => L10n::t('Discard'),
+						'$madeby'     => $notif['madeby'],
+						'$madeby_url' => $notif['madeby_url'],
+						'$madeby_zrl' => $notif['madeby_zrl'],
+						'$madeby_addr'=> $notif['madeby_addr'],
+						'$contact_id' => $notif['contact_id'],
+						'$photo'      => $notif['photo'],
+						'$fullname'   => $notif['name'],
+						'$url'        => $notif['url'],
+						'$zrl'        => $notif['zrl'],
+						'$lbl_url'    => L10n::t('Profile URL'),
+						'$addr'       => $notif['addr'],
+						'$hidden'     => ['hidden', L10n::t('Hide this contact from others'), ($notif['hidden'] == 1), ''],
+						'$knowyou'    => $notif['knowyou'],
+						'$approve'    => L10n::t('Approve'),
+						'$note'       => $notif['note'],
+						'$request'    => $notif['request'],
+						'$ignore'     => L10n::t('Ignore'),
+						'$discard'    => L10n::t('Discard'),
 					]);
 					break;
 
 				// Normal connection requests
 				default:
-					$friend_selected = (($it['network'] !== Protocol::OSTATUS) ? ' checked="checked" ' : ' disabled ');
-					$fan_selected = (($it['network'] === Protocol::OSTATUS) ? ' checked="checked" disabled ' : '');
-					$dfrn_tpl = get_markup_template('netfriend.tpl');
+					$friend_selected = (($notif['network'] !== Protocol::OSTATUS) ? ' checked="checked" ' : ' disabled ');
+					$fan_selected = (($notif['network'] === Protocol::OSTATUS) ? ' checked="checked" disabled ' : '');
 
-					$knowyou   = '';
 					$lbl_knowyou = '';
-					$dfrn_text = '';
-					$helptext = '';
-					$helptext2 = '';
-					$helptext3 = '';
+					$knowyou     = '';
+					$helptext    = '';
+					$helptext2   = '';
+					$helptext3   = '';
 
-					if ($it['network'] === Protocol::DFRN || $it['network'] === Protocol::DIASPORA) {
-						if ($it['network'] === Protocol::DFRN) {
-							$lbl_knowyou = L10n::t('Claims to be known to you: ');
-							$knowyou = (($it['knowyou']) ? L10n::t('yes') : L10n::t('no'));
-							$helptext = L10n::t('Shall your connection be bidirectional or not?');
-							$helptext2 = L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $it['name'], $it['name']);
-							$helptext3 = L10n::t('Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $it['name']);
-						} else {
-							$knowyou = '';
-							$helptext = L10n::t('Shall your connection be bidirectional or not?');
-							$helptext2 = L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $it['name'], $it['name']);
-							$helptext3 = L10n::t('Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $it['name']);
-						}
+					if ($notif['network'] === Protocol::DFRN) {
+						$lbl_knowyou = L10n::t('Claims to be known to you: ');
+						$knowyou   = (($notif['knowyou']) ? L10n::t('yes') : L10n::t('no'));
+						$helptext  = L10n::t('Shall your connection be bidirectional or not?');
+						$helptext2 = L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $notif['name'], $notif['name']);
+						$helptext3 = L10n::t('Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $notif['name']);
+					} elseif ($notif['network'] === Protocol::DIASPORA) {
+						$helptext  = L10n::t('Shall your connection be bidirectional or not?');
+						$helptext2 = L10n::t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $notif['name'], $notif['name']);
+						$helptext3 = L10n::t('Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $notif['name']);
 					}
 
-					$dfrn_text = replace_macros($dfrn_tpl,[
-						'$intro_id' => $it['intro_id'],
+					$dfrn_tpl = get_markup_template('netfriend.tpl');
+					$dfrn_text = replace_macros($dfrn_tpl, [
+						'$intro_id'    => $notif['intro_id'],
 						'$friend_selected' => $friend_selected,
-						'$fan_selected' => $fan_selected,
+						'$fan_selected'=> $fan_selected,
 						'$approve_as1' => $helptext,
 						'$approve_as2' => $helptext2,
 						'$approve_as3' => $helptext3,
-						'$as_friend' => L10n::t('Friend'),
-						'$as_fan' => (($it['network'] == Protocol::DIASPORA) ? L10n::t('Sharer') : L10n::t('Subscriber'))
+						'$as_friend'   => L10n::t('Friend'),
+						'$as_fan'      => (($notif['network'] == Protocol::DIASPORA) ? L10n::t('Sharer') : L10n::t('Subscriber'))
 					]);
 
-					$header = $it["name"];
+					$header = $notif['name'];
 
-					if ($it["addr"] != "") {
-						$header .= " <".$it["addr"].">";
+					if ($notif['addr'] != '') {
+						$header .= ' <' . $notif['addr'] . '>';
 					}
 
-					$header .= " (".ContactSelector::networkToName($it['network'], $it['url']).")";
+					$header .= ' (' . ContactSelector::networkToName($notif['network'], $notif['url']) . ')';
 
-					if ($it['network'] != Protocol::DIASPORA) {
+					if ($notif['network'] != Protocol::DIASPORA) {
 						$discard = L10n::t('Discard');
 					} else {
 						$discard = '';
 					}
 
 					$notif_content[] = replace_macros($tpl, [
-						'$type' => $it['label'],
-						'$header' => htmlentities($header),
+						'$type'        => $notif['label'],
+						'$header'      => htmlentities($header),
 						'$str_notifytype' => L10n::t('Notification type:'),
-						'$notify_type' => $it['notify_type'],
-						'$dfrn_text' => $dfrn_text,
-						'$dfrn_id' => $it['dfrn_id'],
-						'$uid' => $it['uid'],
-						'$intro_id' => $it['intro_id'],
-						'$contact_id' => $it['contact_id'],
-						'$photo' => $it['photo'],
-						'$fullname' => $it['name'],
-						'$location' => $it['location'],
-						'$lbl_location' => L10n::t('Location:'),
-						'$about' => $it['about'],
-						'$lbl_about' => L10n::t('About:'),
-						'$keywords' => $it['keywords'],
-						'$lbl_keywords' => L10n::t('Tags:'),
-						'$gender' => $it['gender'],
-						'$lbl_gender' => L10n::t('Gender:'),
-						'$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($it['hidden'] == 1), ''],
-						'$url' => $it['url'],
-						'$zrl' => $it['zrl'],
-						'$lbl_url' => L10n::t('Profile URL'),
-						'$addr' => $it['addr'],
+						'$notify_type' => $notif['notify_type'],
+						'$dfrn_text'   => $dfrn_text,
+						'$dfrn_id'     => $notif['dfrn_id'],
+						'$uid'         => $notif['uid'],
+						'$intro_id'    => $notif['intro_id'],
+						'$contact_id'  => $notif['contact_id'],
+						'$photo'       => $notif['photo'],
+						'$fullname'    => $notif['name'],
+						'$location'    => $notif['location'],
+						'$lbl_location'=> L10n::t('Location:'),
+						'$about'       => $notif['about'],
+						'$lbl_about'   => L10n::t('About:'),
+						'$keywords'    => $notif['keywords'],
+						'$lbl_keywords'=> L10n::t('Tags:'),
+						'$gender'      => $notif['gender'],
+						'$lbl_gender'  => L10n::t('Gender:'),
+						'$hidden'      => ['hidden', L10n::t('Hide this contact from others'), ($notif['hidden'] == 1), ''],
+						'$url'         => $notif['url'],
+						'$zrl'         => $notif['zrl'],
+						'$lbl_url'     => L10n::t('Profile URL'),
+						'$addr'        => $notif['addr'],
 						'$lbl_knowyou' => $lbl_knowyou,
 						'$lbl_network' => L10n::t('Network:'),
-						'$network' => ContactSelector::networkToName($it['network'], $it['url']),
-						'$knowyou' => $knowyou,
-						'$approve' => L10n::t('Approve'),
-						'$note' => $it['note'],
-						'$ignore' => L10n::t('Ignore'),
-						'$discard' => $discard,
-
+						'$network'     => ContactSelector::networkToName($notif['network'], $notif['url']),
+						'$knowyou'     => $knowyou,
+						'$approve'     => L10n::t('Approve'),
+						'$note'        => $notif['note'],
+						'$ignore'      => L10n::t('Ignore'),
+						'$discard'     => $discard,
 					]);
 					break;
 			}
@@ -276,36 +269,24 @@ function notifications_content(App $a)
 			info(L10n::t('No introductions.') . EOL);
 		}
 
-	// Normal notifications (no introductions)
+		// Normal notifications (no introductions)
 	} elseif (!empty($notifs['notifications'])) {
-		// The template files we need in different cases for formatting the content
-		$tpl_item_like = 'notifications_likes_item.tpl';
-		$tpl_item_dislike = 'notifications_dislikes_item.tpl';
-		$tpl_item_attend = 'notifications_attend_item.tpl';
-		$tpl_item_attendno = 'notifications_attend_item.tpl';
-		$tpl_item_attendmaybe = 'notifications_attend_item.tpl';
-		$tpl_item_friend = 'notifications_friends_item.tpl';
-		$tpl_item_comment = 'notifications_comments_item.tpl';
-		$tpl_item_post = 'notifications_posts_item.tpl';
-		$tpl_item_notify = 'notify.tpl';
-
 		// Loop trough ever notification This creates an array with the output html for each
 		// notification and apply the correct template according to the notificationtype (label).
-		foreach ($notifs['notifications'] as $it) {
-
+		foreach ($notifs['notifications'] as $notif) {
 			// We use the notification label to get the correct template file
-			$tpl_var_name = 'tpl_item_'.$it['label'];
+			$tpl_var_name = 'tpl_item_' . $notif['label'];
 			$tpl_notif = get_markup_template($$tpl_var_name);
 
-			$notif_content[] = replace_macros($tpl_notif,[
-				'$item_label' => $it['label'],
-				'$item_link' => $it['link'],
-				'$item_image' => $it['image'],
-				'$item_url' => $it['url'],
-				'$item_text' => $it['text'],
-				'$item_when' => $it['when'],
-				'$item_ago' => $it['ago'],
-				'$item_seen' => $it['seen'],
+			$notif_content[] = replace_macros($tpl_notif, [
+				'$item_label' => $notif['label'],
+				'$item_link'  => $notif['link'],
+				'$item_image' => $notif['image'],
+				'$item_url'   => $notif['url'],
+				'$item_text'  => $notif['text'],
+				'$item_when'  => $notif['when'],
+				'$item_ago'   => $notif['ago'],
+				'$item_seen'  => $notif['seen'],
 			]);
 		}
 	} else {
@@ -313,17 +294,17 @@ function notifications_content(App $a)
 	}
 
 	$notif_show_lnk = [
-		'href' => ($show ? 'notifications/'.$notifs['ident'] : 'notifications/'.$notifs['ident'].'?show=all' ),
+		'href' => ($show ? 'notifications/' . $notifs['ident'] : 'notifications/' . $notifs['ident'] . '?show=all' ),
 		'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
 	];
 
 	$o .= replace_macros($notif_tpl, [
-		'$notif_header' => $notif_header,
-		'$tabs' => $tabs,
-		'$notif_content' => $notif_content,
+		'$notif_header'    => $notif_header,
+		'$tabs'            => $tabs,
+		'$notif_content'   => $notif_content,
 		'$notif_nocontent' => $notif_nocontent,
-		'$notif_show_lnk' => $notif_show_lnk,
-		'$notif_paginate' => alt_pager($a, count($notif_content))
+		'$notif_show_lnk'  => $notif_show_lnk,
+		'$notif_paginate'  => alt_pager($a, count($notif_content))
 	]);
 
 	return $o;

From 99244d33f504349e4e11e5d3a6d0a3c505f12fee Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 7 Sep 2018 06:10:33 +0000
Subject: [PATCH 55/96] Fix for #5732 - too much links had been detected as
 photos

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

diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index dd39a052a0..40cb0b8fc0 100644
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -333,7 +333,7 @@ class ParseUrl
 		}
 
 		// Prevent to have a photo type without an image
-		if (empty($siteinfo['image']) && ($siteinfo['type'] == 'photo')) {
+		if ((empty($siteinfo['image']) || !empty($siteinfo['text'])) && ($siteinfo['type'] == 'photo')) {
 			$siteinfo['type'] = 'link';
 		}
 

From 71215115ebb1e06b461dc5b0fa7ee4c27d8c665c Mon Sep 17 00:00:00 2001
From: Benjamin Lorteau <benjamin.lorteau@cbsinteractive.com>
Date: Fri, 7 Sep 2018 11:15:23 -0400
Subject: [PATCH 56/96] Restore template choice by notification label

---
 mod/notifications.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/mod/notifications.php b/mod/notifications.php
index 212736305f..acd49de063 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -274,9 +274,19 @@ function notifications_content(App $a)
 		// Loop trough ever notification This creates an array with the output html for each
 		// notification and apply the correct template according to the notificationtype (label).
 		foreach ($notifs['notifications'] as $notif) {
-			// We use the notification label to get the correct template file
-			$tpl_var_name = 'tpl_item_' . $notif['label'];
-			$tpl_notif = get_markup_template($$tpl_var_name);
+			$notification_templates = [
+				'like'        => 'notifications_likes_item.tpl',
+				'dislike'     => 'notifications_dislikes_item.tpl',
+				'attend'      => 'notifications_attend_item.tpl',
+				'attendno'    => 'notifications_attend_item.tpl',
+				'attendmaybe' => 'notifications_attend_item.tpl',
+				'friend'      => 'notifications_friends_item.tpl',
+				'comment'     => 'notifications_comments_item.tpl',
+				'post'        => 'notifications_posts_item.tpl',
+				'notify'      => 'notify.tpl',
+			];
+
+			$tpl_notif = get_markup_template($notification_templates[$notif['label']]);
 
 			$notif_content[] = replace_macros($tpl_notif, [
 				'$item_label' => $notif['label'],

From 791a77f44133eb3c7f92575668996bcea1bff5e1 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sat, 8 Sep 2018 02:37:53 -0400
Subject: [PATCH 57/96] Add overwrite parameter to App->loadConfigFile

---
 src/App.php | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/App.php b/src/App.php
index 488c2301b6..0dc4b86b95 100644
--- a/src/App.php
+++ b/src/App.php
@@ -372,13 +372,13 @@ class App
 		}
 
 		if (file_exists($this->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.ini.php')) {
-			$this->loadConfigFile($this->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.ini.php');
+			$this->loadConfigFile($this->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.ini.php', true);
 		}
 	}
 
 	/**
 	 * Tries to load the specified configuration file into the App->config array.
-	 * Overwrites previously set values.
+	 * Doesn't overwrite previously set values by default to prevent default config files to supersede DB Config.
 	 *
 	 * The config format is INI and the template for configuration files is the following:
 	 *
@@ -391,9 +391,10 @@ class App
 	 * // Keep this line
 	 *
 	 * @param type $filepath
+	 * @param bool $overwrite Force value overwrite if the config key already exists
 	 * @throws Exception
 	 */
-	public function loadConfigFile($filepath)
+	public function loadConfigFile($filepath, $overwrite = false)
 	{
 		if (!file_exists($filepath)) {
 			throw new Exception('Error parsing non-existent config file ' . $filepath);
@@ -409,7 +410,11 @@ class App
 
 		foreach ($config as $category => $values) {
 			foreach ($values as $key => $value) {
-				$this->setConfigValue($category, $key, $value);
+				if ($overwrite) {
+					$this->setConfigValue($category, $key, $value);
+				} else {
+					$this->setDefaultConfigValue($category, $key, $value);
+				}
 			}
 		}
 	}
@@ -427,7 +432,7 @@ class App
 
 		// Load the local addon config file to overwritten default addon config values
 		if (file_exists($this->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'addon.ini.php')) {
-			$this->loadConfigFile($this->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'addon.ini.php');
+			$this->loadConfigFile($this->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'addon.ini.php', true);
 		}
 	}
 
@@ -1244,6 +1249,20 @@ class App
 		return $return;
 	}
 
+	/**
+	 * Sets a default value in the config cache. Ignores already existing keys.
+	 *
+	 * @param string $cat Config category
+	 * @param string $k   Config key
+	 * @param mixed  $v   Default value to set
+	 */
+	private function setDefaultConfigValue($cat, $k, $v)
+	{
+		if (!isset($this->config[$cat][$k])) {
+			$this->setConfigValue($cat, $k, $v);
+		}
+	}
+
 	/**
 	 * Sets a value in the config cache. Accepts raw output from the config table
 	 *

From d581318c7cfd78a94abe1aa5b2578be297601df0 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 9 Sep 2018 06:32:01 +0000
Subject: [PATCH 58/96] Notices come, notices go ...

---
 mod/message.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/message.php b/mod/message.php
index 8c9aa657df..223976ddbe 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -488,7 +488,7 @@ function render_messages(array $msg, $t)
 			'$id' => $rr['id'],
 			'$from_name' => $participants,
 			'$from_url' => Contact::magicLink($rr['url']),
-			'$from_addr' => $contact['addr'],
+			'$from_addr' => defaults($contact, 'addr', ''),
 			'$sparkle' => ' sparkle',
 			'$from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB),
 			'$subject' => $subject_e,

From 071aff223a672ccf3925bf91c5020bd080e7196f Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 9 Sep 2018 09:51:59 -0400
Subject: [PATCH 59/96] Format source of mod/events

---
 mod/events.php | 118 +++++++++++++++++++++++++++++--------------------
 1 file changed, 71 insertions(+), 47 deletions(-)

diff --git a/mod/events.php b/mod/events.php
index c4d40252d3..38b632cf49 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -20,7 +20,8 @@ use Friendica\Util\Temporal;
 
 require_once 'include/items.php';
 
-function events_init(App $a) {
+function events_init(App $a)
+{
 	if (!local_user()) {
 		return;
 	}
@@ -42,7 +43,8 @@ function events_init(App $a) {
 	return;
 }
 
-function events_post(App $a) {
+function events_post(App $a)
+{
 
 	logger('post: ' . print_r($_REQUEST, true), LOGGER_DATA);
 
@@ -50,8 +52,8 @@ function events_post(App $a) {
 		return;
 	}
 
-	$event_id = (x($_POST, 'event_id') ? intval($_POST['event_id']) : 0);
-	$cid = (x($_POST, 'cid') ? intval($_POST['cid']) : 0);
+	$event_id = !empty($_POST['event_id']) ? intval($_POST['event_id']) : 0;
+	$cid = !empty($_POST['cid']) ? intval($_POST['cid']) : 0;
 	$uid = local_user();
 
 	$start_text  = escape_tags(defaults($_REQUEST, 'start_text', ''));
@@ -137,7 +139,7 @@ function events_post(App $a) {
 		$str_contact_deny  = !empty($_POST['contact_deny'])  ? perms2str($_POST['contact_deny'])  : '';
 
 		// Undo the pseudo-contact of self, since there are real contacts now
-		if (strpos($str_contact_allow, '<' . $self . '>') !== false ) {
+		if (strpos($str_contact_allow, '<' . $self . '>') !== false) {
 			$str_contact_allow = str_replace('<' . $self . '>', '', $str_contact_allow);
 		}
 		// Make sure to set the `private` field as true. This is necessary to
@@ -187,8 +189,8 @@ function events_post(App $a) {
 	goaway($_SESSION['return_url']);
 }
 
-function events_content(App $a) {
-
+function events_content(App $a)
+{
 	if (!local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
 		return;
@@ -244,7 +246,7 @@ function events_content(App $a) {
 	$mode = 'view';
 	$y = 0;
 	$m = 0;
-	$ignored = (x($_REQUEST, 'ignored') ? intval($_REQUEST['ignored']) : 0);
+	$ignored = !empty($_REQUEST['ignored']) ? intval($_REQUEST['ignored']) : 0;
 
 	if ($a->argc > 1) {
 		if ($a->argc > 2 && $a->argv[1] == 'event') {
@@ -272,7 +274,6 @@ function events_content(App $a) {
 
 	// The view mode part is similiar to /mod/cal.php
 	if ($mode == 'view') {
-
 		$thisyear  = DateTimeFormat::localNow('Y');
 		$thismonth = DateTimeFormat::localNow('m');
 		if (!$y) {
@@ -312,10 +313,10 @@ function events_content(App $a) {
 		$finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
 
 		if ($a->argc > 1 && $a->argv[1] === 'json') {
-			if (x($_GET, 'start')) {
-				$start  = $_GET['start'];
+			if (!empty($_GET['start'])) {
+				$start = $_GET['start'];
 			}
-			if (x($_GET, 'end'))   {
+			if (!empty($_GET['end'])) {
 				$finish = $_GET['end'];
 			}
 		}
@@ -349,7 +350,7 @@ function events_content(App $a) {
 			$r = Event::sortByDate($r);
 			foreach ($r as $rr) {
 				$j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j');
-				if (!x($links,$j)) {
+				if (empty($links[$j])) {
 					$links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
 				}
 			}
@@ -363,12 +364,12 @@ function events_content(App $a) {
 			$events = Event::prepareListForTemplate($r);
 		}
 
-		if ($a->argc > 1 && $a->argv[1] === 'json'){
+		if ($a->argc > 1 && $a->argv[1] === 'json') {
 			echo json_encode($events);
 			killme();
 		}
 
-		if (x($_GET, 'id')) {
+		if (!empty($_GET['id'])) {
 			$tpl = get_markup_template("event.tpl");
 		} else {
 			$tpl = get_markup_template("events_js.tpl");
@@ -378,7 +379,7 @@ function events_content(App $a) {
 		foreach ($events as $key => $event) {
 			$event_item = [];
 			foreach ($event['item'] as $k => $v) {
-				$k = str_replace('-' ,'_', $k);
+				$k = str_replace('-', '_', $k);
 				$event_item[$k] = $v;
 			}
 			$events[$key]['item'] = $event_item;
@@ -403,7 +404,7 @@ function events_content(App $a) {
 			'$list'  => L10n::t('list'),
 		]);
 
-		if (x($_GET, 'id')) {
+		if (!empty($_GET['id'])) {
 			echo $o;
 			killme();
 		}
@@ -428,41 +429,45 @@ function events_content(App $a) {
 		}
 
 		// In case of an error the browser is redirected back here, with these parameters filled in with the previous values
-		if (x($_REQUEST, 'nofinish'))    {$orig_event['nofinish']    = $_REQUEST['nofinish'];}
-		if (x($_REQUEST, 'adjust'))      {$orig_event['adjust']      = $_REQUEST['adjust'];}
-		if (x($_REQUEST, 'summary'))     {$orig_event['summary']     = $_REQUEST['summary'];}
-		if (x($_REQUEST, 'description')) {$orig_event['description'] = $_REQUEST['description'];}
-		if (x($_REQUEST, 'location'))    {$orig_event['location']    = $_REQUEST['location'];}
-		if (x($_REQUEST, 'start'))       {$orig_event['start']       = $_REQUEST['start'];}
-		if (x($_REQUEST, 'finish'))      {$orig_event['finish']      = $_REQUEST['finish'];}
-		if (x($_REQUEST,'finish')) $orig_event['finish'] = $_REQUEST['finish'];
+		if (!empty($_REQUEST['nofinish']))    {$orig_event['nofinish']    = $_REQUEST['nofinish'];}
+		if (!empty($_REQUEST['adjust']))      {$orig_event['adjust']      = $_REQUEST['adjust'];}
+		if (!empty($_REQUEST['summary']))     {$orig_event['summary']     = $_REQUEST['summary'];}
+		if (!empty($_REQUEST['description'])) {$orig_event['description'] = $_REQUEST['description'];}
+		if (!empty($_REQUEST['location']))    {$orig_event['location']    = $_REQUEST['location'];}
+		if (!empty($_REQUEST['start']))       {$orig_event['start']       = $_REQUEST['start'];}
+		if (!empty($_REQUEST['finish']))      {$orig_event['finish']      = $_REQUEST['finish'];}
 
-		$n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : '');
-		$a_checked = ((x($orig_event) && $orig_event['adjust'])   ? ' checked="checked" ' : '');
+		$n_checked = (!empty($orig_event['nofinish']) ? ' checked="checked" ' : '');
+		$a_checked = (!empty($orig_event['adjust'])   ? ' checked="checked" ' : '');
 
-		$t_orig = (x($orig_event) ? $orig_event['summary']  : '');
-		$d_orig = (x($orig_event) ? $orig_event['desc']     : '');
-		$l_orig = (x($orig_event) ? $orig_event['location'] : '');
-		$eid    = (x($orig_event) ? $orig_event['id']       : 0);
-		$cid    = (x($orig_event) ? $orig_event['cid']      : 0);
-		$uri    = (x($orig_event) ? $orig_event['uri']      : '');
+		$t_orig = !empty($orig_event) ? $orig_event['summary']  : '';
+		$d_orig = !empty($orig_event) ? $orig_event['desc']     : '';
+		$l_orig = !empty($orig_event) ? $orig_event['location'] : '';
+		$eid = !empty($orig_event) ? $orig_event['id']  : 0;
+		$cid = !empty($orig_event) ? $orig_event['cid'] : 0;
+		$uri = !empty($orig_event) ? $orig_event['uri'] : '';
 
 		$sh_disabled = '';
-		$sh_checked  = '';
+		$sh_checked = '';
 
-		if (x($orig_event)) {
-			$sh_checked = (($orig_event['allow_cid'] === '<' . local_user() . '>' && !$orig_event['allow_gid'] && !$orig_event['deny_cid'] && !$orig_event['deny_gid']) ? '' : ' checked="checked" ');
+		if (!empty($orig_event)
+			&& ($orig_event['allow_cid'] !== '<' . local_user() . '>'
+			|| $orig_event['allow_gid']
+			|| $orig_event['deny_cid']
+			|| $orig_event['deny_gid']))
+		{
+			$sh_checked = ' checked="checked" ';
 		}
 
 		if ($cid || $mode === 'edit') {
 			$sh_disabled = 'disabled="disabled"';
 		}
 
-		$sdt = (x($orig_event) ? $orig_event['start']  : 'now');
-		$fdt = (x($orig_event) ? $orig_event['finish'] : 'now');
+		$sdt = !empty($orig_event) ? $orig_event['start']  : 'now';
+		$fdt = !empty($orig_event) ? $orig_event['finish'] : 'now';
 
 		$tz = date_default_timezone_get();
-		if (x($orig_event)) {
+		if (!empty($orig_event)) {
 			$tz = ($orig_event['adjust'] ? date_default_timezone_get() : 'UTC');
 		}
 
@@ -470,15 +475,15 @@ function events_content(App $a) {
 		$smonth = DateTimeFormat::convert($sdt, $tz, 'UTC', 'm');
 		$sday   = DateTimeFormat::convert($sdt, $tz, 'UTC', 'd');
 
-		$shour   = (x($orig_event) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'H') : '00');
-		$sminute = (x($orig_event) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'i') : '00');
+		$shour   = !empty($orig_event) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'H') : '00';
+		$sminute = !empty($orig_event) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'i') : '00';
 
 		$fyear  = DateTimeFormat::convert($fdt, $tz, 'UTC', 'Y');
 		$fmonth = DateTimeFormat::convert($fdt, $tz, 'UTC', 'm');
 		$fday   = DateTimeFormat::convert($fdt, $tz, 'UTC', 'd');
 
-		$fhour   = (x($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : '00');
-		$fminute = (x($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00');
+		$fhour   = !empty($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : '00';
+		$fminute = !empty($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00';
 
 		$perms = ACL::getDefaultUserPermissions($orig_event);
 
@@ -497,7 +502,7 @@ function events_content(App $a) {
 
 		$tpl = get_markup_template('event_form.tpl');
 
-		$o .= replace_macros($tpl,[
+		$o .= replace_macros($tpl, [
 			'$post' => System::baseUrl() . '/events',
 			'$eid'  => $eid,
 			'$cid'  => $cid,
@@ -511,11 +516,31 @@ function events_content(App $a) {
 			'$title' => L10n::t('Event details'),
 			'$desc' => L10n::t('Starting date and Title are required.'),
 			'$s_text' => L10n::t('Event Starts:') . ' <span class="required" title="' . L10n::t('Required') . '">*</span>',
-			'$s_dsel' => Temporal::getDateTimeField(new DateTime(), DateTime::createFromFormat('Y', $syear+5), DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), L10n::t('Event Starts:'), 'start_text', true, true, '', '', true),
+			'$s_dsel' => Temporal::getDateTimeField(
+				new DateTime(),
+				DateTime::createFromFormat('Y', $syear+5),
+				DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"),
+				L10n::t('Event Starts:'),
+				'start_text',
+				true,
+				true,
+				'',
+				'',
+				true
+			),
 			'$n_text' => L10n::t('Finish date/time is not known or not relevant'),
 			'$n_checked' => $n_checked,
 			'$f_text' => L10n::t('Event Finishes:'),
-			'$f_dsel' => Temporal::getDateTimeField(new DateTime(), DateTime::createFromFormat('Y', $fyear+5), DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), L10n::t('Event Finishes:'), 'finish_text', true, true, 'start_text'),
+			'$f_dsel' => Temporal::getDateTimeField(
+				new DateTime(),
+				DateTime::createFromFormat('Y', $fyear+5),
+				DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"),
+				L10n::t('Event Finishes:'),
+				'finish_text',
+				true,
+				true,
+				'start_text'
+			),
 			'$a_text' => L10n::t('Adjust for viewer timezone'),
 			'$a_checked' => $a_checked,
 			'$d_text' => L10n::t('Description:'),
@@ -536,7 +561,6 @@ function events_content(App $a) {
 			'$basic' => L10n::t('Basic'),
 			'$advanced' => L10n::t('Advanced'),
 			'$permissions' => L10n::t('Permissions'),
-
 		]);
 
 		return $o;

From 4edbea3ed01f0891b22b44f74efb6990f9deac6c Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 9 Sep 2018 09:54:54 -0400
Subject: [PATCH 60/96] Fix JS error when no acl is defined

---
 view/js/main.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/view/js/main.js b/view/js/main.js
index 4788d90a83..4ccbc8044e 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -305,7 +305,9 @@ $(function() {
 	// Asynchronous calls are deferred until the very end of the page load to ease on slower connections
 	window.addEventListener("load", function(){
 		NavUpdate();
-		acl.get(0, 100);
+		if (typeof acl !== 'undefined') {
+			acl.get(0, 100);
+		}
 	});
 
 	// Allow folks to stop the ajax page updates with the pause/break key

From 11a3b45957c880108aeaeddf4f8bbd3ae64c5a0f Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 9 Sep 2018 10:10:17 -0400
Subject: [PATCH 61/96] [frio] Fix ACL selection in new event modal

- Fix this.allow_cid.push isn't a function error
---
 view/theme/frio/js/event_edit.js | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/view/theme/frio/js/event_edit.js b/view/theme/frio/js/event_edit.js
index da0837223a..628835a5f0 100644
--- a/view/theme/frio/js/event_edit.js
+++ b/view/theme/frio/js/event_edit.js
@@ -1,7 +1,7 @@
 $(document).ready(function() {
 	// Go to the permissions tab if the checkbox is checked.
 	$('body').on("click", "#id_share", function() {
-		if ($('#id_share').is(':checked') && !( $('#id_share').attr("disabled"))) { 
+		if ($('#id_share').is(':checked') && !( $('#id_share').attr("disabled"))) {
 			$('#acl-wrapper').show();
 			$("a#event-perms-lnk").parent("li").show();
 			toggleEventNav("a#event-perms-lnk");
@@ -54,20 +54,19 @@ $(document).ready(function() {
 	// without page reloading (e.g. closing an old modal and open a new modal).
 	// Otherwise we wouldn't get the ACL data.
 	/// @todo: Try to implement some kind of ACL reloading in acl.js.
-	if (typeof acl !== "undefined") {
-		var eventPerms = document.getElementById('event-edit-form');
 
-		acl = new ACL(
-			baseurl + "/acl",
-			[
-				eventPerms.dataset.allow_cid,
-				eventPerms.dataset.allow_gid,
-				eventPerms.dataset.deny_cid,
-				eventPerms.dataset.deny_gid
-			]
-		);
-	}
+	var eventPerms = document.getElementById('event-edit-form');
 
+	acl = new ACL(
+		baseurl + "/acl",
+		[
+			JSON.parse(eventPerms.dataset.allow_cid),
+			JSON.parse(eventPerms.dataset.allow_gid),
+			JSON.parse(eventPerms.dataset.deny_cid),
+			JSON.parse(eventPerms.dataset.deny_gid)
+		]
+	);
+	acl.get(0, 100);
 });
 
 // Load the html of the actual event and incect the output to the
@@ -81,7 +80,7 @@ function doEventPreview() {
 }
 
 
-// The following functions show/hide the specific event-edit content 
+// The following functions show/hide the specific event-edit content
 // in dependence of the selected nav.
 function eventAclActive() {
 	$("#event-edit-wrapper, #event-preview, #event-desc-wrapper").hide();

From e461474290f87a1e783100435183cf67217dce1b Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 9 Sep 2018 18:33:14 -0400
Subject: [PATCH 62/96] Fix count being called on the wrong variable in
 mod/notes

---
 mod/notes.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mod/notes.php b/mod/notes.php
index 68a870e9d6..01f283870e 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -70,8 +70,11 @@ function notes_content(App $a, $update = false)
 	$count = 0;
 
 	if (DBA::isResult($r)) {
-		$count = count($r);
-		$o .= conversation($a, DBA::toArray($r), 'notes', $update);
+		$notes = DBA::toArray($r);
+
+		$count = count($notes);
+
+		$o .= conversation($a, $notes, 'notes', $update);
 	}
 
 	$o .= alt_pager($a, $count);

From 8b96a53fba794bfd11738772b51015a0390c056b Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 11 Sep 2018 04:10:11 +0000
Subject: [PATCH 63/96] Burn notices, burn

---
 mod/bookmarklet.php   |  4 ++++
 mod/photos.php        |  6 ++++--
 mod/salmon.php        |  8 ++++----
 mod/webfinger.php     |  2 +-
 src/Model/Profile.php |  2 +-
 src/Network/Probe.php | 44 +++++++++++++++++++++----------------------
 6 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php
index 21b2039c58..e1ae9aa64c 100644
--- a/mod/bookmarklet.php
+++ b/mod/bookmarklet.php
@@ -30,6 +30,10 @@ function bookmarklet_content(App $a)
 	$page = normalise_link(System::baseUrl() . "/bookmarklet");
 
 	if (!strstr($referer, $page)) {
+		if (empty($_REQUEST["url"])) {
+			System::httpExit(400, ["title" => L10n::t('Bad Request')]);
+		}
+
 		$content = add_page_info($_REQUEST["url"]);
 
 		$x = [
diff --git a/mod/photos.php b/mod/photos.php
index 16af455997..e205d72c6d 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -212,7 +212,7 @@ function photos_post(App $a)
 		}
 
 		// Check if the user has responded to a delete confirmation query
-		if ($_REQUEST['canceled']) {
+		if (!empty($_REQUEST['canceled'])) {
 			goaway($_SESSION['photo_return']);
 		}
 
@@ -762,12 +762,14 @@ function photos_post(App $a)
 		$filesize = $ret['filesize'];
 		$type     = $ret['type'];
 		$error    = UPLOAD_ERR_OK;
-	} else {
+	} elseif (!empty($_FILES['userfile'])) {
 		$src      = $_FILES['userfile']['tmp_name'];
 		$filename = basename($_FILES['userfile']['name']);
 		$filesize = intval($_FILES['userfile']['size']);
 		$type     = $_FILES['userfile']['type'];
 		$error    = $_FILES['userfile']['error'];
+	} else {
+		$error    = UPLOAD_ERR_NO_FILE;
 	}
 
 	if ($error !== UPLOAD_ERR_OK) {
diff --git a/mod/salmon.php b/mod/salmon.php
index d07b06004d..bd4b3773cb 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -41,14 +41,14 @@ function salmon_post(App $a, $xml = '') {
 	$base = null;
 
 	// figure out where in the DOM tree our data is hiding
-	if($dom->provenance->data)
+	if (!empty($dom->provenance->data))
 		$base = $dom->provenance;
-	elseif($dom->env->data)
+	elseif (!empty($dom->env->data))
 		$base = $dom->env;
-	elseif($dom->data)
+	elseif (!empty($dom->data))
 		$base = $dom;
 
-	if(! $base) {
+	if (empty($base)) {
 		logger('unable to locate salmon data in xml ');
 		System::httpExit(400);
 	}
diff --git a/mod/webfinger.php b/mod/webfinger.php
index 6f49a8f28c..4f23db6d8f 100644
--- a/mod/webfinger.php
+++ b/mod/webfinger.php
@@ -23,7 +23,7 @@ function webfinger_content(App $a)
 	$o  = '<h3>Webfinger Diagnostic</h3>';
 
 	$o .= '<form action="webfinger" method="get">';
-	$o .= 'Lookup address: <input type="text" style="width: 250px;" name="addr" value="' . $_GET['addr'] .'" />';
+	$o .= 'Lookup address: <input type="text" style="width: 250px;" name="addr" value="' . defaults($_GET, 'addr', '') .'" />';
 	$o .= '<input type="submit" name="submit" value="Submit" /></form>';
 
 	$o .= '<br /><br />';
diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 29bc7e680d..3a014517da 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -361,7 +361,7 @@ class Profile
 			if ($r) {
 				$remote_url = $r[0]['url'];
 				$message_path = preg_replace('=(.*)/profile/(.*)=ism', '$1/message/new/', $remote_url);
-				$wallmessage_link = $message_path . base64_encode($profile['addr']);
+				$wallmessage_link = $message_path . base64_encode(defaults($profile, 'addr', ''));
 			} else if (!empty($profile['nickname'])) {
 				$wallmessage_link = 'wallmessage/' . $profile['nickname'];
 			}
diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index af2d1c9a16..75231f44ff 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -967,23 +967,23 @@ class Probe
 		$hcard_url = "";
 		$data = [];
 		foreach ($webfinger["links"] as $link) {
-			if (($link["rel"] == NAMESPACE_DFRN) && ($link["href"] != "")) {
+			if (($link["rel"] == NAMESPACE_DFRN) && !empty($link["href"])) {
 				$data["network"] = Protocol::DFRN;
-			} elseif (($link["rel"] == NAMESPACE_FEED) && ($link["href"] != "")) {
+			} elseif (($link["rel"] == NAMESPACE_FEED) && !empty($link["href"])) {
 				$data["poll"] = $link["href"];
-			} elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && ($link["type"] == "text/html") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && (defaults($link, "type", "") == "text/html") && !empty($link["href"])) {
 				$data["url"] = $link["href"];
-			} elseif (($link["rel"] == "http://microformats.org/profile/hcard") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "http://microformats.org/profile/hcard") && !empty($link["href"])) {
 				$hcard_url = $link["href"];
-			} elseif (($link["rel"] == NAMESPACE_POCO) && ($link["href"] != "")) {
+			} elseif (($link["rel"] == NAMESPACE_POCO) && !empty($link["href"])) {
 				$data["poco"] = $link["href"];
-			} elseif (($link["rel"] == "http://webfinger.net/rel/avatar") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "http://webfinger.net/rel/avatar") && !empty($link["href"])) {
 				$data["photo"] = $link["href"];
-			} elseif (($link["rel"] == "http://joindiaspora.com/seed_location") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "http://joindiaspora.com/seed_location") && !empty($link["href"])) {
 				$data["baseurl"] = trim($link["href"], '/');
-			} elseif (($link["rel"] == "http://joindiaspora.com/guid") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "http://joindiaspora.com/guid") && !empty($link["href"])) {
 				$data["guid"] = $link["href"];
-			} elseif (($link["rel"] == "diaspora-public-key") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "diaspora-public-key") && !empty($link["href"])) {
 				$data["pubkey"] = base64_decode($link["href"]);
 
 				//if (strstr($data["pubkey"], 'RSA ') || ($link["type"] == "RSA"))
@@ -1170,21 +1170,21 @@ class Probe
 		$hcard_url = "";
 		$data = [];
 		foreach ($webfinger["links"] as $link) {
-			if (($link["rel"] == "http://microformats.org/profile/hcard") && ($link["href"] != "")) {
+			if (($link["rel"] == "http://microformats.org/profile/hcard") && !empty($link["href"])) {
 				$hcard_url = $link["href"];
-			} elseif (($link["rel"] == "http://joindiaspora.com/seed_location") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "http://joindiaspora.com/seed_location") && !empty($link["href"])) {
 				$data["baseurl"] = trim($link["href"], '/');
-			} elseif (($link["rel"] == "http://joindiaspora.com/guid") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "http://joindiaspora.com/guid") && !empty($link["href"])) {
 				$data["guid"] = $link["href"];
-			} elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && ($link["type"] == "text/html") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && (defaults($link, "type", "") == "text/html") && !empty($link["href"])) {
 				$data["url"] = $link["href"];
-			} elseif (($link["rel"] == NAMESPACE_FEED) && ($link["href"] != "")) {
+			} elseif (($link["rel"] == NAMESPACE_FEED) && !empty($link["href"])) {
 				$data["poll"] = $link["href"];
-			} elseif (($link["rel"] == NAMESPACE_POCO) && ($link["href"] != "")) {
+			} elseif (($link["rel"] == NAMESPACE_POCO) && !empty($link["href"])) {
 				$data["poco"] = $link["href"];
-			} elseif (($link["rel"] == "salmon") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "salmon") && !empty($link["href"])) {
 				$data["notify"] = $link["href"];
-			} elseif (($link["rel"] == "diaspora-public-key") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "diaspora-public-key") && !empty($link["href"])) {
 				$data["pubkey"] = base64_decode($link["href"]);
 
 				//if (strstr($data["pubkey"], 'RSA ') || ($link["type"] == "RSA"))
@@ -1272,15 +1272,15 @@ class Probe
 		if (is_array($webfinger["links"])) {
 			foreach ($webfinger["links"] as $link) {
 				if (($link["rel"] == "http://webfinger.net/rel/profile-page")
-					&& ($link["type"] == "text/html")
+					&& (defaults($link, "type", "") == "text/html")
 					&& ($link["href"] != "")
 				) {
 					$data["url"] = $link["href"];
-				} elseif (($link["rel"] == "salmon") && ($link["href"] != "")) {
+				} elseif (($link["rel"] == "salmon") && !empty($link["href"])) {
 					$data["notify"] = $link["href"];
-				} elseif (($link["rel"] == NAMESPACE_FEED) && ($link["href"] != "")) {
+				} elseif (($link["rel"] == NAMESPACE_FEED) && !empty($link["href"])) {
 					$data["poll"] = $link["href"];
-				} elseif (($link["rel"] == "magic-public-key") && ($link["href"] != "")) {
+				} elseif (($link["rel"] == "magic-public-key") && !empty($link["href"])) {
 					$pubkey = $link["href"];
 
 					if (substr($pubkey, 0, 5) === 'data:') {
@@ -1436,7 +1436,7 @@ class Probe
 		$data = [];
 		foreach ($webfinger["links"] as $link) {
 			if (($link["rel"] == "http://webfinger.net/rel/profile-page")
-				&& ($link["type"] == "text/html")
+				&& (defaults($link, "type", "") == "text/html")
 				&& ($link["href"] != "")
 			) {
 				$data["url"] = $link["href"];

From f566db52d3b915871fb7c639130daca1746d3eaa Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 11 Sep 2018 08:04:14 +0000
Subject: [PATCH 64/96] And more notices ...

---
 src/Protocol/PortableContact.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 20ee77a07c..2939f69e55 100644
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -1157,9 +1157,9 @@ class PortableContact
 
 				if (isset($data['version'])) {
 					$platform = "Mastodon";
-					$version = $data['version'];
-					$site_name = $data['title'];
-					$info = $data['description'];
+					$version = defaults($data, 'version', '');
+					$site_name = defaults($data, 'title', '');
+					$info = defaults($data, 'description', '');
 					$network = Protocol::OSTATUS;
 				}
 

From 7529fc61dd9169368224a092bcdf7d3cfeee1982 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Tue, 11 Sep 2018 19:54:45 -0400
Subject: [PATCH 65/96] Fix introductions notifications links

---
 mod/notifications.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mod/notifications.php b/mod/notifications.php
index acd49de063..3934a32357 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -132,6 +132,11 @@ function notifications_content(App $a)
 
 	$notif_tpl = get_markup_template('notifications.tpl');
 
+	$notif_show_lnk = [
+		'href' => ($show ? 'notifications/' . $notifs['ident'] : 'notifications/' . $notifs['ident'] . '?show=all' ),
+		'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
+	];
+
 	// Process the data for template creation
 	if (defaults($notifs, 'ident', '') === 'introductions') {
 		$sugg = get_markup_template('suggestions.tpl');
@@ -303,11 +308,6 @@ function notifications_content(App $a)
 		$notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']);
 	}
 
-	$notif_show_lnk = [
-		'href' => ($show ? 'notifications/' . $notifs['ident'] : 'notifications/' . $notifs['ident'] . '?show=all' ),
-		'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
-	];
-
 	$o .= replace_macros($notif_tpl, [
 		'$notif_header'    => $notif_header,
 		'$tabs'            => $tabs,

From 96d10c25e359b74d4b0bcab08c234625c0ecf031 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 12 Sep 2018 06:05:14 +0000
Subject: [PATCH 66/96] Issue 5733: Removing contacts does work now on the same
 machine as well

---
 mod/contacts.php             |  7 +++++++
 mod/dfrn_notify.php          | 14 +++++++-------
 src/Protocol/DFRN.php        |  5 +----
 src/Worker/RemoveContact.php |  4 ++--
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/mod/contacts.php b/mod/contacts.php
index 68f68fec3b..69bf2b47f9 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -47,6 +47,11 @@ function contacts_init(App $a)
 		if (!DBA::isResult($contact)) {
 			$contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => 0]);
 		}
+
+		// Don't display contacts that are about to be deleted
+		if (($contact['network'] == Protocol::PHANTOM)) {
+			$contact = false;
+		}
 	}
 
 	if (DBA::isResult($contact)) {
@@ -719,6 +724,8 @@ function contacts_content(App $a, $update = 0)
 		$sql_extra = " AND `blocked` = 0 ";
 	}
 
+	$sql_extra .= sprintf(" AND `network` != '%s' ", Protocol::PHANTOM);
+
 	$search = x($_GET, 'search') ? notags(trim($_GET['search'])) : '';
 	$nets   = x($_GET, 'nets'  ) ? notags(trim($_GET['nets']))   : '';
 
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 666c388a4a..2f76b59b97 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -79,13 +79,13 @@ function dfrn_notify_post(App $a) {
 	$condition = [];
 	switch ($direction) {
 		case (-1):
-			$condition = ["`issued-id` = ? OR `dfrn-id` = ?", $dfrn_id, $dfrn_id];
+			$condition = ["(`issued-id` = ? OR `dfrn-id` = ?) AND `uid` = ?", $dfrn_id, $dfrn_id, $user['uid']];
 			break;
 		case 0:
-			$condition = ['issued-id' => $dfrn_id, 'duplex' => true];
+			$condition = ['issued-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
 			break;
 		case 1:
-			$condition = ['dfrn-id' => $dfrn_id, 'duplex' => true];
+			$condition = ['dfrn-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
 			break;
 		default:
 			System::xmlExit(3, 'Invalid direction');
@@ -287,15 +287,15 @@ function dfrn_notify_content(App $a) {
 		$condition = [];
 		switch ($direction) {
 			case (-1):
-				$condition = ["`issued-id` = ? OR `dfrn-id` = ?", $dfrn_id, $dfrn_id];
+				$condition = ["(`issued-id` = ? OR `dfrn-id` = ?) AND `uid` = ?", $dfrn_id, $dfrn_id, $user['uid']];
 				$my_id = $dfrn_id;
 				break;
 			case 0:
-				$condition = ['issued-id' => $dfrn_id, 'duplex' => true];
+				$condition = ['issued-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
 				$my_id = '1:' . $dfrn_id;
 				break;
 			case 1:
-				$condition = ['dfrn-id' => $dfrn_id, 'duplex' => true];
+				$condition = ['dfrn-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
 				$my_id = '0:' . $dfrn_id;
 				break;
 			default:
@@ -326,7 +326,7 @@ function dfrn_notify_content(App $a) {
 		$pub_key = trim($importer['cpubkey']);
 		$dplx    = intval($importer['duplex']);
 
-		if (($dplx && strlen($prv_key)) || (strlen($prv_key) && !strlen($pub_key))) {
+		if (!empty($prv_key) && empty($pub_key)) {
 			openssl_private_encrypt($hash, $challenge, $prv_key);
 			openssl_private_encrypt($id_str, $encrypted_id, $prv_key);
 		} elseif (strlen($pub_key)) {
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index b207c3ca87..3832e38e16 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1280,10 +1280,7 @@ class DFRN
 			}
 		}
 
-		if (($contact['duplex'] && strlen($contact['pubkey']))
-			|| ($owner['page-flags'] == Contact::PAGE_COMMUNITY && strlen($contact['pubkey']))
-			|| ($contact['rel'] == Contact::SHARING && strlen($contact['pubkey']))
-		) {
+		if (empty($contact['prvkey']) && !empty($contact['pubkey'])) {
 			openssl_public_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['pubkey']);
 			openssl_public_decrypt($challenge, $postvars['challenge'], $contact['pubkey']);
 		} else {
diff --git a/src/Worker/RemoveContact.php b/src/Worker/RemoveContact.php
index b07661b7a9..8f986eab11 100644
--- a/src/Worker/RemoveContact.php
+++ b/src/Worker/RemoveContact.php
@@ -13,8 +13,8 @@ require_once 'include/dba.php';
 class RemoveContact {
 	public static function execute($id) {
 
-		// Only delete if the contact is archived
-		$condition = ['archive' => true, 'network' => Protocol::PHANTOM, 'id' => $id];
+		// Only delete if the contact is to be deleted
+		$condition = ['network' => Protocol::PHANTOM, 'id' => $id];
 		$r = DBA::exists('contact', $condition);
 		if (!DBA::isResult($r)) {
 			return;

From 7daa46503d3f0cd970fce3769ad1e79c9cecc0ef Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 12 Sep 2018 06:13:04 +0000
Subject: [PATCH 67/96] Don't risk incompatibilities

---
 mod/dfrn_notify.php   | 2 +-
 src/Protocol/DFRN.php | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 2f76b59b97..8a53ac09b6 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -326,7 +326,7 @@ function dfrn_notify_content(App $a) {
 		$pub_key = trim($importer['cpubkey']);
 		$dplx    = intval($importer['duplex']);
 
-		if (!empty($prv_key) && empty($pub_key)) {
+		if (($dplx && strlen($prv_key)) || (strlen($prv_key) && !strlen($pub_key))) {
 			openssl_private_encrypt($hash, $challenge, $prv_key);
 			openssl_private_encrypt($id_str, $encrypted_id, $prv_key);
 		} elseif (strlen($pub_key)) {
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 3832e38e16..b207c3ca87 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1280,7 +1280,10 @@ class DFRN
 			}
 		}
 
-		if (empty($contact['prvkey']) && !empty($contact['pubkey'])) {
+		if (($contact['duplex'] && strlen($contact['pubkey']))
+			|| ($owner['page-flags'] == Contact::PAGE_COMMUNITY && strlen($contact['pubkey']))
+			|| ($contact['rel'] == Contact::SHARING && strlen($contact['pubkey']))
+		) {
 			openssl_public_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['pubkey']);
 			openssl_public_decrypt($challenge, $postvars['challenge'], $contact['pubkey']);
 		} else {

From c4825a8b5305df009fb548321da423feb112cf20 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 12 Sep 2018 18:49:36 +0000
Subject: [PATCH 68/96] Fixing parentheses

---
 mod/contacts.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/contacts.php b/mod/contacts.php
index 69bf2b47f9..1604f0b660 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -49,7 +49,7 @@ function contacts_init(App $a)
 		}
 
 		// Don't display contacts that are about to be deleted
-		if (($contact['network'] == Protocol::PHANTOM)) {
+		if ($contact['network'] == Protocol::PHANTOM) {
 			$contact = false;
 		}
 	}

From 63b5cb4fc688f9da2984c4c10439dba3a432633a Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 13 Sep 2018 15:46:37 +0000
Subject: [PATCH 69/96] Issue 5721: Temporarily deactivate the picture upload
 from private mails

---
 view/js/main.js                           | 5 +++++
 view/theme/frio/templates/prv_message.tpl | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/view/js/main.js b/view/js/main.js
index 4ccbc8044e..83086c82b0 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -81,6 +81,11 @@ $(function() {
 			Dialog.doImageBrowser("comment", id);
 			return;
 		}
+
+		if (bbcode == "imgprv") {
+			bbcode = "img";
+		}
+
 		insertFormatting(bbcode, id);
 	});
 
diff --git a/view/theme/frio/templates/prv_message.tpl b/view/theme/frio/templates/prv_message.tpl
index 4c90dcae6d..9077c4d4c1 100644
--- a/view/theme/frio/templates/prv_message.tpl
+++ b/view/theme/frio/templates/prv_message.tpl
@@ -33,7 +33,7 @@
 
 	<ul id="prvmail-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
 				<li>
-					<button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="input">
+					<button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="imgprv" data-id="input">
 						<i class="fa fa-picture-o" aria-hidden="true"></i>
 					</button>
 				</li>

From 8c00e88f79c3b78d78b411328f4724ee5d82b587 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 13 Sep 2018 21:11:52 +0000
Subject: [PATCH 70/96] The endless saga of the fight against notices continues

---
 mod/fetch.php             |  2 +-
 src/Protocol/Diaspora.php |  2 +-
 src/Util/ParseUrl.php     | 16 +++++++++-------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/mod/fetch.php b/mod/fetch.php
index 35455e2822..4e7d8c751a 100644
--- a/mod/fetch.php
+++ b/mod/fetch.php
@@ -25,7 +25,7 @@ function fetch_init(App $a)
 
 	// Fetch the item
 	$fields = ['uid', 'title', 'body', 'guid', 'contact-id', 'private', 'created', 'app', 'location', 'coord', 'network',
-		'event-id', 'resource-id', 'author-link', 'owner-link', 'attach'];
+		'event-id', 'resource-id', 'author-link', 'author-avatar', 'author-name', 'plink', 'owner-link', 'attach'];
 	$condition = ['wall' => true, 'private' => false, 'guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
 	$item = Item::selectFirst($fields, $condition);
 	if (!DBA::isResult($item)) {
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 7af8dbd424..27cfdccd85 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -3496,7 +3496,7 @@ class Diaspora
 
 		$myaddr = self::myHandle($owner);
 
-		$public = (($item["private"]) ? "false" : "true");
+		$public = ($item["private"] ? "false" : "true");
 
 		$created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
 
diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index 40cb0b8fc0..ac13e15174 100644
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -486,21 +486,23 @@ class ParseUrl
 
 		$complete = $schemearr["scheme"]."://".$schemearr["host"];
 
-		if (@$schemearr["port"] != "") {
+		if (!empty($schemearr["port"])) {
 			$complete .= ":".$schemearr["port"];
 		}
 
-		if (strpos($urlarr["path"], "/") !== 0) {
-			$complete .= "/";
+		if (!empty($urlarr["path"])) {
+			if (strpos($urlarr["path"], "/") !== 0) {
+				$complete .= "/";
+			}
+
+			$complete .= $urlarr["path"];
 		}
 
-		$complete .= $urlarr["path"];
-
-		if (@$urlarr["query"] != "") {
+		if (!empty($urlarr["query"])) {
 			$complete .= "?".$urlarr["query"];
 		}
 
-		if (@$urlarr["fragment"] != "") {
+		if (!empty($urlarr["fragment"])) {
 			$complete .= "#".$urlarr["fragment"];
 		}
 

From 5b5e5ef4db5e502346c36428156aee1b707db5c0 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 13 Sep 2018 21:50:52 -0400
Subject: [PATCH 71/96] Use OEmbed data when available no matter the type

---
 src/Util/ParseUrl.php | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index 40cb0b8fc0..5745c65595 100644
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -161,16 +161,14 @@ class ParseUrl
 					$siteinfo['type'] = $oembed_data->type;
 				}
 
-				if (($oembed_data->type == 'link') && ($siteinfo['type'] != 'photo')) {
-					if (isset($oembed_data->title)) {
-						$siteinfo['title'] = trim($oembed_data->title);
-					}
-					if (isset($oembed_data->description)) {
-						$siteinfo['text'] = trim($oembed_data->description);
-					}
-					if (isset($oembed_data->thumbnail_url)) {
-						$siteinfo['image'] = $oembed_data->thumbnail_url;
-					}
+				if (isset($oembed_data->title)) {
+					$siteinfo['title'] = trim($oembed_data->title);
+				}
+				if (isset($oembed_data->description)) {
+					$siteinfo['text'] = trim($oembed_data->description);
+				}
+				if (isset($oembed_data->thumbnail_url)) {
+					$siteinfo['image'] = $oembed_data->thumbnail_url;
 				}
 			}
 		}
@@ -337,7 +335,7 @@ class ParseUrl
 			$siteinfo['type'] = 'link';
 		}
 
-		if ((@$siteinfo['image'] == '') && !$no_guessing) {
+		if (empty($siteinfo['image']) && !$no_guessing) {
 			$list = $xpath->query('//img[@src]');
 			foreach ($list as $node) {
 				$img_tag = [];

From 9d0a6f90b630a52bac84afa9255df62773b23619 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sat, 15 Sep 2018 19:28:38 -0400
Subject: [PATCH 72/96] Update "mrpetovan" email address

- Fix Tobias' email address
- Fix copypasted doc block in Console/PostUpdate
---
 src/BaseModule.php                          | 2 +-
 src/Content/OEmbed.php                      | 2 +-
 src/Content/Text/Markdown.php               | 2 +-
 src/Core/ACL.php                            | 2 +-
 src/Core/Cache/DatabaseCacheDriver.php      | 2 +-
 src/Core/Cache/ICacheDriver.php             | 2 +-
 src/Core/Cache/MemcacheCacheDriver.php      | 2 +-
 src/Core/Cache/MemcachedCacheDriver.php     | 2 +-
 src/Core/Cache/RedisCacheDriver.php         | 2 +-
 src/Core/Config/IConfigAdapter.php          | 2 +-
 src/Core/Config/JITConfigAdapter.php        | 2 +-
 src/Core/Config/JITPConfigAdapter.php       | 2 +-
 src/Core/Config/PreloadConfigAdapter.php    | 2 +-
 src/Core/Config/PreloadPConfigAdapter.php   | 2 +-
 src/Core/Console.php                        | 2 +-
 src/Core/Console/Config.php                 | 4 ++--
 src/Core/Console/CreateDoxygen.php          | 2 +-
 src/Core/Console/DatabaseStructure.php      | 2 +-
 src/Core/Console/DocBloxErrorChecker.php    | 2 +-
 src/Core/Console/Extract.php                | 2 +-
 src/Core/Console/GlobalCommunityBlock.php   | 4 ++--
 src/Core/Console/GlobalCommunitySilence.php | 4 ++--
 src/Core/Console/Maintenance.php            | 2 +-
 src/Core/Console/PhpToPo.php                | 2 +-
 src/Core/Console/PoToPhp.php                | 2 +-
 src/Core/Console/PostUpdate.php             | 9 +++------
 src/Core/Console/Typo.php                   | 2 +-
 src/Core/Protocol.php                       | 2 +-
 src/Core/Session.php                        | 2 +-
 src/Core/Session/CacheSessionHandler.php    | 2 +-
 src/Core/Session/DatabaseSessionHandler.php | 2 +-
 src/Module/Feed.php                         | 2 +-
 src/Module/Login.php                        | 2 +-
 src/Module/Logout.php                       | 2 +-
 src/Module/Oembed.php                       | 2 +-
 src/Object/OEmbed.php                       | 2 +-
 src/Render/FriendicaSmarty.php              | 2 +-
 src/Render/FriendicaSmartyEngine.php        | 2 +-
 view/lang/fr/messages.po                    | 2 +-
 39 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/src/BaseModule.php b/src/BaseModule.php
index d0019ccd1c..3ad4a4f055 100644
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -9,7 +9,7 @@ namespace Friendica;
  * The filename of the module in src/Module needs to match the class name
  * exactly to make the module available.
  *
- * @author Hypolite Petovan mrpetovan@gmail.com
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 abstract class BaseModule extends BaseObject
 {
diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index dd6ac7caa2..116120ab55 100644
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -31,7 +31,7 @@ require_once 'include/dba.php';
  *
  * @see https://oembed.com
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class OEmbed
 {
diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php
index 71d1a7b849..c50319e4ca 100644
--- a/src/Content/Text/Markdown.php
+++ b/src/Content/Text/Markdown.php
@@ -14,7 +14,7 @@ use Friendica\Content\Text\HTML;
 /**
  * Friendica-specific usage of Markdown
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Markdown extends BaseObject
 {
diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index 164333aae4..ffe11363f5 100644
--- a/src/Core/ACL.php
+++ b/src/Core/ACL.php
@@ -17,7 +17,7 @@ use Friendica\Util\Network;
 /**
  * Handle ACL management and display
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class ACL extends BaseObject
 {
diff --git a/src/Core/Cache/DatabaseCacheDriver.php b/src/Core/Cache/DatabaseCacheDriver.php
index 53f4623e15..ca4842a468 100644
--- a/src/Core/Cache/DatabaseCacheDriver.php
+++ b/src/Core/Cache/DatabaseCacheDriver.php
@@ -9,7 +9,7 @@ use Friendica\Util\DateTimeFormat;
 /**
  * Database Cache Driver
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class DatabaseCacheDriver extends AbstractCacheDriver implements ICacheDriver
 {
diff --git a/src/Core/Cache/ICacheDriver.php b/src/Core/Cache/ICacheDriver.php
index e83b921c6a..9ddcf5ad1f 100644
--- a/src/Core/Cache/ICacheDriver.php
+++ b/src/Core/Cache/ICacheDriver.php
@@ -7,7 +7,7 @@ use Friendica\Core\Cache;
 /**
  * Cache Driver Interface
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 interface ICacheDriver
 {
diff --git a/src/Core/Cache/MemcacheCacheDriver.php b/src/Core/Cache/MemcacheCacheDriver.php
index 5fe9225e78..4ca5aa38db 100644
--- a/src/Core/Cache/MemcacheCacheDriver.php
+++ b/src/Core/Cache/MemcacheCacheDriver.php
@@ -10,7 +10,7 @@ use Memcache;
 /**
  * Memcache Cache Driver
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class MemcacheCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
 {
diff --git a/src/Core/Cache/MemcachedCacheDriver.php b/src/Core/Cache/MemcachedCacheDriver.php
index 4397892a9e..9e9c00f0b8 100644
--- a/src/Core/Cache/MemcachedCacheDriver.php
+++ b/src/Core/Cache/MemcachedCacheDriver.php
@@ -10,7 +10,7 @@ use Memcached;
 /**
  * Memcached Cache Driver
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
 {
diff --git a/src/Core/Cache/RedisCacheDriver.php b/src/Core/Cache/RedisCacheDriver.php
index fff079e782..2c2a3e5d7c 100644
--- a/src/Core/Cache/RedisCacheDriver.php
+++ b/src/Core/Cache/RedisCacheDriver.php
@@ -10,7 +10,7 @@ use Redis;
 /**
  * Redis Cache Driver. This driver is based on Memcache driver
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  * @author Roland Haeder <roland@mxchange.org>
  */
 class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
diff --git a/src/Core/Config/IConfigAdapter.php b/src/Core/Config/IConfigAdapter.php
index 4bd8eac264..f9af253c0b 100644
--- a/src/Core/Config/IConfigAdapter.php
+++ b/src/Core/Config/IConfigAdapter.php
@@ -4,7 +4,7 @@ namespace Friendica\Core\Config;
 
 /**
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 interface IConfigAdapter
 {
diff --git a/src/Core/Config/JITConfigAdapter.php b/src/Core/Config/JITConfigAdapter.php
index 9c70a1dff8..b985d91c21 100644
--- a/src/Core/Config/JITConfigAdapter.php
+++ b/src/Core/Config/JITConfigAdapter.php
@@ -11,7 +11,7 @@ require_once 'include/dba.php';
  *
  * Default Config Adapter. Provides the best performance for pages loading few configuration variables.
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class JITConfigAdapter extends BaseObject implements IConfigAdapter
 {
diff --git a/src/Core/Config/JITPConfigAdapter.php b/src/Core/Config/JITPConfigAdapter.php
index 9c0999c397..512004b508 100644
--- a/src/Core/Config/JITPConfigAdapter.php
+++ b/src/Core/Config/JITPConfigAdapter.php
@@ -11,7 +11,7 @@ require_once 'include/dba.php';
  *
  * Default PConfig Adapter. Provides the best performance for pages loading few configuration variables.
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class JITPConfigAdapter extends BaseObject implements IPConfigAdapter
 {
diff --git a/src/Core/Config/PreloadConfigAdapter.php b/src/Core/Config/PreloadConfigAdapter.php
index 26df41cce9..67cf30845c 100644
--- a/src/Core/Config/PreloadConfigAdapter.php
+++ b/src/Core/Config/PreloadConfigAdapter.php
@@ -13,7 +13,7 @@ require_once 'include/dba.php';
  *
  * Minimizes the number of database queries to retrieve configuration values at the cost of memory.
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class PreloadConfigAdapter extends BaseObject implements IConfigAdapter
 {
diff --git a/src/Core/Config/PreloadPConfigAdapter.php b/src/Core/Config/PreloadPConfigAdapter.php
index 6bf193907f..ebccb018bc 100644
--- a/src/Core/Config/PreloadPConfigAdapter.php
+++ b/src/Core/Config/PreloadPConfigAdapter.php
@@ -13,7 +13,7 @@ require_once 'include/dba.php';
  *
  * Minimizes the number of database queries to retrieve configuration values at the cost of memory.
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class PreloadPConfigAdapter extends BaseObject implements IPConfigAdapter
 {
diff --git a/src/Core/Console.php b/src/Core/Console.php
index 63af50ee22..29ccd795b8 100644
--- a/src/Core/Console.php
+++ b/src/Core/Console.php
@@ -5,7 +5,7 @@ namespace Friendica\Core;
 /**
  * Description of Console
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Console extends \Asika\SimpleConsole\Console
 {
diff --git a/src/Core/Console/Config.php b/src/Core/Console/Config.php
index daa0ba60a8..da2d20fd13 100644
--- a/src/Core/Console/Config.php
+++ b/src/Core/Console/Config.php
@@ -37,8 +37,8 @@ require_once 'include/text.php';
  *   set to the value of the last parameter. (e.g. "system loglevel 0" will
  *   disable logging)
  *
- * @author Tobias Diekershoff
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Tobias Diekershoff <tobias.diekershoff@gmx.net>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Config extends \Asika\SimpleConsole\Console
 {
diff --git a/src/Core/Console/CreateDoxygen.php b/src/Core/Console/CreateDoxygen.php
index b60116db3c..1de2cee040 100644
--- a/src/Core/Console/CreateDoxygen.php
+++ b/src/Core/Console/CreateDoxygen.php
@@ -5,7 +5,7 @@ namespace Friendica\Core\Console;
 /**
  * Description of CreateDoxygen
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class CreateDoxygen extends \Asika\SimpleConsole\Console
 {
diff --git a/src/Core/Console/DatabaseStructure.php b/src/Core/Console/DatabaseStructure.php
index 13ed29b9df..4b607c1e6a 100644
--- a/src/Core/Console/DatabaseStructure.php
+++ b/src/Core/Console/DatabaseStructure.php
@@ -13,7 +13,7 @@ require_once 'include/dba.php';
 /**
  * @brief Performs database updates from the command line
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class DatabaseStructure extends \Asika\SimpleConsole\Console
 {
diff --git a/src/Core/Console/DocBloxErrorChecker.php b/src/Core/Console/DocBloxErrorChecker.php
index 50d44d114d..b29f8e2baa 100644
--- a/src/Core/Console/DocBloxErrorChecker.php
+++ b/src/Core/Console/DocBloxErrorChecker.php
@@ -22,7 +22,7 @@ namespace Friendica\Core\Console;
  * This is done for all files, so, in the end removing one file leads to a working doc build.
  *
  * @author Alexander Kampmann
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class DocBloxErrorChecker extends \Asika\SimpleConsole\Console
 {
diff --git a/src/Core/Console/Extract.php b/src/Core/Console/Extract.php
index 810d5be41b..e7c751f942 100644
--- a/src/Core/Console/Extract.php
+++ b/src/Core/Console/Extract.php
@@ -8,7 +8,7 @@ namespace Friendica\Core\Console;
  *
  * Outputs a PHP file with language strings used by Friendica
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Extract extends \Asika\SimpleConsole\Console
 {
diff --git a/src/Core/Console/GlobalCommunityBlock.php b/src/Core/Console/GlobalCommunityBlock.php
index 59a5d9cfdc..f51ed95fe2 100644
--- a/src/Core/Console/GlobalCommunityBlock.php
+++ b/src/Core/Console/GlobalCommunityBlock.php
@@ -13,8 +13,8 @@ use Friendica\Model\Contact;
  *
  * License: AGPLv3 or later, same as Friendica
  *
- * @author Tobias Diekershoff <mrpetovan@gmail.com>
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Tobias Diekershoff <tobias.diekershoff@gmx.net>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class GlobalCommunityBlock extends \Asika\SimpleConsole\Console
 {
diff --git a/src/Core/Console/GlobalCommunitySilence.php b/src/Core/Console/GlobalCommunitySilence.php
index 2b25d84433..03101cdf0f 100644
--- a/src/Core/Console/GlobalCommunitySilence.php
+++ b/src/Core/Console/GlobalCommunitySilence.php
@@ -19,8 +19,8 @@ require_once 'include/text.php';
  *
  * License: AGPLv3 or later, same as Friendica
  *
- * @author Tobias Diekershoff
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Tobias Diekershoff <tobias.diekershoff@gmx.net>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class GlobalCommunitySilence extends \Asika\SimpleConsole\Console
 {
diff --git a/src/Core/Console/Maintenance.php b/src/Core/Console/Maintenance.php
index 90449c4787..a3e3b80a7e 100644
--- a/src/Core/Console/Maintenance.php
+++ b/src/Core/Console/Maintenance.php
@@ -10,7 +10,7 @@ require_once 'include/dba.php';
 /**
  * @brief Sets maintenance mode for this node
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Maintenance extends \Asika\SimpleConsole\Console
 {
diff --git a/src/Core/Console/PhpToPo.php b/src/Core/Console/PhpToPo.php
index 76cf164344..fb7ecac43e 100644
--- a/src/Core/Console/PhpToPo.php
+++ b/src/Core/Console/PhpToPo.php
@@ -5,7 +5,7 @@ namespace Friendica\Core\Console;
 /**
  * Read a strings.php file and create messages.po in the same directory
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class PhpToPo extends \Asika\SimpleConsole\Console
 {
diff --git a/src/Core/Console/PoToPhp.php b/src/Core/Console/PoToPhp.php
index e97e1ff3d9..b7c9bfaaec 100644
--- a/src/Core/Console/PoToPhp.php
+++ b/src/Core/Console/PoToPhp.php
@@ -5,7 +5,7 @@ namespace Friendica\Core\Console;
 /**
  * Read a messages.po file and create strings.php in the same directory
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class PoToPhp extends \Asika\SimpleConsole\Console
 {
diff --git a/src/Core/Console/PostUpdate.php b/src/Core/Console/PostUpdate.php
index 3162a725c0..24ed514b5e 100644
--- a/src/Core/Console/PostUpdate.php
+++ b/src/Core/Console/PostUpdate.php
@@ -6,15 +6,12 @@ use Friendica\Core\L10n;
 use Friendica\Core\Config;
 
 /**
- * @brief tool to block an account from the node
- *
- * With this tool, you can block an account in such a way, that no postings
- * or comments this account writes are accepted to the node.
+ * Performs database post updates
  *
  * License: AGPLv3 or later, same as Friendica
  *
- * @author Tobias Diekershoff <mrpetovan@gmail.com>
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Tobias Diekershoff <tobias.diekershoff@gmx.net>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class PostUpdate extends \Asika\SimpleConsole\Console
 {
diff --git a/src/Core/Console/Typo.php b/src/Core/Console/Typo.php
index e3ae52263b..cdb3f9c81f 100644
--- a/src/Core/Console/Typo.php
+++ b/src/Core/Console/Typo.php
@@ -6,7 +6,7 @@ namespace Friendica\Core\Console;
  * Tired of chasing typos and finding them after a commit.
  * Run this and quickly see if we've got any parse errors in our application files.
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Typo extends \Asika\SimpleConsole\Console
 {
diff --git a/src/Core/Protocol.php b/src/Core/Protocol.php
index 9e96b7db2f..d41250a686 100644
--- a/src/Core/Protocol.php
+++ b/src/Core/Protocol.php
@@ -9,7 +9,7 @@ use Friendica\Util\Network;
 /**
  * Manage compatibility with federated networks
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Protocol
 {
diff --git a/src/Core/Session.php b/src/Core/Session.php
index 6d059eb4ef..d9143c8809 100644
--- a/src/Core/Session.php
+++ b/src/Core/Session.php
@@ -11,7 +11,7 @@ use Friendica\Core\Session\DatabaseSessionHandler;
 /**
  * High-level Session service class
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Session
 {
diff --git a/src/Core/Session/CacheSessionHandler.php b/src/Core/Session/CacheSessionHandler.php
index 507735c4fc..3ebdb99e16 100644
--- a/src/Core/Session/CacheSessionHandler.php
+++ b/src/Core/Session/CacheSessionHandler.php
@@ -13,7 +13,7 @@ require_once 'include/text.php';
 /**
  * SessionHandler using Friendica Cache
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class CacheSessionHandler extends BaseObject implements SessionHandlerInterface
 {
diff --git a/src/Core/Session/DatabaseSessionHandler.php b/src/Core/Session/DatabaseSessionHandler.php
index d0887d1123..f249b37fd7 100644
--- a/src/Core/Session/DatabaseSessionHandler.php
+++ b/src/Core/Session/DatabaseSessionHandler.php
@@ -14,7 +14,7 @@ require_once 'include/text.php';
 /**
  * SessionHandler using database
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class DatabaseSessionHandler extends BaseObject implements SessionHandlerInterface
 {
diff --git a/src/Module/Feed.php b/src/Module/Feed.php
index 2be12f13e4..5df68f223e 100644
--- a/src/Module/Feed.php
+++ b/src/Module/Feed.php
@@ -20,7 +20,7 @@ use Friendica\Protocol\OStatus;
  *
  * @brief Provides public Atom feeds
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Feed extends BaseModule
 {
diff --git a/src/Module/Login.php b/src/Module/Login.php
index b9e51da4ca..fadfb20661 100644
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -22,7 +22,7 @@ require_once 'include/text.php';
 /**
  * Login module
  *
- * @author Hypolite Petovan mrpetovan@gmail.com
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Login extends BaseModule
 {
diff --git a/src/Module/Logout.php b/src/Module/Logout.php
index 7c5391a6ba..bfa917a393 100644
--- a/src/Module/Logout.php
+++ b/src/Module/Logout.php
@@ -14,7 +14,7 @@ require_once 'include/security.php';
 /**
  * Logout module
  *
- * @author Hypolite Petovan mrpetovan@gmail.com
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Logout extends BaseModule
 {
diff --git a/src/Module/Oembed.php b/src/Module/Oembed.php
index 570e281241..452162ff20 100644
--- a/src/Module/Oembed.php
+++ b/src/Module/Oembed.php
@@ -12,7 +12,7 @@ use Friendica\Content;
  *
  * Example: /oembed/aHR0cHM6Ly9...
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Oembed extends BaseModule
 {
diff --git a/src/Object/OEmbed.php b/src/Object/OEmbed.php
index 3eebcc2265..20f27ae0bf 100644
--- a/src/Object/OEmbed.php
+++ b/src/Object/OEmbed.php
@@ -7,7 +7,7 @@ namespace Friendica\Object;
  *
  * @see https://oembed.com/#section2.3
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class OEmbed
 {
diff --git a/src/Render/FriendicaSmarty.php b/src/Render/FriendicaSmarty.php
index 8c8e637630..f4c6a8ed27 100644
--- a/src/Render/FriendicaSmarty.php
+++ b/src/Render/FriendicaSmarty.php
@@ -9,7 +9,7 @@ use Smarty;
 /**
  * Friendica extension of the Smarty3 template engine
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class FriendicaSmarty extends Smarty
 {
diff --git a/src/Render/FriendicaSmartyEngine.php b/src/Render/FriendicaSmartyEngine.php
index c6e95ee068..1053ab08e0 100644
--- a/src/Render/FriendicaSmartyEngine.php
+++ b/src/Render/FriendicaSmartyEngine.php
@@ -9,7 +9,7 @@ use Friendica\Core\Addon;
 /**
  * Smarty implementation of the Friendica template engine interface
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class FriendicaSmartyEngine implements ITemplateEngine
 {
diff --git a/view/lang/fr/messages.po b/view/lang/fr/messages.po
index ae80151fb0..9035bb0b2a 100644
--- a/view/lang/fr/messages.po
+++ b/view/lang/fr/messages.po
@@ -8,7 +8,7 @@
 # Damien Goutte-Gattat <damien+transifex@incenp.org>, 2015-2016
 # Damien Goutte-Gattat <damien+transifex@incenp.org>, 2015
 # Domovoy <domovoy@errlock.org>, 2012
-# Hypolite Petovan <mrpetovan@gmail.com>, 2016
+# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
 # Jak <inactive+Jak@transifex.com>, 2014
 # Lionel Triay <zapimax38@free.fr>, 2013
 # Thecross, 2017

From d6adcb973401982e76035ca000130a347391a2be Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 16 Sep 2018 09:04:25 -0400
Subject: [PATCH 73/96] Remove text highlighting from BBCode::convert

- Move code blocks escaping from BBCode::toMarkdown to BBCode::convert
- Use "language-" class prefix for expected syntax highlighting
---
 src/Content/Text/BBCode.php   | 62 ++++++++++++++++-------------------
 src/Content/Text/HTML.php     |  2 +-
 src/Content/Text/Markdown.php |  1 +
 3 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 2dc13ae5e0..ef527f802c 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -1227,6 +1227,22 @@ class BBCode extends BaseObject
 			return $return;
 		};
 
+		// Extracting multi-line code blocks before the whitespace processing
+		$codeblocks = [];
+
+		$text = preg_replace_callback("#\[code(?:=([^\]]*))?\](.*?)\[\/code\]#is",
+			function ($matches) use (&$codeblocks) {
+				$return = $matches[0];
+				if (strpos($matches[2], "\n") !== false) {
+					$return = '#codeblock-' . count($codeblocks) . '#';
+
+					$codeblocks[] =  '<pre><code class="language-' . trim($matches[1]) . '">' . trim($matches[2], "\n\r") . '</code></pre>';
+				}
+				return $return;
+			},
+			$text
+		);
+
 		// Hide all [noparse] contained bbtags by spacefying them
 		// POSSIBLE BUG --> Will the 'preg' functions crash if there's an embedded image?
 
@@ -1273,11 +1289,6 @@ class BBCode extends BaseObject
 			$text = preg_replace("/\[share(.*?)avatar\s?=\s?'.*?'\s?(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "\n[share$1$2]$3[/share]", $text);
 		}
 
-		// Check for [code] text here, before the linefeeds are messed with.
-		// The highlighter will unescape and re-escape the content.
-		if (strpos($text, '[code=') !== false) {
-			$text = preg_replace_callback("/\[code=(.*?)\](.*?)\[\/code\]/ism", 'self::textHighlightCallback', $text);
-		}
 		// Convert new line chars to html <br /> tags
 
 		// nlbr seems to be hopelessly messed up
@@ -1771,6 +1782,18 @@ class BBCode extends BaseObject
 			$text = self::interpolateSavedImagesIntoItemBody($text, $saved_image);
 		}
 
+		// Restore code blocks
+		$text = preg_replace_callback('/#codeblock-([0-9]+)#/iU',
+			function ($matches) use ($codeblocks) {
+				$return = $matches[0];
+				if (isset($codeblocks[intval($matches[1])])) {
+					$return = $codeblocks[$matches[1]];
+				}
+				return $return;
+			},
+			$text
+		);
+
 		// Clean up the HTML by loading and saving the HTML with the DOM.
 		// Bad structured html can break a whole page.
 		// For performance reasons do it only with ativated item cache or at export.
@@ -1905,23 +1928,6 @@ class BBCode extends BaseObject
 		// Converting images with size parameters to simple images. Markdown doesn't know it.
 		$text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $text);
 
-		// Extracting multi-line code blocks before the whitespace processing/code highlighter in self::convert()
-		$codeblocks = [];
-
-		$text = preg_replace_callback("#\[code(?:=([^\]]*))?\](.*?)\[\/code\]#is",
-			function ($matches) use (&$codeblocks) {
-				$return = $matches[0];
-				if (strpos($matches[2], "\n") !== false) {
-					$return = '#codeblock-' . count($codeblocks) . '#';
-
-					$prefix = '````' . $matches[1] . PHP_EOL;
-					$codeblocks[] = $prefix . trim($matches[2]) . PHP_EOL . '````';
-				}
-				return $return;
-			},
-			$text
-		);
-
 		// Convert it to HTML - don't try oembed
 		if ($for_diaspora) {
 			$text = self::convert($text, false, 3);
@@ -1975,18 +1981,6 @@ class BBCode extends BaseObject
 			);
 		}
 
-		// Restore code blocks
-		$text = preg_replace_callback('/#codeblock-([0-9]+)#/iU',
-			function ($matches) use ($codeblocks) {
-				$return = '';
-				if (isset($codeblocks[intval($matches[1])])) {
-					$return = $codeblocks[$matches[1]];
-				}
-				return $return;
-			},
-			$text
-		);
-
 		Addon::callHooks('bb2diaspora', $text);
 
 		return $text;
diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index 4ec85b046b..844b111ca1 100644
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -122,7 +122,7 @@ class HTML
 		// Removing code blocks before the whitespace removal processing below
 		$codeblocks = [];
 		$message = preg_replace_callback(
-			'#<pre><code(?: class="([^"]*)")?>(.*)</code></pre>#iUs',
+			'#<pre><code(?: class="language-([^"]*)")?>(.*)</code></pre>#iUs',
 			function ($matches) use (&$codeblocks) {
 				$return = '[codeblock-' . count($codeblocks) . ']';
 
diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php
index 71d1a7b849..5450f8aa9d 100644
--- a/src/Content/Text/Markdown.php
+++ b/src/Content/Text/Markdown.php
@@ -32,6 +32,7 @@ class Markdown extends BaseObject
 
 		$MarkdownParser = new MarkdownExtra();
 		$MarkdownParser->hard_wrap = $hardwrap;
+		$MarkdownParser->code_class_prefix = 'language-';
 		$html = $MarkdownParser->transform($text);
 
 		self::getApp()->save_timestamp($stamp1, "parser");

From ba4f368b451144230af4e7a604113cf1e1d17717 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 16 Sep 2018 09:05:00 -0400
Subject: [PATCH 74/96] Remove references to pear/Text_Highlighter

---
 include/text.php            | 55 -------------------------------------
 src/Content/Text/BBCode.php | 15 ----------
 2 files changed, 70 deletions(-)

diff --git a/include/text.php b/include/text.php
index d251824e2b..97baee7f60 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1911,58 +1911,3 @@ function format_network_name($network, $url = 0) {
 		return $network_name;
 	}
 }
-
-/**
- * @brief Syntax based code highlighting for popular languages.
- * @param string $s Code block
- * @param string $lang Programming language
- * @return string Formated html
- */
-function text_highlight($s, $lang) {
-	if ($lang === 'js') {
-		$lang = 'javascript';
-	}
-
-	if ($lang === 'bash') {
-		$lang = 'sh';
-	}
-
-	// @TODO: Replace Text_Highlighter_Renderer_Html by scrivo/highlight.php
-
-	// Autoload the library to make constants available
-	class_exists('Text_Highlighter_Renderer_Html');
-
-	$options = [
-		'numbers' => HL_NUMBERS_LI,
-		'tabsize' => 4,
-	];
-
-	$tag_added = false;
-	$s = trim(html_entity_decode($s, ENT_COMPAT));
-	$s = str_replace('    ', "\t", $s);
-
-	/*
-	 * The highlighter library insists on an opening php tag for php code blocks. If
-	 * it isn't present, nothing is highlighted. So we're going to see if it's present.
-	 * If not, we'll add it, and then quietly remove it after we get the processed output back.
-	 */
-	if ($lang === 'php' && strpos($s, '<?php') !== 0) {
-		$s = '<?php' . "\n" . $s;
-		$tag_added = true;
-	}
-
-	$renderer = new Text_Highlighter_Renderer_Html($options);
-	$factory = new Text_Highlighter();
-	$hl = $factory->factory($lang);
-	$hl->setRenderer($renderer);
-	$o = $hl->highlight($s);
-	$o = str_replace("\n", '', $o);
-
-	if ($tag_added) {
-		$b = substr($o, 0, strpos($o, '<li>'));
-		$e = substr($o, strpos($o, '</li>'));
-		$o = $b . $e;
-	}
-
-	return '<code>' . $o . '</code>';
-}
diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index ef527f802c..b403b1f349 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -1164,21 +1164,6 @@ class BBCode extends BaseObject
 		return $return;
 	}
 
-	private static function textHighlightCallback($match)
-	{
-		// Fallback in case the language doesn't exist
-		$return = '[code]' . $match[2] . '[/code]';
-
-		if (in_array(strtolower($match[1]),
-				['php', 'css', 'mysql', 'sql', 'abap', 'diff', 'html', 'perl', 'ruby',
-				'vbscript', 'avrc', 'dtd', 'java', 'xml', 'cpp', 'python', 'javascript', 'js', 'sh', 'bash'])
-		) {
-			$return = text_highlight($match[2], strtolower($match[1]));
-		}
-
-		return $return;
-	}
-
 	/**
 	 * @brief Converts a BBCode message to HTML message
 	 *

From a5bf37fd9845d19675cd0645e48a2bbc26d3659d Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 16 Sep 2018 09:05:30 -0400
Subject: [PATCH 75/96] [Composer] Remove pear/Text_Highlighter dependency

---
 composer.json |   1 -
 composer.lock | 213 ++------------------------------------------------
 2 files changed, 7 insertions(+), 207 deletions(-)

diff --git a/composer.json b/composer.json
index 04e4b655da..e30dd7bdb1 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,6 @@
 		"mobiledetect/mobiledetectlib": "2.8.*",
 		"paragonie/random_compat": "^2.0",
 		"pear/Text_LanguageDetect": "1.*",
-		"pear/Text_Highlighter": "dev-master",
 		"seld/cli-prompt": "^1.0",
 		"smarty/smarty": "^3.1",
 		"fxp/composer-asset-plugin": "~1.3",
diff --git a/composer.lock b/composer.lock
index 76c20a1b93..fca91452ef 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "d62c3e3d6971ee63a862a22ff3cd3768",
+    "content-hash": "dbe452683e73047b19dd17173d3f32ae",
     "packages": [
         {
             "name": "asika/simple-console",
@@ -1669,204 +1669,6 @@
             ],
             "time": "2018-02-15T05:50:20+00:00"
         },
-        {
-            "name": "pear/console_getopt",
-            "version": "v1.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pear/Console_Getopt.git",
-                "reference": "82f05cd1aa3edf34e19aa7c8ca312ce13a6a577f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/82f05cd1aa3edf34e19aa7c8ca312ce13a6a577f",
-                "reference": "82f05cd1aa3edf34e19aa7c8ca312ce13a6a577f",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Console": "./"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "./"
-            ],
-            "license": [
-                "BSD-2-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Beaver",
-                    "email": "cellog@php.net",
-                    "role": "Helper"
-                },
-                {
-                    "name": "Andrei Zmievski",
-                    "email": "andrei@php.net",
-                    "role": "Lead"
-                },
-                {
-                    "name": "Stig Bakken",
-                    "email": "stig@php.net",
-                    "role": "Developer"
-                }
-            ],
-            "description": "More info available on: http://pear.php.net/package/Console_Getopt",
-            "time": "2015-07-20T20:28:12+00:00"
-        },
-        {
-            "name": "pear/pear-core-minimal",
-            "version": "v1.10.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pear/pear-core-minimal.git",
-                "reference": "070f0b600b2caca2501e2c9b7e553016e4b0d115"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/070f0b600b2caca2501e2c9b7e553016e4b0d115",
-                "reference": "070f0b600b2caca2501e2c9b7e553016e4b0d115",
-                "shasum": ""
-            },
-            "require": {
-                "pear/console_getopt": "~1.4",
-                "pear/pear_exception": "~1.0"
-            },
-            "replace": {
-                "rsky/pear-core-min": "self.version"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "src/"
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Christian Weiske",
-                    "email": "cweiske@php.net",
-                    "role": "Lead"
-                }
-            ],
-            "description": "Minimal set of PEAR core files to be used as composer dependency",
-            "time": "2017-02-28T16:46:11+00:00"
-        },
-        {
-            "name": "pear/pear_exception",
-            "version": "v1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pear/PEAR_Exception.git",
-                "reference": "8c18719fdae000b690e3912be401c76e406dd13b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/8c18719fdae000b690e3912be401c76e406dd13b",
-                "reference": "8c18719fdae000b690e3912be401c76e406dd13b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=4.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "*"
-            },
-            "type": "class",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "PEAR": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "."
-            ],
-            "license": [
-                "BSD-2-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Helgi Thormar",
-                    "email": "dufuz@php.net"
-                },
-                {
-                    "name": "Greg Beaver",
-                    "email": "cellog@php.net"
-                }
-            ],
-            "description": "The PEAR Exception base class.",
-            "homepage": "https://github.com/pear/PEAR_Exception",
-            "keywords": [
-                "exception"
-            ],
-            "time": "2015-02-10T20:07:52+00:00"
-        },
-        {
-            "name": "pear/text_highlighter",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pear/Text_Highlighter.git",
-                "reference": "2ccac2d9eaf55dc08bbbdb7136c93fb399d0f855"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pear/Text_Highlighter/zipball/2ccac2d9eaf55dc08bbbdb7136c93fb399d0f855",
-                "reference": "2ccac2d9eaf55dc08bbbdb7136c93fb399d0f855",
-                "shasum": ""
-            },
-            "require": {
-                "pear/pear-core-minimal": "~1.10.0",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "@stable"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Text": "./"
-                }
-            },
-            "include-path": [
-                "./"
-            ],
-            "license": [
-                "PHP-3.01"
-            ],
-            "authors": [
-                {
-                    "email": "ssttoo@gmail.com",
-                    "name": "Stoyan Stefanov",
-                    "role": "Lead"
-                },
-                {
-                    "email": "demenev@gmail.com",
-                    "name": "Andrey Demenev",
-                    "role": "Lead"
-                }
-            ],
-            "description": "More info available on: http://pear.php.net/package/Text_Highlighter",
-            "support": {
-                "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Text_Highlighter",
-                "source": "https://github.com/pear/Text_Highlighter"
-            },
-            "time": "2018-01-27T08:24:15+00:00"
-        },
         {
             "name": "pear/text_languagedetect",
             "version": "v1.0.0",
@@ -3145,7 +2947,7 @@
                 }
             ],
             "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "https://github.com/sebastianbergmann/comparator",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
             "keywords": [
                 "comparator",
                 "compare",
@@ -3247,7 +3049,7 @@
                 }
             ],
             "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "https://github.com/sebastianbergmann/environment",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
             "keywords": [
                 "Xdebug",
                 "environment",
@@ -3315,7 +3117,7 @@
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "https://github.com/sebastianbergmann/exporter",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
             "keywords": [
                 "export",
                 "exporter"
@@ -3367,7 +3169,7 @@
                 }
             ],
             "description": "Snapshotting of global state",
-            "homepage": "https://github.com/sebastianbergmann/global-state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
             "keywords": [
                 "global state"
             ],
@@ -3469,7 +3271,7 @@
                 }
             ],
             "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "https://github.com/sebastianbergmann/recursion-context",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
             "time": "2016-11-19T07:33:16+00:00"
         },
         {
@@ -3669,8 +3471,7 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "lightopenid/lightopenid": 20,
-        "pear/text_highlighter": 20
+        "lightopenid/lightopenid": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,

From 96ed7525b733111dbeca2cd672f85188ce369fef Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 16 Sep 2018 09:05:54 -0400
Subject: [PATCH 76/96] Improve whitespace display from/to BBCode/HTML

---
 src/Content/Text/BBCode.php | 2 +-
 src/Content/Text/HTML.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index b403b1f349..d0f512ce13 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -348,7 +348,7 @@ class BBCode extends BaseObject
 	 */
 	public static function toPlaintext($text, $keep_urls = true)
 	{
-		$naked_text = preg_replace('/\[(.+?)\]/','', $text);
+		$naked_text = preg_replace('/\[(.+?)\]\s*/','', $text);
 		if (!$keep_urls) {
 			$naked_text = preg_replace('#https?\://[^\s<]+[^\s\.\)]#i', '', $naked_text);
 		}
diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index 844b111ca1..9a9f24f97f 100644
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -131,7 +131,7 @@ class HTML
 					$prefix = '[code=' . $matches[1] . ']';
 				}
 
-				$codeblocks[] = $prefix . trim($matches[2]) . '[/code]';
+				$codeblocks[] = $prefix . PHP_EOL . trim($matches[2]) . PHP_EOL . '[/code]';
 				return $return;
 			},
 			$message

From 87c425e388cca77c1fa54ece7ad0b80764c1f5ff Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 16 Sep 2018 09:07:17 -0400
Subject: [PATCH 77/96] Improve whitespace display in mod/babel

- Add a couple more result panels for Markdown input
- Remove \x28/\x29 parentheses encoding
- Convert remaining double quotes
---
 mod/babel.php | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/mod/babel.php b/mod/babel.php
index 3352366bd5..fcd63113e8 100644
--- a/mod/babel.php
+++ b/mod/babel.php
@@ -6,8 +6,10 @@
 use Friendica\Content\Text;
 use Friendica\Core\L10n;
 
-function visible_lf($s)
+function visible_whitespace($s)
 {
+	$s = str_replace(' ', '&nbsp;', $s);
+
 	return str_replace("\n", '<br />', $s);
 }
 
@@ -20,19 +22,19 @@ function babel_content()
 				$bbcode = trim($_REQUEST['text']);
 				$results[] = [
 					'title' => L10n::t('Source input'),
-					'content' => visible_lf($bbcode)
+					'content' => visible_whitespace($bbcode)
 				];
 
 				$plain = Text\BBCode::toPlaintext($bbcode, false);
 				$results[] = [
 					'title' => L10n::t('BBCode::toPlaintext'),
-					'content' => visible_lf($plain)
+					'content' => visible_whitespace($plain)
 				];
 
 				$html = Text\BBCode::convert($bbcode);
 				$results[] = [
-					'title' => L10n::t("BBCode::convert \x28raw HTML\x29"),
-					'content' => htmlspecialchars($html)
+					'title' => L10n::t('BBCode::convert (raw HTML)'),
+					'content' => visible_whitespace(htmlspecialchars($html))
 				];
 
 				$results[] = [
@@ -43,13 +45,13 @@ function babel_content()
 				$bbcode2 = Text\HTML::toBBCode($html);
 				$results[] = [
 					'title' => L10n::t('BBCode::convert => HTML::toBBCode'),
-					'content' => visible_lf($bbcode2)
+					'content' => visible_whitespace($bbcode2)
 				];
 
 				$markdown = Text\BBCode::toMarkdown($bbcode);
 				$results[] = [
 					'title' => L10n::t('BBCode::toMarkdown'),
-					'content' => visible_lf($markdown)
+					'content' => visible_whitespace($markdown)
 				];
 
 				$html2 = Text\Markdown::convert($markdown);
@@ -61,22 +63,33 @@ function babel_content()
 				$bbcode3 = Text\Markdown::toBBCode($markdown);
 				$results[] = [
 					'title' => L10n::t('BBCode::toMarkdown => Markdown::toBBCode'),
-					'content' => visible_lf($bbcode3)
+					'content' => visible_whitespace($bbcode3)
 				];
 
 				$bbcode4 = Text\HTML::toBBCode($html2);
 				$results[] = [
 					'title' => L10n::t('BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode'),
-					'content' => visible_lf($bbcode4)
+					'content' => visible_whitespace($bbcode4)
 				];
 				break;
 			case 'markdown':
 				$markdown = trim($_REQUEST['text']);
 				$results[] = [
-					'title' => L10n::t('Source input \x28Diaspora format\x29'),
+					'title' => L10n::t('Source input (Diaspora format)'),
 					'content' => '<pre>' . $markdown . '</pre>'
 				];
 
+				$html = Text\Markdown::convert($markdown);
+				$results[] = [
+					'title' => L10n::t('Markdown::convert (raw HTML)'),
+					'content' => htmlspecialchars($html)
+				];
+
+				$results[] = [
+					'title' => L10n::t('Markdown::convert'),
+					'content' => $html
+				];
+
 				$bbcode = Text\Markdown::toBBCode($markdown);
 				$results[] = [
 					'title' => L10n::t('Markdown::toBBCode'),
@@ -86,7 +99,7 @@ function babel_content()
 			case 'html' :
 				$html = trim($_REQUEST['text']);
 				$results[] = [
-					'title' => L10n::t("Raw HTML input"),
+					'title' => L10n::t('Raw HTML input'),
 					'content' => htmlspecialchars($html)
 				];
 
@@ -98,7 +111,7 @@ function babel_content()
 				$bbcode = Text\HTML::toBBCode($html);
 				$results[] = [
 					'title' => L10n::t('HTML::toBBCode'),
-					'content' => visible_lf($bbcode)
+					'content' => visible_whitespace($bbcode)
 				];
 
 				$text = Text\HTML::toPlaintext($html);

From 102adf86aef133afb4afe501bbe0bbab0bb1a56a Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 16 Sep 2018 09:18:31 -0400
Subject: [PATCH 78/96] Restore partial condition in OEmbed block of
 ParseUrl::getSiteInfo

---
 src/Util/ParseUrl.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index 5745c65595..8c8914534e 100644
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -161,14 +161,17 @@ class ParseUrl
 					$siteinfo['type'] = $oembed_data->type;
 				}
 
-				if (isset($oembed_data->title)) {
-					$siteinfo['title'] = trim($oembed_data->title);
-				}
-				if (isset($oembed_data->description)) {
-					$siteinfo['text'] = trim($oembed_data->description);
-				}
-				if (isset($oembed_data->thumbnail_url)) {
-					$siteinfo['image'] = $oembed_data->thumbnail_url;
+				// See https://github.com/friendica/friendica/pull/5763#discussion_r217913178
+				if ($siteinfo['type'] != 'photo') {
+					if (isset($oembed_data->title)) {
+						$siteinfo['title'] = trim($oembed_data->title);
+					}
+					if (isset($oembed_data->description)) {
+						$siteinfo['text'] = trim($oembed_data->description);
+					}
+					if (isset($oembed_data->thumbnail_url)) {
+						$siteinfo['image'] = $oembed_data->thumbnail_url;
+					}
 				}
 			}
 		}

From ee0fc167c9a6fb193e38853886c77ae49fe338e4 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 17 Sep 2018 19:42:12 +0200
Subject: [PATCH 79/96] CS translation update THX Aditoo

---
 view/lang/cs/messages.po | 366 +++++++++++++++++++--------------------
 view/lang/cs/strings.php | 364 +++++++++++++++++++-------------------
 2 files changed, 365 insertions(+), 365 deletions(-)

diff --git a/view/lang/cs/messages.po b/view/lang/cs/messages.po
index 8852b2fc32..057416b7fe 100644
--- a/view/lang/cs/messages.po
+++ b/view/lang/cs/messages.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-25 15:34+0000\n"
-"PO-Revision-Date: 2018-08-28 14:24+0000\n"
+"PO-Revision-Date: 2018-09-17 14:51+0000\n"
 "Last-Translator: Aditoo\n"
 "Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr "Pro použití doplňků musíte být přihlášen/a."
 #: index.php:308 mod/fetch.php:20 mod/fetch.php:47 mod/fetch.php:54
 #: mod/help.php:62
 msgid "Not Found"
-msgstr "Nenalezen"
+msgstr "Nenalezeno"
 
 #: index.php:313 mod/viewcontacts.php:35 mod/dfrn_poll.php:486 mod/help.php:65
 #: mod/cal.php:44
@@ -193,7 +193,7 @@ msgstr "Zadejte jméno nebo zájmy"
 #: mod/allfriends.php:76 mod/contacts.php:604 mod/contacts.php:610
 #: mod/follow.php:143 src/Model/Contact.php:933 src/Content/Widget.php:61
 msgid "Connect/Follow"
-msgstr "Spojit/sledovat"
+msgstr "Spojit se/sledovat"
 
 #: view/theme/vier/theme.php:200 src/Content/Widget.php:62
 msgid "Examples: Robert Morgenstein, Fishing"
@@ -227,7 +227,7 @@ msgstr "Globální adresář"
 
 #: view/theme/vier/theme.php:208 src/Content/Widget.php:70
 msgid "Local Directory"
-msgstr "Lokální adresář"
+msgstr "Místní adresář"
 
 #: view/theme/vier/theme.php:251 include/text.php:909 src/Content/Nav.php:151
 #: src/Content/ForumManager.php:125
@@ -958,7 +958,7 @@ msgstr "Oznámení Friendica"
 
 #: include/enotify.php:55
 msgid "Thank You,"
-msgstr "Děkujeme, "
+msgstr "Děkuji,"
 
 #: include/enotify.php:58
 #, php-format
@@ -1144,18 +1144,18 @@ msgstr "Máte nového sledovatele na %2$s : %1$s"
 
 #: include/enotify.php:326
 msgid "[Friendica:Notify] Friend suggestion received"
-msgstr "[Friendica:Oznámení] Obdržen návrh pro přátelství"
+msgstr "[Friendica:Oznámení] Obdržen návrh přátelství"
 
 #: include/enotify.php:328
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
-msgstr "Obdržel/a jste návrh pro přátelství od uživatele \"%1$s\" na %2$s"
+msgstr "Obdržel/a jste návrh přátelství od uživatele \"%1$s\" na %2$s"
 
 #: include/enotify.php:329
 #, php-format
 msgid ""
 "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
-msgstr "Obdržel/a jste [url=%1$s]návrh pro přátelství[/url] s uživatelem %2$s od uživatele %3$s."
+msgstr "Obdržel/a jste [url=%1$s]návrh přátelství[/url] s uživatelem %2$s od uživatele %3$s."
 
 #: include/enotify.php:335
 msgid "Name:"
@@ -1168,7 +1168,7 @@ msgstr "Fotka:"
 #: include/enotify.php:339
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
-msgstr "Prosím navštivte %s pro schválení či zamítnutí doporučení."
+msgstr "Prosím navštivte %s pro schválení či zamítnutí návrhu."
 
 #: include/enotify.php:347 include/enotify.php:362
 msgid "[Friendica:Notify] Connection accepted"
@@ -1218,7 +1218,7 @@ msgstr "Prosím navštivte %s  pokud chcete změnit tento vztah."
 
 #: include/enotify.php:384 mod/removeme.php:47
 msgid "[Friendica System Notify]"
-msgstr "[Oznámení systému Friendica]"
+msgstr "[Systémové oznámení Friendica]"
 
 #: include/enotify.php:384
 msgid "registration request"
@@ -1273,7 +1273,7 @@ msgstr "poslední"
 
 #: include/text.php:398
 msgid "Loading more entries..."
-msgstr "Načítání více záznamů..."
+msgstr "Načítám více záznamů..."
 
 #: include/text.php:399
 msgid "The end"
@@ -1289,7 +1289,7 @@ msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakty"
-msgstr[2] "%d kontaktů"
+msgstr[2] "%d kontaktu"
 msgstr[3] "%d kontaktů"
 
 #: include/text.php:804
@@ -1319,7 +1319,7 @@ msgstr "Celý text"
 #: include/text.php:905 src/Content/Nav.php:146
 #: src/Content/Widget/TagCloud.php:53
 msgid "Tags"
-msgstr "Štítky:"
+msgstr "Štítky"
 
 #: include/text.php:953
 msgid "poke"
@@ -1529,7 +1529,7 @@ msgstr "bytů"
 
 #: include/text.php:1254 include/text.php:1265 include/text.php:1300
 msgid "Click to open/close"
-msgstr "Klikněte pro otevření/zavření"
+msgstr "Kliknutím otevřete/zavřete"
 
 #: include/text.php:1415
 msgid "View on separate page"
@@ -1552,7 +1552,7 @@ msgid "comment"
 msgid_plural "comments"
 msgstr[0] "komentář"
 msgstr[1] "komentáře"
-msgstr[2] "komentářů"
+msgstr[2] "komentáře"
 msgstr[3] "komentářů"
 
 #: include/text.php:1620
@@ -1569,7 +1569,7 @@ 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] "Byl dosažen denní limit %d příspěvku. Příspěvek byl odmítnut."
 msgstr[1] "Byl dosažen denní limit %d příspěvků. Příspěvek byl odmítnut."
-msgstr[2] "Byl dosažen denní limit %d příspěvků. Příspěvek byl odmítnut."
+msgstr[2] "Byl dosažen denní limit %d příspěvku. Příspěvek byl odmítnut."
 msgstr[3] "Byl dosažen denní limit %d příspěvků. Příspěvek byl odmítnut."
 
 #: include/api.php:1152
@@ -1579,7 +1579,7 @@ msgid_plural ""
 "Weekly posting limit of %d posts reached. The post was rejected."
 msgstr[0] "Byl dosažen týdenní limit %d příspěvku. Příspěvek byl odmítnut."
 msgstr[1] "Byl dosažen týdenní limit %d příspěvků. Příspěvek byl odmítnut."
-msgstr[2] "Byl dosažen týdenní limit %d příspěvků. Příspěvek byl odmítnut."
+msgstr[2] "Byl dosažen týdenní limit %d příspěvku. Příspěvek byl odmítnut."
 msgstr[3] "Byl dosažen týdenní limit %d příspěvků. Příspěvek byl odmítnut."
 
 #: include/api.php:1166
@@ -1643,7 +1643,7 @@ msgstr "Znovu načíst data kontaktu"
 
 #: mod/crepair.php:151
 msgid "Remote Self"
-msgstr "Remote Self"
+msgstr "Vzdálené zrcadlení"
 
 #: mod/crepair.php:154
 msgid "Mirror postings from this contact"
@@ -1653,7 +1653,7 @@ msgstr "Zrcadlení příspěvků od tohoto kontaktu"
 msgid ""
 "Mark this contact as remote_self, this will cause friendica to repost new "
 "entries from this contact."
-msgstr "Označit tento kontakt jako \"remote_self\", s tímto nastavením bude friendica přeposílat všechny nové příspěvky od tohoto kontaktu."
+msgstr "Označit tento kontakt jako \"remote_self\", s tímto nastavením bude Friendica znovupublikovat všechny nové příspěvky od tohoto kontaktu."
 
 #: mod/crepair.php:160 mod/settings.php:677 mod/settings.php:703
 #: mod/admin.php:500 mod/admin.php:1890 mod/admin.php:1901 mod/admin.php:1915
@@ -1864,14 +1864,14 @@ msgstr "Systémový jazyk"
 msgid ""
 "Set the default language for your Friendica installation interface and to "
 "send emails."
-msgstr "Nastavte si výchozí jazyk pro vaše instalační rozhraní Friendica a pro odesílání e-mailů."
+msgstr "Nastavte si výchozí jazyk pro Vaše instalační rozhraní Friendica a pro odesílání e-mailů."
 
 #: mod/install.php:255
 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 "Databázový konfigurační soubor \"config/local.ini.php\" nemohl být zapsán. Prosím, použijte přiložený text k vytvoření konfiguračního souboru ve vašem kořenovém adresáři webového serveru."
+msgstr "Databázový konfigurační soubor \"config/local.ini.php\" nemohl být zapsán. Prosím, použijte přiložený text k vytvoření konfiguračního souboru v kořenovém adresáři Vašeho webového serveru."
 
 #: mod/install.php:272
 msgid "<h1>What next</h1>"
@@ -1984,7 +1984,7 @@ msgstr "Vyhledávání fór - %s"
 #: mod/dirfind.php:221 mod/match.php:105 mod/suggest.php:104
 #: mod/allfriends.php:92 src/Model/Profile.php:292 src/Content/Widget.php:37
 msgid "Connect"
-msgstr "Spojit"
+msgstr "Spojit se"
 
 #: mod/dirfind.php:265 mod/match.php:125
 msgid "No matches"
@@ -2002,7 +2002,7 @@ msgstr "Přepínání mezi různými identitami nebo komunitními/skupinovými s
 
 #: mod/manage.php:182
 msgid "Select an identity to manage: "
-msgstr "Vyberte identitu pro správu: "
+msgstr "Vyberte identitu ke spravování: "
 
 #: mod/videos.php:138
 msgid "Do you really want to delete this video?"
@@ -2033,7 +2033,7 @@ msgstr "Zobrazit album"
 
 #: mod/videos.php:390
 msgid "Recent Videos"
-msgstr "Aktuální videa"
+msgstr "Nedávná videa"
 
 #: mod/videos.php:392
 msgid "Upload New Videos"
@@ -2133,7 +2133,7 @@ msgstr "Připojené aplikace"
 
 #: mod/settings.php:115 mod/uexport.php:52
 msgid "Export personal data"
-msgstr "Export osobních údajů"
+msgstr "Exportovat osobní údaje"
 
 #: mod/settings.php:122
 msgid "Remove account"
@@ -2410,7 +2410,7 @@ msgstr "Přihlašovací jméno k e-mailu:"
 
 #: mod/settings.php:865
 msgid "Email password:"
-msgstr "Heslo k Vašemu e-mailu:"
+msgstr "Heslo k e-mailu:"
 
 #: mod/settings.php:866
 msgid "Reply-to address:"
@@ -2624,7 +2624,7 @@ msgstr "Propagační stránka"
 msgid ""
 "Account for a public profile that automatically approves contact requests as"
 " \"Followers\"."
-msgstr "Účet pro veřejný profil, který vyžaduje manuální potvrzení \"Přátel\" a \"Sledovatelů\"."
+msgstr "Účet pro veřejný profil, který automaticky potvrzuje žádosti o přidání kontaktu jako \"Sledovatele\"."
 
 #: mod/settings.php:1072 mod/admin.php:1836
 msgid "Public Forum"
@@ -2658,7 +2658,7 @@ msgstr "OpenID:"
 
 #: mod/settings.php:1092
 msgid "(Optional) Allow this OpenID to login to this account."
-msgstr "(Volitelné) Povolit OpenID pro přihlášení k tomuto účtu."
+msgstr "(Volitelné) Povolit tomuto OpenID přihlášení k tomuto účtu."
 
 #: mod/settings.php:1100
 msgid "Publish your default profile in your local site directory?"
@@ -2670,7 +2670,7 @@ msgid ""
 "Your profile will be published in this node's <a href=\"%s\">local "
 "directory</a>. Your profile details may be publicly visible depending on the"
 " system settings."
-msgstr "Váš profil bude publikován v <a href=\"%s\">lokálním adresáři</a> tohoto serveru. Vaše detaily o profilu mohou být veřejně viditelné v závislosti na systémových nastaveních."
+msgstr "Váš profil bude publikován v <a href=\"%s\">místním adresáři</a> tohoto serveru. Vaše detaily o profilu mohou být veřejně viditelné v závislosti na systémových nastaveních."
 
 #: mod/settings.php:1100 mod/settings.php:1106 mod/settings.php:1113
 #: mod/settings.php:1117 mod/settings.php:1121 mod/settings.php:1125
@@ -2881,7 +2881,7 @@ msgstr "Výchozí oprávnění pro příspěvek"
 
 #: mod/settings.php:1216
 msgid "(click to open/close)"
-msgstr "(Klikněte pro otevření/zavření)"
+msgstr "(klikněte pro otevření/zavření)"
 
 #: mod/settings.php:1224 mod/photos.php:1126 mod/photos.php:1456
 msgid "Show to Groups"
@@ -2937,7 +2937,7 @@ msgstr "obdržíte soukromou zprávu"
 
 #: mod/settings.php:1253
 msgid "You receive a friend suggestion"
-msgstr "obdržíte návrh na přátelství"
+msgstr "obdržíte návrh přátelství"
 
 #: mod/settings.php:1254
 msgid "You are tagged in a post"
@@ -3071,7 +3071,7 @@ msgid_plural ""
 "non public messages."
 msgstr[0] "Varování: Tato skupina obsahuje %s člena ze sítě, která nepovoluje posílání soukromých zpráv."
 msgstr[1] "Varování: Tato skupina obsahuje %s členy ze sítě, která nepovoluje posílání soukromých zpráv."
-msgstr[2] "Varování: Tato skupina obsahuje %s členů ze sítě, která nepovoluje posílání soukromých zpráv."
+msgstr[2] "Varování: Tato skupina obsahuje %s člena ze sítě, která nepovoluje posílání soukromých zpráv."
 msgstr[3] "Varování: Tato skupina obsahuje %s členů ze sítě, která nepovoluje posílání soukromých zpráv."
 
 #: mod/network.php:551
@@ -3166,7 +3166,7 @@ msgstr "Název skupiny byl změněn."
 
 #: mod/group.php:101
 msgid "Save Group"
-msgstr "Uložit Skupinu"
+msgstr "Uložit skupinu"
 
 #: mod/group.php:102
 msgid "Filter"
@@ -3174,7 +3174,7 @@ msgstr "Filtr"
 
 #: mod/group.php:107
 msgid "Create a group of contacts/friends."
-msgstr "Vytvořit skupinu kontaktů / přátel."
+msgstr "Vytvořit skupinu kontaktů/přátel."
 
 #: mod/group.php:108 mod/group.php:134 mod/group.php:229
 #: src/Model/Group.php:410
@@ -3356,7 +3356,7 @@ msgstr "Zrušení sledování není aktuálně na Vaši síti podporováno."
 
 #: mod/unfollow.php:103 mod/contacts.php:601
 msgid "Disconnect/Unfollow"
-msgstr "Odpojit/Zrušit sledování"
+msgstr "Odpojit se/Zrušit sledování"
 
 #: mod/unfollow.php:116 mod/dfrn_request.php:652 mod/follow.php:157
 msgid "Your Identity Address:"
@@ -3376,12 +3376,12 @@ msgstr "Stavové zprávy a příspěvky "
 #: mod/update_contacts.php:24 mod/update_profile.php:35
 #: mod/update_community.php:23 mod/update_display.php:24
 msgid "[Embedded content - reload page to view]"
-msgstr "[Vložený obsah - obnovte stránku pro zobrazení]"
+msgstr "[Vložený obsah - pro zobrazení obnovte stránku]"
 
 #: mod/register.php:99
 msgid ""
 "Registration successful. Please check your email for further instructions."
-msgstr "Registrace úspěšná. Zkontrolujte prosím svůj e-mail pro další instrukce."
+msgstr "Registrace byla úspěšná. Zkontrolujte prosím svůj e-mail pro další instrukce."
 
 #: mod/register.php:103
 #, php-format
@@ -3543,7 +3543,7 @@ msgstr "Typ oznámení:"
 
 #: mod/notifications.php:164
 msgid "Suggested by:"
-msgstr "Navrženo:"
+msgstr "Navrhl/a:"
 
 #: mod/notifications.php:176 mod/notifications.php:260 mod/contacts.php:666
 msgid "Hide this contact from others"
@@ -3699,7 +3699,7 @@ msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] "%d zpráva"
 msgstr[1] "%d zprávy"
-msgstr[2] "%d zpráv"
+msgstr[2] "%d zprávy"
 msgstr[3] "%d zpráv"
 
 #: mod/hcard.php:19
@@ -3923,7 +3923,7 @@ 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 "Na Vaší stránce <em>Nastavení</em> si změňte Vaše první heslo. Věnujte také svou pozornost k adrese identity. Vypadá jako emailová adresa a bude Vám užitečná pro navazování přátelství na svobodném sociálním webu."
+msgstr "Na Vaší stránce <em>Nastavení</em> si změňte Vaše první heslo. Věnujte také svou pozornost Vaší adrese identity. Vypadá jako e-mailová adresa a bude Vám užitečná pro navazování přátelství na svobodném sociálním webu."
 
 #: mod/newmember.php:22
 msgid ""
@@ -3968,11 +3968,11 @@ msgstr "Nastavte si nějaká veřejná klíčová slova pro výchozí profil, kt
 
 #: mod/newmember.php:30
 msgid "Connecting"
-msgstr "Probíhá pokus o připojení"
+msgstr "Připojuji se"
 
 #: mod/newmember.php:36
 msgid "Importing Emails"
-msgstr "Importování emaiů"
+msgstr "Importuji e-maily"
 
 #: mod/newmember.php:36
 msgid ""
@@ -4496,7 +4496,7 @@ msgid "%s contact unblocked"
 msgid_plural "%s contacts unblocked"
 msgstr[0] "%s kontakt odblokován"
 msgstr[1] "%s kontakty odblokovány"
-msgstr[2] "%s kontaktů odblokováno"
+msgstr[2] "%s kontaktu odblokováno"
 msgstr[3] "%s kontaktů odblokováno"
 
 #: mod/admin.php:489
@@ -4557,7 +4557,7 @@ msgid "%s total blocked contact"
 msgid_plural "%s total blocked contacts"
 msgstr[0] "Celkem %s zablokovaný kontakt"
 msgstr[1] "Celkem %s zablokované kontakty"
-msgstr[2] "Celkem %s zablokovaných kontaktů"
+msgstr[2] "Celkem %s zablokovaného kontaktu"
 msgstr[3] "Celkem %s zablokovaných kontaktů"
 
 #: mod/admin.php:510
@@ -4671,7 +4671,7 @@ msgid ""
 "converting the table engines. You may also use the command <tt>php "
 "bin/console.php dbstructure toinnodb</tt> of your Friendica installation for"
 " an automatic conversion.<br />"
-msgstr "Vaše databáze stále běží s tabulkami MyISAM. Měl/a byste změnit typ datového úložiště na InnoDB. Protože Friendica bude v budoucnu používat pouze funkce InnoDB, měl/a byste to změnit! <a href=\"%s\">Zde</a> naleznete návod, který by pro vás mohl být užitečný při konverzi úložišť. Můžete také použít příkaz <tt>php bin/console.php dbstructure toinnodb</tt> na Vaší instalaci Friendica pro automatickou konverzi.<br />"
+msgstr "Vaše databáze stále běží s tabulkami MyISAM. Měl/a byste změnit typ datového úložiště na InnoDB. Protože Friendica bude v budoucnu používat pouze funkce pro InnoDB, měl/a byste to změnit! <a href=\"%s\">Zde</a> naleznete návod, který by pro vás mohl být užitečný při konverzi úložišť. Můžete také použít příkaz <tt>php bin/console.php dbstructure toinnodb</tt> na Vaší instalaci Friendica pro automatickou konverzi.<br />"
 
 #: mod/admin.php:844
 #, php-format
@@ -4798,7 +4798,7 @@ msgstr "Zakázáno"
 
 #: mod/admin.php:1355
 msgid "Users, Global Contacts"
-msgstr "Uživatelé, Všechny kontakty"
+msgstr "Uživatelé, globální kontakty"
 
 #: mod/admin.php:1356
 msgid "Users, Global Contacts/fallback"
@@ -4834,7 +4834,7 @@ msgstr "Vyžaduje schválení"
 
 #: mod/admin.php:1396
 msgid "Open"
-msgstr "Otevřená"
+msgstr "Otevřeno"
 
 #: mod/admin.php:1400
 msgid "No SSL policy, links will track page SSL state"
@@ -4850,15 +4850,15 @@ msgstr "Certifikát podepsaný sám sebou, použít SSL pouze pro lokální odka
 
 #: mod/admin.php:1406
 msgid "Don't check"
-msgstr "Nezkontrolovat"
+msgstr "Nekontrolovat"
 
 #: mod/admin.php:1407
 msgid "check the stable version"
-msgstr "zkontrolovat stabilní verzi"
+msgstr "kontrolovat stabilní verzi"
 
 #: mod/admin.php:1408
 msgid "check the development version"
-msgstr "zkontrolovat verzi ve vývoji"
+msgstr "kontrolovat vývojovou verzi"
 
 #: mod/admin.php:1427
 msgid "Republish users to directory"
@@ -4883,7 +4883,7 @@ msgstr "Adresář automaticky objevených kontaktů"
 
 #: mod/admin.php:1433
 msgid "Performance"
-msgstr "Výkonnost"
+msgstr "Výkon"
 
 #: mod/admin.php:1434
 msgid "Worker"
@@ -4908,7 +4908,7 @@ msgstr "Jméno hostitele (host name)"
 
 #: mod/admin.php:1441
 msgid "Sender Email"
-msgstr "Email ddesílatele"
+msgstr "E-mail odesílatele"
 
 #: mod/admin.php:1441
 msgid ""
@@ -4921,7 +4921,7 @@ msgstr "Banner/logo"
 
 #: mod/admin.php:1443
 msgid "Shortcut icon"
-msgstr "Ikona zkratky"
+msgstr "Favikona"
 
 #: mod/admin.php:1443
 msgid "Link to an icon that will be used for browsers."
@@ -4952,7 +4952,7 @@ msgstr "Systémový jazyk"
 
 #: mod/admin.php:1447
 msgid "System theme"
-msgstr "Motiv systému "
+msgstr "Systémový motiv"
 
 #: mod/admin.php:1447
 msgid ""
@@ -5026,13 +5026,13 @@ msgstr "Maximální délka delší stránky nahrávaných obrázků v pixelech.
 
 #: mod/admin.php:1455
 msgid "JPEG image quality"
-msgstr "JPEG kvalita obrázku"
+msgstr "Kvalita obrázků JPEG"
 
 #: mod/admin.php:1455
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
-msgstr "Nahrávaný JPEG bude uložen se zadanou kvalitou v rozmezí [0-100]. Výchozí hodnota je 100, což znamená plnou kvalitu."
+msgstr "Nahrávané obrázky JPEG budou uloženy se zadanou kvalitou v rozmezí [0-100]. Výchozí hodnota je 100, což znamená plnou kvalitu."
 
 #: mod/admin.php:1457
 msgid "Register policy"
@@ -5047,17 +5047,17 @@ 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 "Pokud je registrace výše povolena, zde se nastaví maximální počet registrací nových uživatelů za den.\nPokud je registrace zakázána, toto nastavení nemá žádný efekt."
+msgstr "Pokud je registrace výše povolena, zde se nastaví maximální počet registrací nových uživatelů za den. Pokud je registrace zakázána, toto nastavení nemá žádný efekt."
 
 #: mod/admin.php:1459
 msgid "Register text"
-msgstr "Registrace textu"
+msgstr "Text při registraci"
 
 #: mod/admin.php:1459
 msgid ""
 "Will be displayed prominently on the registration page. You can use BBCode "
 "here."
-msgstr "Bude zobrazeno viditelně na stránce registrace. Zde můžete používat BBCode."
+msgstr "Bude zobrazen viditelně na stránce registrace. Zde můžete používat BBCode."
 
 #: mod/admin.php:1460
 msgid "Forbidden Nicknames"
@@ -5071,7 +5071,7 @@ msgstr "Seznam přezdívek, které nelze registrovat, oddělených čárkami. P
 
 #: mod/admin.php:1461
 msgid "Accounts abandoned after x days"
-msgstr "Účet je opuštěn po x dnech"
+msgstr "Účty jsou opuštěny po x dnech"
 
 #: mod/admin.php:1461
 msgid ""
@@ -5087,7 +5087,7 @@ msgstr "Povolené domény přátel"
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
-msgstr "Čárkou oddělený seznam domén, kterým je povoleno navazovat přátelství s tímto webem. Zástupné znaky (wildcards) jsou povoleny. Prázné znamená libovolnou doménu."
+msgstr "Seznam domén, kterým je povoleno navazovat přátelství s tímto webem, oddělených čárkami. Zástupné znaky (wildcards) jsou povoleny. Prázné znamená libovolné domény."
 
 #: mod/admin.php:1463
 msgid "Allowed email domains"
@@ -5098,7 +5098,7 @@ 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 "Čárkou oddělený seznam domén emalových adres, kterým je povoleno provádět registraci na tomto webu. Zástupné znaky (wildcards) jsou povoleny. Prázné znamená libovolnou doménu."
+msgstr "Seznam domén e-mailových adres, kterým je povoleno provádět registraci na tomto webu, oddělených čárkami. Zástupné znaky (wildcards) jsou povoleny. Prázné znamená libovolné domény."
 
 #: mod/admin.php:1464
 msgid "No OEmbed rich content"
@@ -5118,7 +5118,7 @@ msgstr "Povolené domény pro oEmbed"
 msgid ""
 "Comma separated list of domains which oembed content is allowed to be "
 "displayed. Wildcards are accepted."
-msgstr "Výpis domén, u nichž je povoleno zobrazit obsah oEmbed, oddělených čárkami. Zástupné znaky jsou povoleny."
+msgstr "Seznam domén, u nichž je povoleno zobrazit obsah oEmbed, oddělených čárkami. Zástupné znaky jsou povoleny."
 
 #: mod/admin.php:1466
 msgid "Block public"
@@ -5193,7 +5193,7 @@ msgid ""
 "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 "Nenahrazovat lokální soukromé fotky v příspěvcích vloženou kopií obrázku. To znamená, že kontakty, které obdrží příspěvek obsahující soukromé fotky, budou muset autentikovat a načíst každý obrázek, což může zabrat nějaký čas."
+msgstr "Nenahrazovat místní soukromé fotky v příspěvcích vloženou kopií obrázku. To znamená, že kontakty, které obdrží příspěvek obsahující soukromé fotky, budou muset autentikovat a načíst každý obrázek, což může zabrat nějaký čas."
 
 #: mod/admin.php:1473
 msgid "Explicit Content"
@@ -5452,7 +5452,7 @@ msgid ""
 "contains the name and version of the server, number of users with public "
 "profiles, number of posts and the activated protocols and connectors. See <a"
 " href='http://the-federation.info/'>the-federation.info</a> for details."
-msgstr "Pokud je toto povoleno, budou zveřejněna obecná data o serveru a jeho používání. Data obsahují jméno a verzi serveru, počet uživatelů s vřejnými profily, počet příspěvků a aktivované protokoly a konektory. Pro více informací navštivte <a href='http://the-federation.info/'>the-federation.info</a>."
+msgstr "Pokud je toto povoleno, budou zveřejněna obecná data o serveru a jeho používání. Data obsahují jméno a verzi serveru, počet uživatelů s veřejnými profily, počet příspěvků a aktivované protokoly a konektory. Pro více informací navštivte <a href='http://the-federation.info/'>the-federation.info</a>."
 
 #: mod/admin.php:1505
 msgid "Check upstream version"
@@ -5564,7 +5564,7 @@ msgstr "Obrázková proxy zvyšuje výkon a soukromí. Neměla by však být pou
 
 #: mod/admin.php:1516
 msgid "Only search in tags"
-msgstr "Hledat pouze ve štítkách"
+msgstr "Hledat pouze ve štítcích"
 
 #: mod/admin.php:1516
 msgid "On large systems the text search can slow down the system extremely."
@@ -5805,12 +5805,12 @@ msgid ""
 "\t\t\tIf you ever want to delete your account, you can do so at %1$s/removeme\n"
 "\n"
 "\t\t\tThank you and welcome to %4$s."
-msgstr "\n\t\t\tZde jsou vaše přihlašovací detaily:\n\n\t\t\tAdresa stránky:\t\t%1$s\n\t\t\tPřihlašovací jméno:\t%2$s\n\t\t\tHeslo:\t\t\t%3$s\n\n\t\t\tSvé heslo si po přihlášení můžete změnit na stránce \"Nastavení\" vašeho\n\t\t\túčtu.\n\n\t\t\tProsím, prohlédněte si na chvilku ostatní nastavení účtu na té stránce.\n\n\t\t\tMožná byste si také přáli přidat pár základních informací na svůj výchozí\n\t\t\tprofil (na stránce \"Profily\") aby vás další lidé mohli snadno najít.\n\t\t\tDoporučujeme nastavit si vaše celé jméno, přidat profilovou fotku,\n\t\t\tpřidat pár \"klíčových slov\" k profilu (velmi užitečné při získávání nových\n\t\t\tpřátel) - a možná v jaké zemi žijete; pokud nechcete být konkrétnější.\n\n\t\t\tZcela respektujeme vaše právo na soukromí a žádnou z těchto položek\n\t\t\tnení potřeba vyplňovat. Pokud jste zde nový/á a nikoho zde neznáte, mohou vám\n\t\t\tpomoci si získat nové a zajímavé přátele.\n\t\t\tPokud byste si někdy přál/a smazat účet, může tak učinit na stránce\n\t\t\t%1$s/removeme.\n\n\t\t\tDěkujeme vám a vítáme vás na %4$s."
+msgstr "\n\t\t\tZde jsou Vaše přihlašovací detaily:\n\n\t\t\tAdresa stránky:\t\t%1$s\n\t\t\tPřihlašovací jméno:\t%2$s\n\t\t\tHeslo:\t\t\t%3$s\n\n\t\t\tSvé heslo si po přihlášení můžete změnit na stránce \"Nastavení\" vašeho\n\t\t\túčtu.\n\n\t\t\tProsím, prohlédněte si na chvilku ostatní nastavení účtu na této stránce.\n\n\t\t\tMožná byste si také přál/a přidat pár základních informací na svůj výchozí\n\t\t\tprofil (na stránce \"Profily\") aby vás další lidé mohli snadno najít.\n\t\t\tDoporučujeme nastavit si Vaše celé jméno, přidat profilovou fotku,\n\t\t\tpřidat pár \"klíčových slov\" k profilu (velmi užitečné při získávání nových\n\t\t\tpřátel) - a možná v jaké zemi žijete; pokud nechcete být konkrétnější.\n\n\t\t\tZcela respektujeme Vaše právo na soukromí a žádnou z těchto položek\n\t\t\tnení potřeba vyplňovat. Pokud jste zde nový/á a nikoho zde neznáte, mohou vám\n\t\t\tpomoci si získat nové a zajímavé přátele.\n\t\t\tPokud byste si někdy přál/a smazat účet, můžete tak učinit na stránce\n\t\t\t%1$s/removeme.\n\n\t\t\tDěkujeme Vám a vítáme Vás na %4$s."
 
 #: mod/admin.php:1706 src/Model/User.php:707
 #, php-format
 msgid "Registration details for %s"
-msgstr "Registrační údaje pro %s"
+msgstr "Registrační údaje pro uživatele %s"
 
 #: mod/admin.php:1716
 #, php-format
@@ -5818,7 +5818,7 @@ msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] "%s uživatel blokován/odblokován"
 msgstr[1] "%s uživatelů blokováno/odblokováno"
-msgstr[2] "%s uživatelů blokováno/odblokováno"
+msgstr[2] "%s uživatele blokováno/odblokováno"
 msgstr[3] "%s uživatelů blokováno/odblokováno"
 
 #: mod/admin.php:1722
@@ -5827,7 +5827,7 @@ msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] "%s uživatel smazán"
 msgstr[1] "%s uživatelů smazáno"
-msgstr[2] "%s uživatelů smazáno"
+msgstr[2] "%s uživatele smazáno"
 msgstr[3] "%s uživatelů smazáno"
 
 #: mod/admin.php:1769
@@ -5932,7 +5932,7 @@ msgstr "Uživatel {0} bude smazán!\\n\\n Vše, co tento uživatel na těchto st
 
 #: mod/admin.php:1931
 msgid "Name of the new user."
-msgstr "Jméno nového uživatele"
+msgstr "Jméno nového uživatele."
 
 #: mod/admin.php:1932
 msgid "Nickname"
@@ -6118,7 +6118,7 @@ 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] "%d požadovaný parametr nebyl nalezen na daném umístění"
 msgstr[1] "%d požadované parametry nebyly nalezeny na daném umístění"
-msgstr[2] "%d požadovaných parametrů nebylo nalezeno na daném umístění"
+msgstr[2] "%d požadovaného parametru nebylo nalezeno na daném umístění"
 msgstr[3] "%d požadovaných parametrů nebylo nalezeno na daném umístění"
 
 #: mod/dfrn_request.php:161
@@ -6136,7 +6136,7 @@ msgstr "Profil není k dispozici."
 #: mod/dfrn_request.php:246
 #, php-format
 msgid "%s has received too many connection requests today."
-msgstr "%s dnes obdržel/a příliš mnoho požadavků o spojení"
+msgstr "%s dnes obdržel/a příliš mnoho požadavků o spojení."
 
 #: mod/dfrn_request.php:247
 msgid "Spam protection measures have been invoked."
@@ -6152,7 +6152,7 @@ msgstr "Neplatný odkaz"
 
 #: mod/dfrn_request.php:310
 msgid "You have already introduced yourself here."
-msgstr "Již jste se zde zavedli."
+msgstr "Již jste se zde představil/a."
 
 #: mod/dfrn_request.php:313
 #, php-format
@@ -6183,13 +6183,13 @@ msgstr "Vzdálený odběr nemůže být na Vaší síti proveden. Prosím, přih
 
 #: mod/dfrn_request.php:486
 msgid "Please login to confirm introduction."
-msgstr "Prosím přihlašte se k potvrzení žádosti o propojení."
+msgstr "Pro ptvrzení představení se prosím přihlaste."
 
 #: mod/dfrn_request.php:494
 msgid ""
 "Incorrect identity currently logged in. Please login to "
 "<strong>this</strong> profile."
-msgstr "Jste přihlášeni pod nesprávnou identitou. Prosím, přihlaste se do <strong>tohoto</strong> profilu."
+msgstr "Jste přihlášen/a pod nesprávnou identitou. Prosím, přihlaste se do <strong>tohoto</strong> profilu."
 
 #: mod/dfrn_request.php:508 mod/dfrn_request.php:525
 msgid "Confirm"
@@ -6207,7 +6207,7 @@ msgstr "Vítejte doma, %s."
 #: mod/dfrn_request.php:524
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
-msgstr "Prosím potvrďte Vaši žádost o propojení %s."
+msgstr "Prosím potvrďte Váš požadavek o spojení uživateli %s."
 
 #: mod/dfrn_request.php:634
 msgid ""
@@ -6320,11 +6320,11 @@ msgstr "nebo"
 
 #: mod/profile_photo.php:251
 msgid "skip this step"
-msgstr "přeskočit tento krok "
+msgstr "tento krok přeskočte"
 
 #: mod/profile_photo.php:251
 msgid "select a photo from your photo albums"
-msgstr "Vybrat fotografii z Vašich fotoalb"
+msgstr "si vyberte fotku z Vašich fotoalb"
 
 #: mod/profile_photo.php:264
 msgid "Crop Image"
@@ -6377,13 +6377,13 @@ msgstr "Tuto zprávu Vám poslal/a %s, člen sociální sítě Friendica."
 #: mod/item.php:811
 #, php-format
 msgid "You may visit them online at %s"
-msgstr "Můžete je navštívit online na adrese %s"
+msgstr "Můžete jej/ji navštívit online na adrese %s"
 
 #: mod/item.php:812
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
-msgstr "Pokud nechcete dostávat tyto zprávy, kontaktujte prosím odesilatele odpovědí na tento záznam."
+msgstr "Pokud nechcete dostávat tyto zprávy, kontaktujte prosím odesílatele odpovědí na tuto zprávu."
 
 #: mod/item.php:816
 #, php-format
@@ -6407,7 +6407,7 @@ 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 "Musíte exportovat svůj účet na sterém serveru a nahrát ho zde. My následně vytvoříme Váš původní účet zde včetně všech kontaktů. Zároveň se pokusíme informovat všechny Vaše přátele, že jste se sem přestěhovali."
+msgstr "Musíte exportovat svůj účet na starém serveru a nahrát ho zde. My následně vytvoříme Váš původní účet zde včetně všech kontaktů. Zároveň se pokusíme informovat všechny Vaše přátele, že jste se sem přestěhoval/a."
 
 #: mod/uimport.php:75
 msgid ""
@@ -6423,7 +6423,7 @@ msgstr "Soubor s účtem"
 msgid ""
 "To export your account, go to \"Settings->Export your personal data\" and "
 "select \"Export account\""
-msgstr "K exportu Vašeho účtu, jděte do \"Nastavení->Export vašich osobních dat\" a zvolte \" Export účtu\""
+msgstr "K exportu Vašeho účtu jděte do \"Nastavení->Export vašich osobních dat\" a zvolte \"Exportovat účet\""
 
 #: mod/profperm.php:35 mod/profperm.php:68
 msgid "Invalid profile identifier."
@@ -6435,11 +6435,11 @@ msgstr "Editor viditelnosti profilu "
 
 #: mod/profperm.php:127
 msgid "Visible To"
-msgstr "Viditelný pro"
+msgstr "Viditelný uživatelům"
 
 #: mod/profperm.php:143
 msgid "All Contacts (with secure profile access)"
-msgstr "Všechny kontakty (se zabezpečeným přístupovým profilem )"
+msgstr "Všem kontaktům (se zabezpečeným přístupem k profilu)"
 
 #: mod/cal.php:277 mod/events.php:391
 msgid "View"
@@ -6511,7 +6511,7 @@ msgstr "Upravit příspěvek"
 
 #: mod/editpost.php:125 src/Core/ACL.php:304
 msgid "CC: email addresses"
-msgstr "skrytá kopie: e-mailové adresy"
+msgstr "Skrytá kopie: e-mailové adresy"
 
 #: mod/editpost.php:132 src/Core/ACL.php:305
 msgid "Example: bob@example.com, mary@example.com"
@@ -6539,12 +6539,12 @@ msgstr "Návrhy přátelství odeslány "
 
 #: mod/fsuggest.php:101
 msgid "Suggest Friends"
-msgstr "Navrhněte přátelé"
+msgstr "Navrhnout přátele"
 
 #: mod/fsuggest.php:103
 #, php-format
 msgid "Suggest a friend for %s"
-msgstr "Navrhněte přátelé pro uživatele %s"
+msgstr "Navrhnout přítele pro uživatele %s"
 
 #: mod/maintenance.php:24
 msgid "System down for maintenance"
@@ -6579,7 +6579,7 @@ msgid "%d contact edited."
 msgid_plural "%d contacts edited."
 msgstr[0] "%d kontakt upraven"
 msgstr[1] "%d kontakty upraveny"
-msgstr[2] "%d kontaktů upraveno"
+msgstr[2] "%d kontaktu upraveno"
 msgstr[3] "%d kontaktů upraveno"
 
 #: mod/contacts.php:189 mod/contacts.php:395
@@ -6663,7 +6663,7 @@ msgstr "(Aktualizace nebyla úspěšná)"
 
 #: mod/contacts.php:559 mod/contacts.php:1086
 msgid "Suggest friends"
-msgstr "Navrhněte přátelé"
+msgstr "Navrhnout přátele"
 
 #: mod/contacts.php:563
 #, php-format
@@ -6683,7 +6683,7 @@ 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 "Načíst informace jako obrázky náhledu, nadpis a popisek z položky kanálu. Toto můžete aktivovat pokud kanál neobsahuje moc textu. Klíčová slova jsou vzata z hlavičky meta v položce kanálu a jsou zveřejněna jako hashtagy."
+msgstr "Načíst informace jako obrázky náhledu, nadpis a popisek z položky kanálu. Toto můžete aktivovat, pokud kanál neobsahuje moc textu. Klíčová slova jsou vzata z hlavičky meta v položce kanálu a jsou zveřejněna jako hashtagy."
 
 #: mod/contacts.php:578
 msgid "Fetch information"
@@ -6779,7 +6779,7 @@ msgstr "Čekám na potrvzení spojení"
 #: mod/contacts.php:666
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
-msgstr "Odpovědi/oblíbení na Vaše veřejné příspěvky <strong>mohou být</strong> stále viditelné"
+msgstr "Odpovědi/oblíbení na Vaše veřejné příspěvky <strong>mohou</strong> být stále viditelné"
 
 #: mod/contacts.php:667
 msgid "Notification for new posts"
@@ -6797,7 +6797,7 @@ msgstr "Zakázaná klíčová slova"
 msgid ""
 "Comma separated list of keywords that should not be converted to hashtags, "
 "when \"Fetch information and keywords\" is selected"
-msgstr "Čárkou oddělený seznam klíčových slov, které by neměly být převáděna na hashtagy, když je zvoleno \"Načíst informace a klíčová slova\""
+msgstr "Seznam klíčových slov, které by neměly být převáděna na hashtagy, když je zvoleno \"Načíst informace a klíčová slova\". Oddělujte čárkami"
 
 #: mod/contacts.php:682 src/Model/Profile.php:424
 msgid "XMPP:"
@@ -6809,7 +6809,7 @@ msgstr "Akce"
 
 #: mod/contacts.php:731
 msgid "Suggestions"
-msgstr "Doporučení"
+msgstr "Návrhy"
 
 #: mod/contacts.php:734
 msgid "Suggest potential friends"
@@ -7104,13 +7104,13 @@ msgstr "l d. F, Y v g:i A"
 
 #: mod/localtime.php:33
 msgid "Time Conversion"
-msgstr "Časová konverze"
+msgstr "Časový převod"
 
 #: mod/localtime.php:35
 msgid ""
 "Friendica provides this service for sharing events with other networks and "
 "friends in unknown timezones."
-msgstr "Friendica poskytuje tuto službu pro sdílení událostí s ostatními sítěmi a přáteli v neznámých časových zónách"
+msgstr "Friendica poskytuje tuto službu ke sdílení událostí s ostatními sítěmi a přáteli v neznámých časových pásmech"
 
 #: mod/localtime.php:39
 #, php-format
@@ -7125,7 +7125,7 @@ msgstr "Aktuální časové pásmo: %s"
 #: mod/localtime.php:46
 #, php-format
 msgid "Converted localtime: %s"
-msgstr "Převedený lokální čas : %s"
+msgstr "Převedený místní čas : %s"
 
 #: mod/localtime.php:52
 msgid "Please select your timezone:"
@@ -7179,7 +7179,7 @@ msgid "%d message sent."
 msgid_plural "%d messages sent."
 msgstr[0] "%d zpráva odeslána."
 msgstr[1] "%d zprávy odeslány."
-msgstr[2] "%d zpráv odesláno."
+msgstr[2] "%d zprávy odesláno."
 msgstr[3] "%d zpráv odesláno."
 
 #: mod/invite.php:123
@@ -7221,7 +7221,7 @@ 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 "Stránky Friendica jsou navzájem propojené a vytváří tak obrovský sociální web s dúrazem na soukromí, kterou vlastní a kontrojují její členové, Mohou se také připojit k mnoha tradičním socilním sítím."
+msgstr "Stránky Friendica jsou navzájem propojené a vytváří tak obrovský sociální web s dúrazem na soukromí, kterou vlastní a kontrolují její členové. Mohou se také připojit k mnoha tradičním sociálním sítím."
 
 #: mod/invite.php:141
 #, php-format
@@ -7415,7 +7415,7 @@ msgstr "<span class=\"heart\">&hearts;</span> Rodinný stav:"
 
 #: mod/profiles.php:601 src/Model/Profile.php:769
 msgid "Sexual Preference:"
-msgstr "Sexuální preference:"
+msgstr "Sexuální orientace:"
 
 #: mod/profiles.php:602
 msgid "Example: fishing photography software"
@@ -7445,7 +7445,7 @@ msgstr "Ulice:"
 
 #: mod/profiles.php:615
 msgid "Locality/City:"
-msgstr "Lokalita/Město:"
+msgstr "Poloha/město:"
 
 #: mod/profiles.php:616
 msgid "Region/State:"
@@ -7481,13 +7481,13 @@ msgstr "Řekněte nám něco o sobě ..."
 
 #: mod/profiles.php:626
 msgid "XMPP (Jabber) address:"
-msgstr "Adresa pro XMPP (Jabber)"
+msgstr "Adresa XMPP (Jabber):"
 
 #: mod/profiles.php:626
 msgid ""
 "The XMPP address will be propagated to your contacts so that they can follow"
 " you."
-msgstr "Adresa XMPP bude rozšířena mezi Vašimi kontakty, aby vás mohly sledovat."
+msgstr "Adresa XMPP bude rozšířena mezi Vašemi kontakty, aby vás mohly sledovat."
 
 #: mod/profiles.php:627
 msgid "Homepage URL:"
@@ -7495,7 +7495,7 @@ msgstr "Odkaz na domovskou stránku:"
 
 #: mod/profiles.php:628 src/Model/Profile.php:777
 msgid "Hometown:"
-msgstr "Rodné město"
+msgstr "Rodné město:"
 
 #: mod/profiles.php:629 src/Model/Profile.php:785
 msgid "Political Views:"
@@ -7666,7 +7666,7 @@ msgstr "nebo si vyberte existující album:"
 
 #: mod/photos.php:1110
 msgid "Do not show a status post for this upload"
-msgstr "Nezobrazovat stav pro toto nahrání"
+msgstr "Nezobrazovat pro toto nahrání stavový příspěvek"
 
 #: mod/photos.php:1187
 msgid "Edit Album"
@@ -7743,11 +7743,11 @@ msgstr "Neotáčet"
 
 #: mod/photos.php:1443
 msgid "Rotate CW (right)"
-msgstr "Rotovat po směru hodinových ručiček (doprava)"
+msgstr "Otáčet po směru hodinových ručiček (doprava)"
 
 #: mod/photos.php:1444
 msgid "Rotate CCW (left)"
-msgstr "Rotovat proti směru hodinových ručiček (doleva)"
+msgstr "Otáčet proti směru hodinových ručiček (doleva)"
 
 #: mod/photos.php:1478 src/Object/Post.php:293
 msgid "I like this (toggle)"
@@ -7875,7 +7875,7 @@ msgstr "PHP cli binary"
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
-msgstr "Verze PHP pro příkazový řádek na Vašem systému nemá povolen \"register_argc_argv\"."
+msgstr "Verze PHP pro příkazový řádek na Vašem systému nemá povoleno nastavení \"register_argc_argv\"."
 
 #: src/Core/Install.php:171
 msgid "This is required for message delivery to work."
@@ -7895,23 +7895,23 @@ msgstr "Chyba: funkce \"openssl_pkey_new\" na tomto systému není schopna gener
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Pokud systém běží na Windows, seznamte se s \"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Pokud systém běží na Windows, prosím přečtěte si \"http://www.php.net/manual/en/openssl.installation.php\"."
 
 #: src/Core/Install.php:204
 msgid "Generate encryption keys"
-msgstr "Generovat kriptovací klíče"
+msgstr "Generovat šifrovací klíče"
 
 #: src/Core/Install.php:225
 msgid "libCurl PHP module"
-msgstr "libCurl PHP modul"
+msgstr "PHP modul libCurl"
 
 #: src/Core/Install.php:226
 msgid "GD graphics PHP module"
-msgstr "GD graphics PHP modul"
+msgstr "PHP modul GD graphics"
 
 #: src/Core/Install.php:227
 msgid "OpenSSL PHP module"
-msgstr "OpenSSL PHP modul"
+msgstr "PHP modul OpenSSL"
 
 #: src/Core/Install.php:228
 msgid "PDO or MySQLi PHP module"
@@ -7919,7 +7919,7 @@ msgstr "PHP modul PDO nebo MySQLi"
 
 #: src/Core/Install.php:229
 msgid "mb_string PHP module"
-msgstr "mb_string PHP modul"
+msgstr "PHP modul mb_string"
 
 #: src/Core/Install.php:230
 msgid "XML PHP module"
@@ -7935,29 +7935,29 @@ msgstr "PHP modul POSIX"
 
 #: src/Core/Install.php:236 src/Core/Install.php:238
 msgid "Apache mod_rewrite module"
-msgstr "Apache mod_rewrite modul"
+msgstr "Modul Apache mod_rewrite"
 
 #: src/Core/Install.php:236
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Chyba: Požadovaný Apache webserver mod-rewrite modul není nainstalován."
+msgstr "Chyba: Modul mod_rewrite webového serveru Apache je vyadován, ale není nainstalován."
 
 #: src/Core/Install.php:244
 msgid "Error: libCURL PHP module required but not installed."
-msgstr "Chyba: požadovaný libcurl PHP modul není nainstalován."
+msgstr "Chyba: PHP modul libcurl je vyžadován, ale není nainstalován."
 
 #: src/Core/Install.php:248
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Chyba: požadovaný GD graphics PHP modul není nainstalován."
+msgstr "Chyba: PHP modul GD graphics je vyžadován, ale není nainstalován."
 
 #: src/Core/Install.php:252
 msgid "Error: openssl PHP module required but not installed."
-msgstr "Chyba: požadovaný openssl PHP modul není nainstalován."
+msgstr "Chyba: PHP modul openssl je vyžadován, ale není nainstalován."
 
 #: src/Core/Install.php:256
 msgid "Error: PDO or MySQLi PHP module required but not installed."
-msgstr "Chyba: PHP modul PDO nebo MySQLi je vyžadován ale není nainstalován."
+msgstr "Chyba: PHP modul PDO nebo MySQLi je vyžadován, ale není nainstalován."
 
 #: src/Core/Install.php:260
 msgid "Error: The MySQL driver for PDO is not installed."
@@ -7969,15 +7969,15 @@ msgstr "Chyba: PHP modul mb_string  je vyžadován, ale není nainstalován."
 
 #: src/Core/Install.php:268
 msgid "Error: iconv PHP module required but not installed."
-msgstr "Chyba: PHP modul iconv je vyžadován ale není nainstalován"
+msgstr "Chyba: PHP modul iconv je vyžadován, ale není nainstalován"
 
 #: src/Core/Install.php:272
 msgid "Error: POSIX PHP module required but not installed."
-msgstr "Chyba: PHP modul POSIX je vyžadován ale není nainstalován."
+msgstr "Chyba: PHP modul POSIX je vyžadován, ale není nainstalován."
 
 #: src/Core/Install.php:282
 msgid "Error, XML PHP module required but not installed."
-msgstr "Chyba: PHP modul XML je vyžadován ale není nainstalován"
+msgstr "Chyba: PHP modul XML je vyžadován, ale není nainstalován"
 
 #: src/Core/Install.php:301
 msgid ""
@@ -7995,7 +7995,7 @@ msgstr "Toto je nejčastěji nastavením oprávnění, kdy webový server nemus
 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 "Na konci této procedury od nás obdržíte text k uložení v souboru pojmenovaném local.ini.php ve Vašem kořenovém adresáři Friendica. "
+msgstr "Na konci této procedury od nás obdržíte text k uložení v souboru pojmenovaném local.ini.php v adresáři \"config\" na Vaší instalaci Friendica."
 
 #: src/Core/Install.php:304
 msgid ""
@@ -8005,41 +8005,41 @@ msgstr "Alternativně můžete tento krok přeskočit a provést manuální inst
 
 #: src/Core/Install.php:307
 msgid "config/local.ini.php is writable"
-msgstr "Do souboru config/local.ini.php lze zapisovat"
+msgstr "Soubor config/local.ini.php je zapisovatelný"
 
 #: src/Core/Install.php:325
 msgid ""
 "Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
 "compiles templates to PHP to speed up rendering."
-msgstr "Friendica používá šablonovací nástroj Smarty3 pro zobrazení svých weobvých stránek. Smarty3 kompiluje šablony do PHP pro zrychlení vykreslování."
+msgstr "Friendica používá k zobrazení svých webových stránek šablonovací nástroj Smarty3. Smarty3 kompiluje šablony do PHP pro zrychlení vykreslování."
 
 #: src/Core/Install.php:326
 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 "Pro uložení kompilovaných šablon, webový server potřebuje mít přístup k zápisu do adresáře view/smarty3/ pod hlavním adresářem instalace Friendica"
+msgstr "Pro uložení kompilovaných šablon potřebuje webový server mít přístup k zápisu do adresáře view/smarty3/ pod kořenovým adresářem Friendica."
 
 #: src/Core/Install.php:327
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
-msgstr "prosím ujistěte se, že uživatel web serveru (jako například www-data) má právo zápisu do tohoto adresáře"
+msgstr "Prosím ujistěte se, že má uživatel webového serveru (jako například www-data) právo zápisu do tohoto adresáře"
 
 #: src/Core/Install.php:328
 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 "Poznámka: jako bezpečnostní opatření, přidělte právo zápisu pouze k adresáři /view/smarty3/ a nikoliv už k souborům s šablonami (.tpl), které obsahuje."
+msgstr "Poznámka: jako bezpečnostní opatření byste měl/a přidělit webovém serveru právo zápisu pouze do adresáře /view/smarty3/ -- a nikoliv už do souborů s šablonami (.tpl), které obsahuje."
 
 #: src/Core/Install.php:331
 msgid "view/smarty3 is writable"
-msgstr "view/smarty3 je nastaven pro zápis"
+msgstr "Adresář view/smarty3 je zapisovatelný"
 
 #: src/Core/Install.php:356
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
-msgstr "Url rewrite v .htconfig nefunguje. Prověřte prosím Vaše nastavení serveru."
+msgstr "Funkce URL rewrite v souboru .htaccess nefunguje. Prověřte prosím Vaše nastavení serveru."
 
 #: src/Core/Install.php:358
 msgid "Error message from Curl when fetching"
@@ -8199,7 +8199,7 @@ msgid "%d contact not imported"
 msgid_plural "%d contacts not imported"
 msgstr[0] "%d kontakt nenaimportován"
 msgstr[1] "%d kontakty nenaimportovány"
-msgstr[2] "%d kontaktů nenaimportováno"
+msgstr[2] "%d kontaktu nenaimportováno"
 msgstr[3] "%d kontaktů nenaimportováno"
 
 #: src/Core/UserImport.php:274
@@ -8308,7 +8308,7 @@ msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d komentář"
 msgstr[1] "%d komentáře"
-msgstr[2] "%d komentářů"
+msgstr[2] "%d komentáře"
 msgstr[3] "%d komentářů"
 
 #: src/Object/Post.php:796
@@ -8379,7 +8379,7 @@ msgstr "Heslo: "
 
 #: src/Module/Login.php:314
 msgid "Remember me"
-msgstr "Pamatuj si mne"
+msgstr "Pamatovat si mě"
 
 #: src/Module/Login.php:317
 msgid "Or login using OpenID: "
@@ -8399,11 +8399,11 @@ msgstr "podmínky používání"
 
 #: src/Module/Login.php:329
 msgid "Website Privacy Policy"
-msgstr "Pravidla ochrany soukromí serveru"
+msgstr "Zásady soukromí serveru"
 
 #: src/Module/Login.php:330
 msgid "privacy policy"
-msgstr "ochrana soukromí"
+msgstr "zásady soukromí"
 
 #: src/Module/Tos.php:34 src/Module/Tos.php:74
 msgid ""
@@ -8494,43 +8494,43 @@ msgstr "méně než před sekundou"
 
 #: src/Util/Temporal.php:303
 msgid "year"
-msgstr "rokem"
+msgstr "rok"
 
 #: src/Util/Temporal.php:303
 msgid "years"
-msgstr "lety"
+msgstr "let"
 
 #: src/Util/Temporal.php:304
 msgid "months"
-msgstr "měsíci"
+msgstr "měsíců"
 
 #: src/Util/Temporal.php:305
 msgid "weeks"
-msgstr "týdny"
+msgstr "týdnů"
 
 #: src/Util/Temporal.php:306
 msgid "days"
-msgstr "dny"
+msgstr "dní"
 
 #: src/Util/Temporal.php:307
 msgid "hour"
-msgstr "hodinou"
+msgstr "hodina"
 
 #: src/Util/Temporal.php:307
 msgid "hours"
-msgstr "hodinami"
+msgstr "hodin"
 
 #: src/Util/Temporal.php:308
 msgid "minute"
-msgstr "minutou"
+msgstr "minuta"
 
 #: src/Util/Temporal.php:308
 msgid "minutes"
-msgstr "minutami"
+msgstr "minut"
 
 #: src/Util/Temporal.php:309
 msgid "second"
-msgstr "sekundou"
+msgstr "sekunda"
 
 #: src/Util/Temporal.php:309
 msgid "seconds"
@@ -8670,7 +8670,7 @@ msgstr "g:i A"
 
 #: src/Model/Event.php:916 src/Model/Event.php:918
 msgid "Show map"
-msgstr "Ukázat mapu"
+msgstr "Zobrazit mapu"
 
 #: src/Model/Event.php:917
 msgid "Hide map"
@@ -8686,7 +8686,7 @@ msgstr "Není dost informací pro autentikaci"
 
 #: src/Model/User.php:384
 msgid "An invitation is required."
-msgstr "Pozvánka je vyžadována."
+msgstr "Je vyžadována pozvánka."
 
 #: src/Model/User.php:388
 msgid "Invitation could not be verified."
@@ -8814,7 +8814,7 @@ msgid ""
 "\t\t\tIf you ever want to delete your account, you can do so at %3$s/removeme\n"
 "\n"
 "\t\t\tThank you and welcome to %2$s."
-msgstr "\n\t\t\tZde jsou vaše přihlašovací detaily:\n\n\t\t\tAdresa stránky:\t\t%3$s\n\t\t\tPřihlašovací jméno:\t%1$s\n\t\t\tHeslo:\t\t\t%5$s\n\n\t\t\tSvé heslo si po přihlášení můžete změnit na stránce \"Nastavení\" vašeho\n\t\t\túčtu.\n\n\t\t\tProsím, prohlédněte si na chvilku ostatní nastavení účtu na té stránce.\n\n\t\t\tMožná byste si také přáli přidat pár základních informací na svůj výchozí\n\t\t\tprofil (na stránce \"Profily\") aby vás další lidé mohli snadno najít.\n\n\t\t\tDoporučujeme nastavit si vaše celé jméno, přidat profilovou fotku,\n\t\t\tpřidat pár \"klíčových slov\" k profilu (velmi užitečné při získávání nových\n\t\t\tpřátel) - a možná v jaké zemi žijete; pokud nechcete být konkrétnější.\n\n\t\t\tZcela respektujeme vaše právo na soukromí a žádnou z těchto položek\n\t\t\tnení potřeba vyplňovat. Pokud jste zde nový/á a nikoho zde neznáte, mohou vám\n\t\t\tpomoci si získat nové a zajímavé přátele.\n\n\t\t\tPokud byste si někdy přál/a smazat účet, může tak učinit na stránce\n\t\t\t%3$s/removeme.\n\n\t\t\tDěkujeme vám a vítáme vás na %2$s."
+msgstr "\n\t\t\tZde jsou Vaše přihlašovací detaily:\n\n\t\t\tAdresa stránky:\t\t%3$s\n\t\t\tPřihlašovací jméno:\t%1$s\n\t\t\tHeslo:\t\t\t%5$s\n\n\t\t\tSvé heslo si po přihlášení můžete změnit na stránce \"Nastavení\" vašeho\n\t\t\túčtu.\n\n\t\t\tProsím, prohlédněte si na chvilku ostatní nastavení účtu na této stránce.\n\n\t\t\tMožná byste si také přál/a přidat pár základních informací na svůj výchozí\n\t\t\tprofil (na stránce \"Profily\") aby vás další lidé mohli snadno najít.\n\t\t\tDoporučujeme nastavit si Vaše celé jméno, přidat profilovou fotku,\n\t\t\tpřidat pár \"klíčových slov\" k profilu (velmi užitečné při získávání nových\n\t\t\tpřátel) - a možná v jaké zemi žijete; pokud nechcete být konkrétnější.\n\n\t\t\tZcela respektujeme Vaše právo na soukromí a žádnou z těchto položek\n\t\t\tnení potřeba vyplňovat. Pokud jste zde nový/á a nikoho zde neznáte, mohou vám\n\t\t\tpomoci si získat nové a zajímavé přátele.\n\t\t\tPokud byste si někdy přál/a smazat účet, můžete tak učinit na stránce\n\t\t\t%3$s/removeme.\n\n\t\t\tDěkujeme Vám a vítáme Vás na %2$s."
 
 #: src/Model/Group.php:43
 msgid ""
@@ -8915,7 +8915,7 @@ msgstr "Věk:"
 #: src/Model/Profile.php:765
 #, php-format
 msgid "for %1$d %2$s"
-msgstr "pro %1$d %2$s"
+msgstr "%1$d %2$s"
 
 #: src/Model/Profile.php:789
 msgid "Religion:"
@@ -8992,7 +8992,7 @@ msgid "%d invitation available"
 msgid_plural "%d invitations available"
 msgstr[0] "%d pozvánka k dispozici"
 msgstr[1] "%d pozvánky k dispozici"
-msgstr[2] "%d pozvánek k dispozici"
+msgstr[2] "%d pozvánky k dispozici"
 msgstr[3] "%d pozvánek k dispozici"
 
 #: src/Content/Widget.php:157
@@ -9019,10 +9019,10 @@ msgstr "Kategorie"
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
-msgstr[0] "%d sdílený kontakt"
-msgstr[1] "%d sdílených kontaktů"
-msgstr[2] "%d sdílených kontaktů"
-msgstr[3] "%d sdílených kontaktů"
+msgstr[0] "%d společný kontakt"
+msgstr[1] "%d společné kontakty"
+msgstr[2] "%d společného kontaktu"
+msgstr[3] "%d společných kontaktů"
 
 #: src/Content/ContactSelector.php:54
 msgid "Frequently"
@@ -9090,7 +9090,7 @@ msgstr "Diaspora Connector"
 
 #: src/Content/ContactSelector.php:91
 msgid "GNU Social Connector"
-msgstr "GNU Social Connector"
+msgstr "GNU social Connector"
 
 #: src/Content/ContactSelector.php:92
 msgid "pnut"
@@ -9106,11 +9106,11 @@ msgstr "Žena"
 
 #: src/Content/ContactSelector.php:122
 msgid "Currently Male"
-msgstr "V současné době muž"
+msgstr "V současnosti muž"
 
 #: src/Content/ContactSelector.php:122
 msgid "Currently Female"
-msgstr "V současné době žena"
+msgstr "V současnosti žena"
 
 #: src/Content/ContactSelector.php:122
 msgid "Mostly Male"
@@ -9202,43 +9202,43 @@ msgstr "Nesexuální"
 
 #: src/Content/ContactSelector.php:166
 msgid "Single"
-msgstr "Svobodný"
+msgstr "Svobodný/á"
 
 #: src/Content/ContactSelector.php:166
 msgid "Lonely"
-msgstr "Osamnělý"
+msgstr "Osamělý/á"
 
 #: src/Content/ContactSelector.php:166
 msgid "Available"
-msgstr "Dostupný"
+msgstr "Dostupný/á"
 
 #: src/Content/ContactSelector.php:166
 msgid "Unavailable"
-msgstr "Nedostupný"
+msgstr "Nedostupný/á"
 
 #: src/Content/ContactSelector.php:166
 msgid "Has crush"
-msgstr "Zamilovaný"
+msgstr "Zamilovaný/á"
 
 #: src/Content/ContactSelector.php:166
 msgid "Infatuated"
-msgstr "Zabouchnutý"
+msgstr "Zabouchnutý/á"
 
 #: src/Content/ContactSelector.php:166
 msgid "Dating"
-msgstr "Seznamující se"
+msgstr "Chodím s někým"
 
 #: src/Content/ContactSelector.php:166
 msgid "Unfaithful"
-msgstr "Nevěrný"
+msgstr "Nevěrný/á"
 
 #: src/Content/ContactSelector.php:166
 msgid "Sex Addict"
-msgstr "Závislý na sexu"
+msgstr "Posedlý/á sexem"
 
 #: src/Content/ContactSelector.php:166
 msgid "Friends/Benefits"
-msgstr "Přátelé / výhody"
+msgstr "Přátelé/výhody"
 
 #: src/Content/ContactSelector.php:166
 msgid "Casual"
@@ -9246,7 +9246,7 @@ msgstr "Ležérní"
 
 #: src/Content/ContactSelector.php:166
 msgid "Engaged"
-msgstr "Zadaný"
+msgstr "Zadaný/á"
 
 #: src/Content/ContactSelector.php:166
 msgid "Married"
@@ -9262,7 +9262,7 @@ msgstr "Partneři"
 
 #: src/Content/ContactSelector.php:166
 msgid "Cohabiting"
-msgstr "Žijící ve společné domácnosti"
+msgstr "Žiji ve společné domácnosti"
 
 #: src/Content/ContactSelector.php:166
 msgid "Common law"
@@ -9270,7 +9270,7 @@ msgstr "Zvykové právo"
 
 #: src/Content/ContactSelector.php:166
 msgid "Happy"
-msgstr "Šťastný"
+msgstr "Šťastný/á"
 
 #: src/Content/ContactSelector.php:166
 msgid "Not looking"
@@ -9282,31 +9282,31 @@ msgstr "Swinger"
 
 #: src/Content/ContactSelector.php:166
 msgid "Betrayed"
-msgstr "Zrazen"
+msgstr "Zrazen/a"
 
 #: src/Content/ContactSelector.php:166
 msgid "Separated"
-msgstr "Odloučený"
+msgstr "Odloučený/á"
 
 #: src/Content/ContactSelector.php:166
 msgid "Unstable"
-msgstr "Nestálý"
+msgstr "Nestálý/á"
 
 #: src/Content/ContactSelector.php:166
 msgid "Divorced"
-msgstr "Rozvedený(á)"
+msgstr "Rozvedený/á"
 
 #: src/Content/ContactSelector.php:166
 msgid "Imaginarily divorced"
-msgstr "Pomyslně rozvedený"
+msgstr "Pomyslně rozvedený/á"
 
 #: src/Content/ContactSelector.php:166
 msgid "Widowed"
-msgstr "Ovdovělý(á)"
+msgstr "Ovdovělý/á"
 
 #: src/Content/ContactSelector.php:166
 msgid "Uncertain"
-msgstr "Nejistý"
+msgstr "Nejistý/á"
 
 #: src/Content/ContactSelector.php:166
 msgid "It's complicated"
@@ -9314,7 +9314,7 @@ msgstr "Je to složité"
 
 #: src/Content/ContactSelector.php:166
 msgid "Don't care"
-msgstr "Nezajímá"
+msgstr "Nezájem"
 
 #: src/Content/ContactSelector.php:166
 msgid "Ask me"
@@ -9364,7 +9364,7 @@ msgstr "Povolit náhledy příspěvků a komentářů před jejich zveřejnění
 
 #: src/Content/Feature.php:90
 msgid "Auto-mention Forums"
-msgstr "Automaticky zmínit fóra"
+msgstr "Automaticky zmiňovat fóra"
 
 #: src/Content/Feature.php:90
 msgid ""
@@ -9661,7 +9661,7 @@ msgstr "Vkládání zakázáno"
 
 #: src/Content/OEmbed.php:376
 msgid "Embedded content"
-msgstr "vložený obsah"
+msgstr "Vložený obsah"
 
 #: src/Content/Text/BBCode.php:423
 msgid "view full size"
@@ -9682,8 +9682,8 @@ msgstr "Šifrovaný obsah"
 
 #: src/Content/Text/BBCode.php:1755
 msgid "Invalid source protocol"
-msgstr "Neplatný zdrojový protocol"
+msgstr "Neplatný protokol zdroje"
 
 #: src/Content/Text/BBCode.php:1766
 msgid "Invalid link protocol"
-msgstr "Neplatný linkový protokol"
+msgstr "Neplatný protokol odkazu"
diff --git a/view/lang/cs/strings.php b/view/lang/cs/strings.php
index f78c139ca2..f4b53ec73f 100644
--- a/view/lang/cs/strings.php
+++ b/view/lang/cs/strings.php
@@ -7,7 +7,7 @@ function string_plural_select_cs($n){
 }}
 ;
 $a->strings["You must be logged in to use addons. "] = "Pro použití doplňků musíte být přihlášen/a.";
-$a->strings["Not Found"] = "Nenalezen";
+$a->strings["Not Found"] = "Nenalezeno";
 $a->strings["Page not found."] = "Stránka nenalezena";
 $a->strings["Permission denied"] = "Nedostatečné oprávnění";
 $a->strings["Permission denied."] = "Přístup odmítnut.";
@@ -40,7 +40,7 @@ $a->strings["Find Friends"] = "Najít přátele";
 $a->strings["Last users"] = "Poslední uživatelé";
 $a->strings["Find People"] = "Najít lidi";
 $a->strings["Enter name or interest"] = "Zadejte jméno nebo zájmy";
-$a->strings["Connect/Follow"] = "Spojit/sledovat";
+$a->strings["Connect/Follow"] = "Spojit se/sledovat";
 $a->strings["Examples: Robert Morgenstein, Fishing"] = "Příklady: Josef Dvořák, rybaření";
 $a->strings["Find"] = "Najít";
 $a->strings["Friend Suggestions"] = "Návrhy přátel";
@@ -48,7 +48,7 @@ $a->strings["Similar Interests"] = "Podobné zájmy";
 $a->strings["Random Profile"] = "Náhodný Profil";
 $a->strings["Invite Friends"] = "Pozvat přátele";
 $a->strings["Global Directory"] = "Globální adresář";
-$a->strings["Local Directory"] = "Lokální adresář";
+$a->strings["Local Directory"] = "Místní adresář";
 $a->strings["Forums"] = "Fóra";
 $a->strings["External link to forum"] = "Externí odkaz na fórum";
 $a->strings["show more"] = "zobrazit více";
@@ -229,7 +229,7 @@ $a->strings["Please upload a profile photo."] = "Prosím nahrajte profilovou fot
 $a->strings["Welcome back "] = "Vítejte zpět ";
 $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Formulářový bezpečnostní token nebyl správný. To pravděpodobně nastalo kvůli tom, že formulář byl otevřen příliš dlouho (>3 hodiny) před jeho odesláním.";
 $a->strings["Friendica Notification"] = "Oznámení Friendica";
-$a->strings["Thank You,"] = "Děkujeme, ";
+$a->strings["Thank You,"] = "Děkuji,";
 $a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, administrátor %2\$s";
 $a->strings["%s Administrator"] = "Administrátor %s";
 $a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica:Oznámení] Obdržena nová zpráva na %s";
@@ -267,12 +267,12 @@ $a->strings["[Friendica:Notify] A new person is sharing with you"] = "[Friendica
 $a->strings["%1\$s is sharing with you at %2\$s"] = "Uživatel %1\$s s vámi sdílí na %2\$s";
 $a->strings["[Friendica:Notify] You have a new follower"] = "[Friendica:Oznámení] Máte nového sledovatele";
 $a->strings["You have a new follower at %2\$s : %1\$s"] = "Máte nového sledovatele na %2\$s : %1\$s";
-$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica:Oznámení] Obdržen návrh pro přátelství";
-$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Obdržel/a jste návrh pro přátelství od uživatele \"%1\$s\" na %2\$s";
-$a->strings["You've received [url=%1\$s]a friend suggestion[/url] for %2\$s from %3\$s."] = "Obdržel/a jste [url=%1\$s]návrh pro přátelství[/url] s uživatelem %2\$s od uživatele %3\$s.";
+$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica:Oznámení] Obdržen návrh přátelství";
+$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Obdržel/a jste návrh přátelství od uživatele \"%1\$s\" na %2\$s";
+$a->strings["You've received [url=%1\$s]a friend suggestion[/url] for %2\$s from %3\$s."] = "Obdržel/a jste [url=%1\$s]návrh přátelství[/url] s uživatelem %2\$s od uživatele %3\$s.";
 $a->strings["Name:"] = "Jméno:";
 $a->strings["Photo:"] = "Fotka:";
-$a->strings["Please visit %s to approve or reject the suggestion."] = "Prosím navštivte %s pro schválení či zamítnutí doporučení.";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "Prosím navštivte %s pro schválení či zamítnutí návrhu.";
 $a->strings["[Friendica:Notify] Connection accepted"] = "[Friendica:Oznámení] Spojení přijato";
 $a->strings["'%1\$s' has accepted your connection request at %2\$s"] = "\"%1\$s\" přijal/a Váš požadavek na spojení na %2\$s";
 $a->strings["%2\$s has accepted your [url=%1\$s]connection request[/url]."] = "%2\$s přijal/a Váš [url=%1\$s]požadavek na spojení[/url].";
@@ -281,7 +281,7 @@ $a->strings["Please visit %s if you wish to make any changes to this relationshi
 $a->strings["'%1\$s' has chosen to accept you a fan, which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically."] = "\"%1\$s\" se rozhodl/a Vás přijmout jako fanouška, což omezuje některé formy komunikace - například soukoromé zprávy a některé interakce s profily. Pokud je toto stránka celebrity či komunity, byla tato nastavení aplikována automaticky.";
 $a->strings["'%1\$s' may choose to extend this into a two-way or more permissive relationship in the future."] = "\"%1\$s\" se může rozhodnout tento vztah v budoucnosti rozšířit do obousměrného či jiného liberálnějšího vztahu.";
 $a->strings["Please visit %s  if you wish to make any changes to this relationship."] = "Prosím navštivte %s  pokud chcete změnit tento vztah.";
-$a->strings["[Friendica System Notify]"] = "[Oznámení systému Friendica]";
+$a->strings["[Friendica System Notify]"] = "[Systémové oznámení Friendica]";
 $a->strings["registration request"] = "žádost o registraci";
 $a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "Obdržel/a jste žádost o registraci od uživatele \"%1\$s\" na %2\$s";
 $a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "Obdržel/a jste [url=%1\$s]žádost o registraci[/url] od uživatele \"%2\$s\".";
@@ -293,13 +293,13 @@ $a->strings["first"] = "první";
 $a->strings["prev"] = "předchozí";
 $a->strings["next"] = "další";
 $a->strings["last"] = "poslední";
-$a->strings["Loading more entries..."] = "Načítání více záznamů...";
+$a->strings["Loading more entries..."] = "Načítám více záznamů...";
 $a->strings["The end"] = "Konec";
 $a->strings["No contacts"] = "Žádné kontakty";
 $a->strings["%d Contact"] = [
 	0 => "%d kontakt",
 	1 => "%d kontakty",
-	2 => "%d kontaktů",
+	2 => "%d kontaktu",
 	3 => "%d kontaktů",
 ];
 $a->strings["View Contacts"] = "Zobrazit kontakty";
@@ -308,7 +308,7 @@ $a->strings["Follow"] = "Sledovat";
 $a->strings["Search"] = "Hledat";
 $a->strings["@name, !forum, #tags, content"] = "@jméno, !fórum, #štítky, obsah";
 $a->strings["Full Text"] = "Celý text";
-$a->strings["Tags"] = "Štítky:";
+$a->strings["Tags"] = "Štítky";
 $a->strings["poke"] = "šťouchnout";
 $a->strings["poked"] = "šťouchnul/a";
 $a->strings["ping"] = "cinknout";
@@ -360,7 +360,7 @@ $a->strings["Dec"] = "pro";
 $a->strings["Content warning: %s"] = "Varování o obsahu: %s";
 $a->strings["View Video"] = "Zobrazit video";
 $a->strings["bytes"] = "bytů";
-$a->strings["Click to open/close"] = "Klikněte pro otevření/zavření";
+$a->strings["Click to open/close"] = "Kliknutím otevřete/zavřete";
 $a->strings["View on separate page"] = "Zobrazit na separátní stránce";
 $a->strings["view on separate page"] = "zobrazit na separátní stránce";
 $a->strings["link to source"] = "odkaz na zdroj";
@@ -368,7 +368,7 @@ $a->strings["activity"] = "aktivita";
 $a->strings["comment"] = [
 	0 => "komentář",
 	1 => "komentáře",
-	2 => "komentářů",
+	2 => "komentáře",
 	3 => "komentářů",
 ];
 $a->strings["post"] = "příspěvek";
@@ -376,13 +376,13 @@ $a->strings["Item filed"] = "Položka vyplněna";
 $a->strings["Daily posting limit of %d post reached. The post was rejected."] = [
 	0 => "Byl dosažen denní limit %d příspěvku. Příspěvek byl odmítnut.",
 	1 => "Byl dosažen denní limit %d příspěvků. Příspěvek byl odmítnut.",
-	2 => "Byl dosažen denní limit %d příspěvků. Příspěvek byl odmítnut.",
+	2 => "Byl dosažen denní limit %d příspěvku. Příspěvek byl odmítnut.",
 	3 => "Byl dosažen denní limit %d příspěvků. Příspěvek byl odmítnut.",
 ];
 $a->strings["Weekly posting limit of %d post reached. The post was rejected."] = [
 	0 => "Byl dosažen týdenní limit %d příspěvku. Příspěvek byl odmítnut.",
 	1 => "Byl dosažen týdenní limit %d příspěvků. Příspěvek byl odmítnut.",
-	2 => "Byl dosažen týdenní limit %d příspěvků. Příspěvek byl odmítnut.",
+	2 => "Byl dosažen týdenní limit %d příspěvku. Příspěvek byl odmítnut.",
 	3 => "Byl dosažen týdenní limit %d příspěvků. Příspěvek byl odmítnut.",
 ];
 $a->strings["Monthly posting limit of %d post reached. The post was rejected."] = "Byl dosažen měsíční limit %d příspěvků. Příspěvek byl odmítnut.";
@@ -397,9 +397,9 @@ $a->strings["Mirror as forwarded posting"] = "Zrcadlit pro přeposlané přísp
 $a->strings["Mirror as my own posting"] = "Zrcadlit jako mé vlastní příspěvky";
 $a->strings["Return to contact editor"] = "Zpět k editoru kontaktu";
 $a->strings["Refetch contact data"] = "Znovu načíst data kontaktu";
-$a->strings["Remote Self"] = "Remote Self";
+$a->strings["Remote Self"] = "Vzdálené zrcadlení";
 $a->strings["Mirror postings from this contact"] = "Zrcadlení příspěvků od tohoto kontaktu";
-$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Označit tento kontakt jako \"remote_self\", s tímto nastavením bude friendica přeposílat všechny nové příspěvky od tohoto kontaktu.";
+$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Označit tento kontakt jako \"remote_self\", s tímto nastavením bude Friendica znovupublikovat všechny nové příspěvky od tohoto kontaktu.";
 $a->strings["Name"] = "Jméno";
 $a->strings["Account Nickname"] = "Přezdívka účtu";
 $a->strings["@Tagname - overrides Name/Nickname"] = "@jménoštítku- upřednostněno před jménem/přezdívkou";
@@ -447,8 +447,8 @@ $a->strings["Your account email address must match this in order to use the web
 $a->strings["Please select a default timezone for your website"] = "Prosím, vyberte výchozí časové pásmo pro váš server";
 $a->strings["Site settings"] = "Nastavení webu";
 $a->strings["System Language:"] = "Systémový jazyk";
-$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Nastavte si výchozí jazyk pro vaše instalační rozhraní Friendica a pro odesílání e-mailů.";
-$a->strings["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."] = "Databázový konfigurační soubor \"config/local.ini.php\" nemohl být zapsán. Prosím, použijte přiložený text k vytvoření konfiguračního souboru ve vašem kořenovém adresáři webového serveru.";
+$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Nastavte si výchozí jazyk pro Vaše instalační rozhraní Friendica a pro odesílání e-mailů.";
+$a->strings["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."] = "Databázový konfigurační soubor \"config/local.ini.php\" nemohl být zapsán. Prosím, použijte přiložený text k vytvoření konfiguračního souboru v kořenovém adresáři Vašeho webového serveru.";
 $a->strings["<h1>What next</h1>"] = "<h1>Co dál</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the worker."] = "DŮLEŽITÉ: Budete si muset [manuálně] nastavit naplánovaný úkol pro pracovníka.";
 $a->strings["Go to your new Friendica node <a href=\"%s/register\">registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel."] = "Přejděte k <a href=\"%s/register\">registrační stránce</a> Vašeho nového serveru Friendica a zaregistrujte se jako nový uživatel. Nezapomeňte použít stejný e-mail, který jste zadal/a jako administrátorský e-mail. To Vám umožní navštívit panel pro administraci stránky.";
@@ -472,18 +472,18 @@ $a->strings["Unable to update your contact profile details on our system"] = "Ne
 $a->strings["[Name Withheld]"] = "[Jméno odepřeno]";
 $a->strings["People Search - %s"] = "Vyhledávání lidí - %s";
 $a->strings["Forum Search - %s"] = "Vyhledávání fór - %s";
-$a->strings["Connect"] = "Spojit";
+$a->strings["Connect"] = "Spojit se";
 $a->strings["No matches"] = "Žádné shody";
 $a->strings["Manage Identities and/or Pages"] = "Správa identit a/nebo stránek";
 $a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Přepínání mezi různými identitami nebo komunitními/skupinovými stránkami, které sdílí Vaše detaily účtu, nebo kterým jste přidělili oprávnění nastavovat přístupová práva.";
-$a->strings["Select an identity to manage: "] = "Vyberte identitu pro správu: ";
+$a->strings["Select an identity to manage: "] = "Vyberte identitu ke spravování: ";
 $a->strings["Do you really want to delete this video?"] = "Opravdu chcete smazat toto video?";
 $a->strings["Delete Video"] = "Odstranit video";
 $a->strings["Public access denied."] = "Veřejný přístup odepřen.";
 $a->strings["No videos selected"] = "Není vybráno žádné video";
 $a->strings["Access to this item is restricted."] = "Přístup k této položce je omezen.";
 $a->strings["View Album"] = "Zobrazit album";
-$a->strings["Recent Videos"] = "Aktuální videa";
+$a->strings["Recent Videos"] = "Nedávná videa";
 $a->strings["Upload New Videos"] = "Nahrát nová videa";
 $a->strings["Only logged in users are permitted to perform a probing."] = "Pouze přihlášení uživatelé mohou zkoušet adresy.";
 $a->strings["Location:"] = "Poloha:";
@@ -507,7 +507,7 @@ $a->strings["Social Networks"] = "Sociální sítě";
 $a->strings["Addons"] = "Doplňky";
 $a->strings["Delegations"] = "Delegace";
 $a->strings["Connected apps"] = "Připojené aplikace";
-$a->strings["Export personal data"] = "Export osobních údajů";
+$a->strings["Export personal data"] = "Exportovat osobní údaje";
 $a->strings["Remove account"] = "Odstranit účet";
 $a->strings["Missing some important data!"] = "Chybí některé důležité údaje!";
 $a->strings["Update"] = "Aktualizace";
@@ -571,7 +571,7 @@ $a->strings["IMAP port:"] = "IMAP port:";
 $a->strings["Security:"] = "Zabezpečení:";
 $a->strings["None"] = "Žádné";
 $a->strings["Email login name:"] = "Přihlašovací jméno k e-mailu:";
-$a->strings["Email password:"] = "Heslo k Vašemu e-mailu:";
+$a->strings["Email password:"] = "Heslo k e-mailu:";
 $a->strings["Reply-to address:"] = "Odpovědět na adresu:";
 $a->strings["Send public posts to all email contacts:"] = "Poslat veřejné příspěvky na všechny e-mailové kontakty:";
 $a->strings["Action after import:"] = "Akce po importu:";
@@ -620,7 +620,7 @@ $a->strings["Account for community discussions."] = "Účet pro komunitní disku
 $a->strings["Normal Account Page"] = "Normální stránka účtu";
 $a->strings["Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."] = "Účet pro běžný osobní profil, který vyžaduje manuální potvrzení \"Přátel\" a \"Sledovatelů\".";
 $a->strings["Soapbox Page"] = "Propagační stránka";
-$a->strings["Account for a public profile that automatically approves contact requests as \"Followers\"."] = "Účet pro veřejný profil, který vyžaduje manuální potvrzení \"Přátel\" a \"Sledovatelů\".";
+$a->strings["Account for a public profile that automatically approves contact requests as \"Followers\"."] = "Účet pro veřejný profil, který automaticky potvrzuje žádosti o přidání kontaktu jako \"Sledovatele\".";
 $a->strings["Public Forum"] = "Veřejné fórum";
 $a->strings["Automatically approves all contact requests."] = "Automaticky potvrzuje všechny žádosti o přidání kontaktu.";
 $a->strings["Automatic Friend Page"] = "Stránka s automatickými přátely";
@@ -628,9 +628,9 @@ $a->strings["Account for a popular profile that automatically approves contact r
 $a->strings["Private Forum [Experimental]"] = "Soukromé fórum [Experimentální]";
 $a->strings["Requires manual approval of contact requests."] = "Vyžaduje manuální potvrzení žádostí o přidání kontaktu.";
 $a->strings["OpenID:"] = "OpenID:";
-$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Volitelné) Povolit OpenID pro přihlášení k tomuto účtu.";
+$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Volitelné) Povolit tomuto OpenID přihlášení k tomuto účtu.";
 $a->strings["Publish your default profile in your local site directory?"] = "Publikovat Váš výchozí profil v lokálním adresáři webu?";
-$a->strings["Your profile will be published in this node's <a href=\"%s\">local directory</a>. Your profile details may be publicly visible depending on the system settings."] = "Váš profil bude publikován v <a href=\"%s\">lokálním adresáři</a> tohoto serveru. Vaše detaily o profilu mohou být veřejně viditelné v závislosti na systémových nastaveních.";
+$a->strings["Your profile will be published in this node's <a href=\"%s\">local directory</a>. Your profile details may be publicly visible depending on the system settings."] = "Váš profil bude publikován v <a href=\"%s\">místním adresáři</a> tohoto serveru. Vaše detaily o profilu mohou být veřejně viditelné v závislosti na systémových nastaveních.";
 $a->strings["No"] = "Ne";
 $a->strings["Publish your default profile in the global social directory?"] = "Publikovat Váš výchozí profil v globální sociálním adresáři?";
 $a->strings["Your profile will be published in the global friendica directories (e.g. <a href=\"%s\">%s</a>). Your profile will be visible in public."] = "Váš profil bude publikován v globálních adresářich Friendica (např. <a href=\"%s\">%s</a>). Váš profil bude veřejně viditelný.";
@@ -677,7 +677,7 @@ $a->strings["Security and Privacy Settings"] = "Nastavení zabezpečení a soukr
 $a->strings["Maximum Friend Requests/Day:"] = "Maximální počet žádostí o přátelství za den:";
 $a->strings["(to prevent spam abuse)"] = "(ay se zabránilo spamu)";
 $a->strings["Default Post Permissions"] = "Výchozí oprávnění pro příspěvek";
-$a->strings["(click to open/close)"] = "(Klikněte pro otevření/zavření)";
+$a->strings["(click to open/close)"] = "(klikněte pro otevření/zavření)";
 $a->strings["Show to Groups"] = "Zobrazit ve Skupinách";
 $a->strings["Show to Contacts"] = "Zobrazit v Kontaktech";
 $a->strings["Default Private Post"] = "Výchozí Soukromý příspěvek";
@@ -691,7 +691,7 @@ $a->strings["Your introductions are confirmed"] = "jsou Vaše představení potv
 $a->strings["Someone writes on your profile wall"] = "Vám někdo napíše na Vaši profilovou stránku";
 $a->strings["Someone writes a followup comment"] = "Vám někdo napíše následný komentář";
 $a->strings["You receive a private message"] = "obdržíte soukromou zprávu";
-$a->strings["You receive a friend suggestion"] = "obdržíte návrh na přátelství";
+$a->strings["You receive a friend suggestion"] = "obdržíte návrh přátelství";
 $a->strings["You are tagged in a post"] = "jste označen v příspěvku";
 $a->strings["You are poked/prodded/etc. in a post"] = "jste šťouchnut(a)/dloubnut(a)/apod. v příspěvku";
 $a->strings["Activate desktop notifications"] = "Aktivovat desktopová oznámení";
@@ -724,7 +724,7 @@ $a->strings["add"] = "přidat";
 $a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = [
 	0 => "Varování: Tato skupina obsahuje %s člena ze sítě, která nepovoluje posílání soukromých zpráv.",
 	1 => "Varování: Tato skupina obsahuje %s členy ze sítě, která nepovoluje posílání soukromých zpráv.",
-	2 => "Varování: Tato skupina obsahuje %s členů ze sítě, která nepovoluje posílání soukromých zpráv.",
+	2 => "Varování: Tato skupina obsahuje %s člena ze sítě, která nepovoluje posílání soukromých zpráv.",
 	3 => "Varování: Tato skupina obsahuje %s členů ze sítě, která nepovoluje posílání soukromých zpráv.",
 ];
 $a->strings["Messages in this group won't be send to these receivers."] = "Zprávy v této skupině nebudou těmto příjemcům doručeny.";
@@ -749,9 +749,9 @@ $a->strings["Group created."] = "Skupina vytvořena.";
 $a->strings["Could not create group."] = "Nelze vytvořit skupinu.";
 $a->strings["Group not found."] = "Skupina nenalezena.";
 $a->strings["Group name changed."] = "Název skupiny byl změněn.";
-$a->strings["Save Group"] = "Uložit Skupinu";
+$a->strings["Save Group"] = "Uložit skupinu";
 $a->strings["Filter"] = "Filtr";
-$a->strings["Create a group of contacts/friends."] = "Vytvořit skupinu kontaktů / přátel.";
+$a->strings["Create a group of contacts/friends."] = "Vytvořit skupinu kontaktů/přátel.";
 $a->strings["Group Name: "] = "Název skupiny: ";
 $a->strings["Contacts not in any group"] = "Kontakty, které nejsou v žádné skupině";
 $a->strings["Group removed."] = "Skupina odstraněna. ";
@@ -793,12 +793,12 @@ $a->strings["Contact unfollowed"] = "Zrušeno sledování kontaktu";
 $a->strings["Submit Request"] = "Odeslat žádost";
 $a->strings["You aren't a friend of this contact."] = "nejste přítelem tohoto kontaktu";
 $a->strings["Unfollowing is currently not supported by your network."] = "Zrušení sledování není aktuálně na Vaši síti podporováno.";
-$a->strings["Disconnect/Unfollow"] = "Odpojit/Zrušit sledování";
+$a->strings["Disconnect/Unfollow"] = "Odpojit se/Zrušit sledování";
 $a->strings["Your Identity Address:"] = "Vaše adresa identity:";
 $a->strings["Profile URL"] = "URL profilu";
 $a->strings["Status Messages and Posts"] = "Stavové zprávy a příspěvky ";
-$a->strings["[Embedded content - reload page to view]"] = "[Vložený obsah - obnovte stránku pro zobrazení]";
-$a->strings["Registration successful. Please check your email for further instructions."] = "Registrace úspěšná. Zkontrolujte prosím svůj e-mail pro další instrukce.";
+$a->strings["[Embedded content - reload page to view]"] = "[Vložený obsah - pro zobrazení obnovte stránku]";
+$a->strings["Registration successful. Please check your email for further instructions."] = "Registrace byla úspěšná. Zkontrolujte prosím svůj e-mail pro další instrukce.";
 $a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "Nepovedlo se odeslat emailovou zprávu. Zde jsou detaily Vašeho účtu:<br> přihlašovací jméno: %s<br> heslo: %s<br><br>Své heslo si můžete změnit po přihlášení.";
 $a->strings["Registration successful."] = "Registrace byla úspěšná.";
 $a->strings["Your registration can not be processed."] = "Vaši registraci nelze zpracovat.";
@@ -834,7 +834,7 @@ $a->strings["Home Notifications"] = "Oznámení na domovské stránce";
 $a->strings["Show Ignored Requests"] = "Zobrazit ignorované žádosti";
 $a->strings["Hide Ignored Requests"] = "Skrýt ignorované žádosti";
 $a->strings["Notification type:"] = "Typ oznámení:";
-$a->strings["Suggested by:"] = "Navrženo:";
+$a->strings["Suggested by:"] = "Navrhl/a:";
 $a->strings["Hide this contact from others"] = "Skrýt tento kontakt před ostatními";
 $a->strings["Approve"] = "Schválit";
 $a->strings["Claims to be known to you: "] = "Vaši údajní známí: ";
@@ -871,7 +871,7 @@ $a->strings["%s and You"] = "%s a Vy";
 $a->strings["%d message"] = [
 	0 => "%d zpráva",
 	1 => "%d zprávy",
-	2 => "%d zpráv",
+	2 => "%d zprávy",
 	3 => "%d zpráv",
 ];
 $a->strings["No profile"] = "Žádný profil";
@@ -921,7 +921,7 @@ $a->strings["Getting Started"] = "Začínáme";
 $a->strings["Friendica Walk-Through"] = "Prohlídka Friendica ";
 $a->strings["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."] = "Na Vaší stránce <em>Rychlý začátek</em> najděte stručné představení k Vašemu profilu a síťovým záložkám, spojte ses novými kontakty a najděte skupiny, ke kterým se můžete připojit.";
 $a->strings["Go to Your Settings"] = "Navštivte své nastavení";
-$a->strings["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."] = "Na Vaší stránce <em>Nastavení</em> si změňte Vaše první heslo. Věnujte také svou pozornost k adrese identity. Vypadá jako emailová adresa a bude Vám užitečná pro navazování přátelství na svobodném sociálním webu.";
+$a->strings["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."] = "Na Vaší stránce <em>Nastavení</em> si změňte Vaše první heslo. Věnujte také svou pozornost Vaší adrese identity. Vypadá jako e-mailová adresa a bude Vám užitečná pro navazování přátelství na svobodném sociálním webu.";
 $a->strings["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."] = "Prohlédněte si další nastavení, a to zejména nastavení soukromí. Nezveřejnění svého účtu v adresáři je jako mít nezveřejněné telefonní číslo. Obecně platí, že je lepší mít svůj účet zveřejněný - leda by všichni Vaši přátelé a potenciální přátelé přesně věděli, jak Vás najít.";
 $a->strings["Upload Profile Photo"] = "Nahrát profilovou fotku";
 $a->strings["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."] = "Nahrajte si svou profilovou fotku, pokud jste tak již neučinil/a. Studie ukázaly, že lidé se skutečnými fotkami mají desetkrát častěji přátele než lidé, kteří nemají.";
@@ -929,8 +929,8 @@ $a->strings["Edit Your Profile"] = "Upravte si svůj profil";
 $a->strings["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."] = "Upravte si <strong>výchozí</strong> profil podle vašich představ. Prověřte nastavení pro skrytí Vašeho seznamu přátel a skrytí profilu před neznámými návštěvníky.";
 $a->strings["Profile Keywords"] = "Profilová klíčová slova";
 $a->strings["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."] = "Nastavte si nějaká veřejná klíčová slova pro výchozí profil, která popisují Vaše zájmy. Můžeme Vám najít další lidi s podobnými zájmy a navrhnout přátelství.";
-$a->strings["Connecting"] = "Probíhá pokus o připojení";
-$a->strings["Importing Emails"] = "Importování emaiů";
+$a->strings["Connecting"] = "Připojuji se";
+$a->strings["Importing Emails"] = "Importuji e-maily";
 $a->strings["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"] = "Pokud chcete importovat své přátele nebo mailové skupiny a komunikovat s nimi, zadejte na Vaší stránce Nastavení kontektoru své přístupové údaje do svého emailového účtu";
 $a->strings["Go to Your Contacts Page"] = "Navštivte Vaši stránku s kontakty";
 $a->strings["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."] = "Vaše stránka Kontakty je Vaše brána k nastavování přátelství a propojení s přáteli z dalších sítí. Typicky zadáte jejich emailovou adresu nebo URL adresu jejich serveru prostřednictvím dialogu <em>Přidat nový kontakt</em>.";
@@ -1040,7 +1040,7 @@ $a->strings["Could not find any contact entry for this URL (%s)"] = "Nelze nalé
 $a->strings["%s contact unblocked"] = [
 	0 => "%s kontakt odblokován",
 	1 => "%s kontakty odblokovány",
-	2 => "%s kontaktů odblokováno",
+	2 => "%s kontaktu odblokováno",
 	3 => "%s kontaktů odblokováno",
 ];
 $a->strings["Remote Contact Blocklist"] = "Blokované vzdálené kontakty";
@@ -1058,7 +1058,7 @@ $a->strings["Address"] = "Adresa";
 $a->strings["%s total blocked contact"] = [
 	0 => "Celkem %s zablokovaný kontakt",
 	1 => "Celkem %s zablokované kontakty",
-	2 => "Celkem %s zablokovaných kontaktů",
+	2 => "Celkem %s zablokovaného kontaktu",
 	3 => "Celkem %s zablokovaných kontaktů",
 ];
 $a->strings["URL of the remote contact to block."] = "Adresa URL vzdáleného kontaktu k zablokování.";
@@ -1082,7 +1082,7 @@ $a->strings["Inspect Worker Queue"] = "Prozkoumat frontu pro pracovníka";
 $a->strings["Job Parameters"] = "Parametry úlohy";
 $a->strings["Priority"] = "Priorita";
 $a->strings["This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you've set up during install."] = "Na této stránce jsou vypsány aktuálně čekající úlohy pro pracovníka . Tyto úlohy vykonává úloha cron pracovníka, kterou jste nastavil/a při instalaci.";
-$a->strings["Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href=\"%s\">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php bin/console.php dbstructure toinnodb</tt> of your Friendica installation for an automatic conversion.<br />"] = "Vaše databáze stále běží s tabulkami MyISAM. Měl/a byste změnit typ datového úložiště na InnoDB. Protože Friendica bude v budoucnu používat pouze funkce InnoDB, měl/a byste to změnit! <a href=\"%s\">Zde</a> naleznete návod, který by pro vás mohl být užitečný při konverzi úložišť. Můžete také použít příkaz <tt>php bin/console.php dbstructure toinnodb</tt> na Vaší instalaci Friendica pro automatickou konverzi.<br />";
+$a->strings["Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href=\"%s\">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php bin/console.php dbstructure toinnodb</tt> of your Friendica installation for an automatic conversion.<br />"] = "Vaše databáze stále běží s tabulkami MyISAM. Měl/a byste změnit typ datového úložiště na InnoDB. Protože Friendica bude v budoucnu používat pouze funkce pro InnoDB, měl/a byste to změnit! <a href=\"%s\">Zde</a> naleznete návod, který by pro vás mohl být užitečný při konverzi úložišť. Můžete také použít příkaz <tt>php bin/console.php dbstructure toinnodb</tt> na Vaší instalaci Friendica pro automatickou konverzi.<br />";
 $a->strings["There is a new version of Friendica available for download. Your current version is %1\$s, upstream version is %2\$s"] = "Je dostupná ke stažení nová verze Friendica. Vaše aktuální verze je %1\$s, upstreamová verze je %2\$s";
 $a->strings["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."] = "Aktualizace databáze selhala. Prosím, spusťte příkaz \"php bin/console.php dbstructure update\" z příkazového řádku a podívejte se na chyby, které by se mohly vyskytnout.";
 $a->strings["The worker was never executed. Please check your database structure!"] = "Pracovník nebyl nikdy spuštěn. Prosím zkontrolujte strukturu Vaší databáze!";
@@ -1109,7 +1109,7 @@ $a->strings["Public postings from users of this site"] = "Počet veřejných př
 $a->strings["Public postings from the federated network"] = "Veřejné příspěvky z federované sítě";
 $a->strings["Public postings from local users and the federated network"] = "Veřejné příspěvky od lokálních uživatelů a z federované sítě";
 $a->strings["Disabled"] = "Zakázáno";
-$a->strings["Users, Global Contacts"] = "Uživatelé, Všechny kontakty";
+$a->strings["Users, Global Contacts"] = "Uživatelé, globální kontakty";
 $a->strings["Users, Global Contacts/fallback"] = "Uživatelé, globální kontakty/fallback";
 $a->strings["One month"] = "Jeden měsíc";
 $a->strings["Three months"] = "Tři měsíce";
@@ -1118,35 +1118,35 @@ $a->strings["One year"] = "Jeden rok";
 $a->strings["Multi user instance"] = "Víceuživatelská instance";
 $a->strings["Closed"] = "Uzavřeno";
 $a->strings["Requires approval"] = "Vyžaduje schválení";
-$a->strings["Open"] = "Otevřená";
+$a->strings["Open"] = "Otevřeno";
 $a->strings["No SSL policy, links will track page SSL state"] = "Žádná SSL politika, odkazy budou následovat SSL stav stránky";
 $a->strings["Force all links to use SSL"] = "Vyžadovat u všech odkazů použití SSL";
 $a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Certifikát podepsaný sám sebou, použít SSL pouze pro lokální odkazy (nedoporučeno)";
-$a->strings["Don't check"] = "Nezkontrolovat";
-$a->strings["check the stable version"] = "zkontrolovat stabilní verzi";
-$a->strings["check the development version"] = "zkontrolovat verzi ve vývoji";
+$a->strings["Don't check"] = "Nekontrolovat";
+$a->strings["check the stable version"] = "kontrolovat stabilní verzi";
+$a->strings["check the development version"] = "kontrolovat vývojovou verzi";
 $a->strings["Republish users to directory"] = "Znovu publikovat uživatele do adresáře";
 $a->strings["File upload"] = "Nahrání souborů";
 $a->strings["Policies"] = "Politiky";
 $a->strings["Advanced"] = "Pokročilé";
 $a->strings["Auto Discovered Contact Directory"] = "Adresář automaticky objevených kontaktů";
-$a->strings["Performance"] = "Výkonnost";
+$a->strings["Performance"] = "Výkon";
 $a->strings["Worker"] = "Pracovník (worker)";
 $a->strings["Message Relay"] = "Přeposílání zpráv";
 $a->strings["Relocate - WARNING: advanced function. Could make this server unreachable."] = "Přemístit - VAROVÁNÍ: pokročilá funkce. Tímto můžete znepřístupnit server.";
 $a->strings["Site name"] = "Název webu";
 $a->strings["Host name"] = "Jméno hostitele (host name)";
-$a->strings["Sender Email"] = "Email ddesílatele";
+$a->strings["Sender Email"] = "E-mail odesílatele";
 $a->strings["The email address your server shall use to send notification emails from."] = "E-mailová adresa, kterou bude Váš server používat pro posílání e-mailů s oznámeními.";
 $a->strings["Banner/Logo"] = "Banner/logo";
-$a->strings["Shortcut icon"] = "Ikona zkratky";
+$a->strings["Shortcut icon"] = "Favikona";
 $a->strings["Link to an icon that will be used for browsers."] = "Odkaz k ikoně, která bude použita pro prohlížeče.";
 $a->strings["Touch icon"] = "Dotyková ikona";
 $a->strings["Link to an icon that will be used for tablets and mobiles."] = "Odkaz k ikoně, která bude použita pro tablety a mobilní zařízení.";
 $a->strings["Additional Info"] = "Dodatečné informace";
 $a->strings["For public servers: you can add additional information here that will be listed at %s/servers."] = "Pro veřejné servery: zde můžete přidat dodatečné informace, které budou vypsané na stránce %s/servers.";
 $a->strings["System language"] = "Systémový jazyk";
-$a->strings["System theme"] = "Motiv systému ";
+$a->strings["System theme"] = "Systémový motiv";
 $a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Výchozí systémový motiv - může být změněn v uživatelských profilech - <a href='#' id='cnftheme'>změnit nastavení motivu</a>";
 $a->strings["Mobile system theme"] = "Mobilní systémový motiv";
 $a->strings["Theme for mobile devices"] = "Motiv pro mobilní zařízení";
@@ -1162,25 +1162,25 @@ $a->strings["Maximum image size"] = "Maximální velikost obrázků";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximální velikost nahraných obrázků v bajtech. Výchozí hodnota je 0, což znamená bez omezení.";
 $a->strings["Maximum image length"] = "Maximální velikost obrázků";
 $a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "Maximální délka delší stránky nahrávaných obrázků v pixelech. Výchozí hodnota je -1, což znamená bez omezení.";
-$a->strings["JPEG image quality"] = "JPEG kvalita obrázku";
-$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Nahrávaný JPEG bude uložen se zadanou kvalitou v rozmezí [0-100]. Výchozí hodnota je 100, což znamená plnou kvalitu.";
+$a->strings["JPEG image quality"] = "Kvalita obrázků JPEG";
+$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Nahrávané obrázky JPEG budou uloženy se zadanou kvalitou v rozmezí [0-100]. Výchozí hodnota je 100, což znamená plnou kvalitu.";
 $a->strings["Register policy"] = "Politika registrace";
 $a->strings["Maximum Daily Registrations"] = "Maximální počet denních registrací";
-$a->strings["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."] = "Pokud je registrace výše povolena, zde se nastaví maximální počet registrací nových uživatelů za den.\nPokud je registrace zakázána, toto nastavení nemá žádný efekt.";
-$a->strings["Register text"] = "Registrace textu";
-$a->strings["Will be displayed prominently on the registration page. You can use BBCode here."] = "Bude zobrazeno viditelně na stránce registrace. Zde můžete používat BBCode.";
+$a->strings["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."] = "Pokud je registrace výše povolena, zde se nastaví maximální počet registrací nových uživatelů za den. Pokud je registrace zakázána, toto nastavení nemá žádný efekt.";
+$a->strings["Register text"] = "Text při registraci";
+$a->strings["Will be displayed prominently on the registration page. You can use BBCode here."] = "Bude zobrazen viditelně na stránce registrace. Zde můžete používat BBCode.";
 $a->strings["Forbidden Nicknames"] = "Zakázané přezdívky";
 $a->strings["Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142."] = "Seznam přezdívek, které nelze registrovat, oddělených čárkami. Přednastaven je seznam častých přezdívek dle RFC 2142.";
-$a->strings["Accounts abandoned after x days"] = "Účet je opuštěn po x dnech";
+$a->strings["Accounts abandoned after x days"] = "Účty jsou opuštěny po x dnech";
 $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Nebude se plýtvat systémovými zdroji kontaktováním externích webů s opuštěnými účty. Zadejte 0 pro žádný časový limit.";
 $a->strings["Allowed friend domains"] = "Povolené domény přátel";
-$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Čárkou oddělený seznam domén, kterým je povoleno navazovat přátelství s tímto webem. Zástupné znaky (wildcards) jsou povoleny. Prázné znamená libovolnou doménu.";
+$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Seznam domén, kterým je povoleno navazovat přátelství s tímto webem, oddělených čárkami. Zástupné znaky (wildcards) jsou povoleny. Prázné znamená libovolné domény.";
 $a->strings["Allowed email domains"] = "Povolené e-mailové domény";
-$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Čárkou oddělený seznam domén emalových adres, kterým je povoleno provádět registraci na tomto webu. Zástupné znaky (wildcards) jsou povoleny. Prázné znamená libovolnou doménu.";
+$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Seznam domén e-mailových adres, kterým je povoleno provádět registraci na tomto webu, oddělených čárkami. Zástupné znaky (wildcards) jsou povoleny. Prázné znamená libovolné domény.";
 $a->strings["No OEmbed rich content"] = "Žádný obohacený obsah oEmbed";
 $a->strings["Don't show the rich content (e.g. embedded PDF), except from the domains listed below."] = "Neukazovat obohacený obsah (např. vložené PDF dokumenty), kromě toho z domén vypsaných níže.";
 $a->strings["Allowed OEmbed domains"] = "Povolené domény pro oEmbed";
-$a->strings["Comma separated list of domains which oembed content is allowed to be displayed. Wildcards are accepted."] = "Výpis domén, u nichž je povoleno zobrazit obsah oEmbed, oddělených čárkami. Zástupné znaky jsou povoleny.";
+$a->strings["Comma separated list of domains which oembed content is allowed to be displayed. Wildcards are accepted."] = "Seznam domén, u nichž je povoleno zobrazit obsah oEmbed, oddělených čárkami. Zástupné znaky jsou povoleny.";
 $a->strings["Block public"] = "Blokovat veřejný přístup";
 $a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Označením zablokujete veřejný přístup ke všem jinak veřejně přístupným osobním stránkám nepřihlášeným uživatelům.";
 $a->strings["Force publish"] = "Vynutit publikaci";
@@ -1195,7 +1195,7 @@ $a->strings["Don't include the content of a post/comment/private message/etc. in
 $a->strings["Disallow public access to addons listed in the apps menu."] = "Zakázat veřejný přístup k rozšířením uvedeným v menu aplikace.";
 $a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "Označení této volby omezí rozšíření uvedená v menu aplikace pouze pro členy.";
 $a->strings["Don't embed private images in posts"] = "Nepovolit přidávání soukromých správ v příspěvcích";
-$a->strings["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."] = "Nenahrazovat lokální soukromé fotky v příspěvcích vloženou kopií obrázku. To znamená, že kontakty, které obdrží příspěvek obsahující soukromé fotky, budou muset autentikovat a načíst každý obrázek, což může zabrat nějaký čas.";
+$a->strings["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."] = "Nenahrazovat místní soukromé fotky v příspěvcích vloženou kopií obrázku. To znamená, že kontakty, které obdrží příspěvek obsahující soukromé fotky, budou muset autentikovat a načíst každý obrázek, což může zabrat nějaký čas.";
 $a->strings["Explicit Content"] = "Explicitní obsah";
 $a->strings["Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page."] = "Touto funkcí oznámíte, že je Váš server používán hlavně pro explicitní obsah, který nemusí být vhodný pro mladistvé. Tato informace bude publikována na stránce informací o serveru a může být využita např. globálním adresářem pro odfiltrování Vašeho serveru ze seznamu serverů pro spojení. Poznámka o tom bude navíc zobrazena na stránce registrace.";
 $a->strings["Allow Users to set remote_self"] = "Umožnit uživatelům nastavit ";
@@ -1247,7 +1247,7 @@ $a->strings["When the discovery is activated, this value defines the timeframe f
 $a->strings["Search the local directory"] = "Hledat  v lokálním adresáři";
 $a->strings["Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated."] = "Prohledat lokální adresář místo globálního adresáře. Při lokálním prohledávání bude každé hledání provedeno v globálním adresáři na pozadí. To vylepšuje výsledky při zopakování hledání.";
 $a->strings["Publish server information"] = "Zveřejnit informace o serveru";
-$a->strings["If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details."] = "Pokud je toto povoleno, budou zveřejněna obecná data o serveru a jeho používání. Data obsahují jméno a verzi serveru, počet uživatelů s vřejnými profily, počet příspěvků a aktivované protokoly a konektory. Pro více informací navštivte <a href='http://the-federation.info/'>the-federation.info</a>.";
+$a->strings["If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details."] = "Pokud je toto povoleno, budou zveřejněna obecná data o serveru a jeho používání. Data obsahují jméno a verzi serveru, počet uživatelů s veřejnými profily, počet příspěvků a aktivované protokoly a konektory. Pro více informací navštivte <a href='http://the-federation.info/'>the-federation.info</a>.";
 $a->strings["Check upstream version"] = "Zkontrolovat upstreamovou verzi";
 $a->strings["Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview."] = "Umožní kontrolovat nové verze Friendica na GitHubu. Pokud existuje nová verze, budete informován/a na přehledu administračního panelu.";
 $a->strings["Suppress Tags"] = "Potlačit štítky";
@@ -1270,7 +1270,7 @@ $a->strings["Base path to installation"] = "Základní cesta k instalaci";
 $a->strings["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."] = "Pokud systém nemůže detekovat správnou cestu k Vaší instalaci, zde zadejte jinou cestu. Toto nastavení by mělo být nastaveno pouze, pokud používáte omezený systém a symbolické odkazy ke kořenové složce webu.";
 $a->strings["Disable picture proxy"] = "Vypnutí obrázkové proxy";
 $a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwidth."] = "Obrázková proxy zvyšuje výkon a soukromí. Neměla by však být používána na systémech s velmi malou rychlostí připojení.";
-$a->strings["Only search in tags"] = "Hledat pouze ve štítkách";
+$a->strings["Only search in tags"] = "Hledat pouze ve štítcích";
 $a->strings["On large systems the text search can slow down the system extremely."] = "Textové vyhledávání může u rozsáhlých systémů znamenat velmi citelné zpomalení systému.";
 $a->strings["New base url"] = "Nová výchozí url adresa";
 $a->strings["Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users."] = "Změnit výchozí URL adresu pro tento server. Toto odešle zprávu o přemístění všem kontaktům na Friendica a Diaspora* všech uživatelů.";
@@ -1314,18 +1314,18 @@ $a->strings["This does not include updates prior to 1139, which did not return a
 $a->strings["Mark success (if update was manually applied)"] = "Označit za úspěšné (pokud byla aktualizace aplikována manuálně)";
 $a->strings["Attempt to execute this update step automatically"] = "Pokusit se provést tuto aktualizaci automaticky.";
 $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tthe administrator of %2\$s has set up an account for you."] = "\n\t\t\tVážený/á%1\$s,\n\t\t\t\tadministrátor %2\$s pro Vás vytvořil uživatelský účet.";
-$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%1\$s\n\t\t\tLogin Name:\t\t%2\$s\n\t\t\tPassword:\t\t%3\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %1\$s/removeme\n\n\t\t\tThank you and welcome to %4\$s."] = "\n\t\t\tZde jsou vaše přihlašovací detaily:\n\n\t\t\tAdresa stránky:\t\t%1\$s\n\t\t\tPřihlašovací jméno:\t%2\$s\n\t\t\tHeslo:\t\t\t%3\$s\n\n\t\t\tSvé heslo si po přihlášení můžete změnit na stránce \"Nastavení\" vašeho\n\t\t\túčtu.\n\n\t\t\tProsím, prohlédněte si na chvilku ostatní nastavení účtu na té stránce.\n\n\t\t\tMožná byste si také přáli přidat pár základních informací na svůj výchozí\n\t\t\tprofil (na stránce \"Profily\") aby vás další lidé mohli snadno najít.\n\t\t\tDoporučujeme nastavit si vaše celé jméno, přidat profilovou fotku,\n\t\t\tpřidat pár \"klíčových slov\" k profilu (velmi užitečné při získávání nových\n\t\t\tpřátel) - a možná v jaké zemi žijete; pokud nechcete být konkrétnější.\n\n\t\t\tZcela respektujeme vaše právo na soukromí a žádnou z těchto položek\n\t\t\tnení potřeba vyplňovat. Pokud jste zde nový/á a nikoho zde neznáte, mohou vám\n\t\t\tpomoci si získat nové a zajímavé přátele.\n\t\t\tPokud byste si někdy přál/a smazat účet, může tak učinit na stránce\n\t\t\t%1\$s/removeme.\n\n\t\t\tDěkujeme vám a vítáme vás na %4\$s.";
-$a->strings["Registration details for %s"] = "Registrační údaje pro %s";
+$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%1\$s\n\t\t\tLogin Name:\t\t%2\$s\n\t\t\tPassword:\t\t%3\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %1\$s/removeme\n\n\t\t\tThank you and welcome to %4\$s."] = "\n\t\t\tZde jsou Vaše přihlašovací detaily:\n\n\t\t\tAdresa stránky:\t\t%1\$s\n\t\t\tPřihlašovací jméno:\t%2\$s\n\t\t\tHeslo:\t\t\t%3\$s\n\n\t\t\tSvé heslo si po přihlášení můžete změnit na stránce \"Nastavení\" vašeho\n\t\t\túčtu.\n\n\t\t\tProsím, prohlédněte si na chvilku ostatní nastavení účtu na této stránce.\n\n\t\t\tMožná byste si také přál/a přidat pár základních informací na svůj výchozí\n\t\t\tprofil (na stránce \"Profily\") aby vás další lidé mohli snadno najít.\n\t\t\tDoporučujeme nastavit si Vaše celé jméno, přidat profilovou fotku,\n\t\t\tpřidat pár \"klíčových slov\" k profilu (velmi užitečné při získávání nových\n\t\t\tpřátel) - a možná v jaké zemi žijete; pokud nechcete být konkrétnější.\n\n\t\t\tZcela respektujeme Vaše právo na soukromí a žádnou z těchto položek\n\t\t\tnení potřeba vyplňovat. Pokud jste zde nový/á a nikoho zde neznáte, mohou vám\n\t\t\tpomoci si získat nové a zajímavé přátele.\n\t\t\tPokud byste si někdy přál/a smazat účet, můžete tak učinit na stránce\n\t\t\t%1\$s/removeme.\n\n\t\t\tDěkujeme Vám a vítáme Vás na %4\$s.";
+$a->strings["Registration details for %s"] = "Registrační údaje pro uživatele %s";
 $a->strings["%s user blocked/unblocked"] = [
 	0 => "%s uživatel blokován/odblokován",
 	1 => "%s uživatelů blokováno/odblokováno",
-	2 => "%s uživatelů blokováno/odblokováno",
+	2 => "%s uživatele blokováno/odblokováno",
 	3 => "%s uživatelů blokováno/odblokováno",
 ];
 $a->strings["%s user deleted"] = [
 	0 => "%s uživatel smazán",
 	1 => "%s uživatelů smazáno",
-	2 => "%s uživatelů smazáno",
+	2 => "%s uživatele smazáno",
 	3 => "%s uživatelů smazáno",
 ];
 $a->strings["User '%s' deleted"] = "Uživatel \"%s\" smazán";
@@ -1351,7 +1351,7 @@ $a->strings["New User"] = "Nový uživatel";
 $a->strings["Deleted since"] = "Smazán od";
 $a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Vybraní uživatelé budou smazáni!\\n\\n Vše, co tito uživatelé na těchto stránkách vytvořili, bude trvale odstraněno!\\n\\nOpravdu chcete pokračovat?";
 $a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Uživatel {0} bude smazán!\\n\\n Vše, co tento uživatel na těchto stránkách vytvořil, bude trvale odstraněno!\\n\\n Opravdu chcete pokračovat?";
-$a->strings["Name of the new user."] = "Jméno nového uživatele";
+$a->strings["Name of the new user."] = "Jméno nového uživatele.";
 $a->strings["Nickname"] = "Přezdívka";
 $a->strings["Nickname of the new user."] = "Přezdívka nového uživatele.";
 $a->strings["Email address of the new user."] = "Emailová adresa nového uživatele.";
@@ -1394,29 +1394,29 @@ $a->strings["Warning: profile location has no profile photo."] = "Varování: um
 $a->strings["%d required parameter was not found at the given location"] = [
 	0 => "%d požadovaný parametr nebyl nalezen na daném umístění",
 	1 => "%d požadované parametry nebyly nalezeny na daném umístění",
-	2 => "%d požadovaných parametrů nebylo nalezeno na daném umístění",
+	2 => "%d požadovaného parametru nebylo nalezeno na daném umístění",
 	3 => "%d požadovaných parametrů nebylo nalezeno na daném umístění",
 ];
 $a->strings["Introduction complete."] = "Představení dokončeno.";
 $a->strings["Unrecoverable protocol error."] = "Neopravitelná chyba protokolu";
 $a->strings["Profile unavailable."] = "Profil není k dispozici.";
-$a->strings["%s has received too many connection requests today."] = "%s dnes obdržel/a příliš mnoho požadavků o spojení";
+$a->strings["%s has received too many connection requests today."] = "%s dnes obdržel/a příliš mnoho požadavků o spojení.";
 $a->strings["Spam protection measures have been invoked."] = "Ochrana proti spamu byla aktivována";
 $a->strings["Friends are advised to please try again in 24 hours."] = "Přátelům se doporučuje to zkusit znovu za 24 hodin.";
 $a->strings["Invalid locator"] = "Neplatný odkaz";
-$a->strings["You have already introduced yourself here."] = "Již jste se zde zavedli.";
+$a->strings["You have already introduced yourself here."] = "Již jste se zde představil/a.";
 $a->strings["Apparently you are already friends with %s."] = "Zřejmě jste s %s již přátelé.";
 $a->strings["Invalid profile URL."] = "Neplatné URL profilu.";
 $a->strings["Disallowed profile URL."] = "Nepovolené URL profilu.";
 $a->strings["Failed to update contact record."] = "Nepodařilo se aktualizovat kontakt.";
 $a->strings["Your introduction has been sent."] = "Vaše žádost o propojení byla odeslána.";
 $a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "Vzdálený odběr nemůže být na Vaší síti proveden. Prosím, přihlaste se k odběru přímo na Vašem systému.";
-$a->strings["Please login to confirm introduction."] = "Prosím přihlašte se k potvrzení žádosti o propojení.";
-$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Jste přihlášeni pod nesprávnou identitou. Prosím, přihlaste se do <strong>tohoto</strong> profilu.";
+$a->strings["Please login to confirm introduction."] = "Pro ptvrzení představení se prosím přihlaste.";
+$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Jste přihlášen/a pod nesprávnou identitou. Prosím, přihlaste se do <strong>tohoto</strong> profilu.";
 $a->strings["Confirm"] = "Potvrdit";
 $a->strings["Hide this contact"] = "Skrýt tento kontakt";
 $a->strings["Welcome home %s."] = "Vítejte doma, %s.";
-$a->strings["Please confirm your introduction/connection request to %s."] = "Prosím potvrďte Vaši žádost o propojení %s.";
+$a->strings["Please confirm your introduction/connection request to %s."] = "Prosím potvrďte Váš požadavek o spojení uživateli %s.";
 $a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Prosím zadejte Vaši \"adresu identity\" jedné z následujících podporovaných komunikačních sítí:";
 $a->strings["If you are not yet a member of the free social web, <a href=\"%s\">follow this link to find a public Friendica site and join us today</a>."] = "Pokud ještě nejste členem svobodného sociálního webu, <a href=\"%s\">klikněte na tento odkaz, najděte si veřejný server Friendica a připojte se k nám ještě dnes</a>.";
 $a->strings["Friend/Connection Request"] = "Požadavek o přátelství/spojení";
@@ -1440,8 +1440,8 @@ $a->strings["Upload File:"] = "Nahrát soubor:";
 $a->strings["Select a profile:"] = "Vybrat profil:";
 $a->strings["Upload"] = "Nahrát";
 $a->strings["or"] = "nebo";
-$a->strings["skip this step"] = "přeskočit tento krok ";
-$a->strings["select a photo from your photo albums"] = "Vybrat fotografii z Vašich fotoalb";
+$a->strings["skip this step"] = "tento krok přeskočte";
+$a->strings["select a photo from your photo albums"] = "si vyberte fotku z Vašich fotoalb";
 $a->strings["Crop Image"] = "Oříznout obrázek";
 $a->strings["Please adjust the image cropping for optimum viewing."] = "Prosím, ořízněte tento obrázek pro optimální zobrazení.";
 $a->strings["Done Editing"] = "Upravování dokončeno";
@@ -1453,20 +1453,20 @@ $a->strings["File upload failed."] = "Nahrání souboru se nezdařilo.";
 $a->strings["Unable to locate original post."] = "Nelze nalézt původní příspěvek.";
 $a->strings["Empty post discarded."] = "Prázdný příspěvek odstraněn.";
 $a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Tuto zprávu Vám poslal/a %s, člen sociální sítě Friendica.";
-$a->strings["You may visit them online at %s"] = "Můžete je navštívit online na adrese %s";
-$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Pokud nechcete dostávat tyto zprávy, kontaktujte prosím odesilatele odpovědí na tento záznam.";
+$a->strings["You may visit them online at %s"] = "Můžete jej/ji navštívit online na adrese %s";
+$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Pokud nechcete dostávat tyto zprávy, kontaktujte prosím odesílatele odpovědí na tuto zprávu.";
 $a->strings["%s posted an update."] = "%s poslal/a aktualizaci.";
 $a->strings["Help:"] = "Nápověda:";
 $a->strings["Move account"] = "Přesunout účet";
 $a->strings["You can import an account from another Friendica server."] = "Můžete importovat účet z jiného serveru Friendica.";
-$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Musíte exportovat svůj účet na sterém serveru a nahrát ho zde. My následně vytvoříme Váš původní účet zde včetně všech kontaktů. Zároveň se pokusíme informovat všechny Vaše přátele, že jste se sem přestěhovali.";
+$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Musíte exportovat svůj účet na starém serveru a nahrát ho zde. My následně vytvoříme Váš původní účet zde včetně všech kontaktů. Zároveň se pokusíme informovat všechny Vaše přátele, že jste se sem přestěhoval/a.";
 $a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Tato vlastnost je experimentální. Nemůžeme importovat kontakty za sítě OStatus (GNU social/StatusNet) nebo z Diaspory";
 $a->strings["Account file"] = "Soubor s účtem";
-$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "K exportu Vašeho účtu, jděte do \"Nastavení->Export vašich osobních dat\" a zvolte \" Export účtu\"";
+$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "K exportu Vašeho účtu jděte do \"Nastavení->Export vašich osobních dat\" a zvolte \"Exportovat účet\"";
 $a->strings["Invalid profile identifier."] = "Neplatný identifikátor profilu.";
 $a->strings["Profile Visibility Editor"] = "Editor viditelnosti profilu ";
-$a->strings["Visible To"] = "Viditelný pro";
-$a->strings["All Contacts (with secure profile access)"] = "Všechny kontakty (se zabezpečeným přístupovým profilem )";
+$a->strings["Visible To"] = "Viditelný uživatelům";
+$a->strings["All Contacts (with secure profile access)"] = "Všem kontaktům (se zabezpečeným přístupem k profilu)";
 $a->strings["View"] = "Zobrazit";
 $a->strings["Previous"] = "Předchozí";
 $a->strings["today"] = "dnes";
@@ -1483,15 +1483,15 @@ $a->strings["Registration revoked for %s"] = "Registrace zrušena pro %s";
 $a->strings["Please login."] = "Přihlaste se, prosím.";
 $a->strings["Item not found"] = "Položka nenalezena";
 $a->strings["Edit post"] = "Upravit příspěvek";
-$a->strings["CC: email addresses"] = "skrytá kopie: e-mailové adresy";
+$a->strings["CC: email addresses"] = "Skrytá kopie: e-mailové adresy";
 $a->strings["Example: bob@example.com, mary@example.com"] = "Příklad: jan@priklad.cz, lucie@priklad.cz";
 $a->strings["Applications"] = "Aplikace";
 $a->strings["No installed applications."] = "Žádné nainstalované aplikace.";
 $a->strings["You must be logged in to use this module"] = "Pro používání tohoto modulu musíte být přihlášen/a";
 $a->strings["Source URL"] = "Zdrojová adresa URL";
 $a->strings["Friend suggestion sent."] = "Návrhy přátelství odeslány ";
-$a->strings["Suggest Friends"] = "Navrhněte přátelé";
-$a->strings["Suggest a friend for %s"] = "Navrhněte přátelé pro uživatele %s";
+$a->strings["Suggest Friends"] = "Navrhnout přátele";
+$a->strings["Suggest a friend for %s"] = "Navrhnout přítele pro uživatele %s";
 $a->strings["System down for maintenance"] = "Systém vypnut z důvodů údržby";
 $a->strings["Requested profile is not available."] = "Požadovaný profil není dostupný.";
 $a->strings["%s's timeline"] = "Časová osa uživatele %s";
@@ -1501,7 +1501,7 @@ $a->strings["No friends to display."] = "Žádní přátelé k zobrazení";
 $a->strings["%d contact edited."] = [
 	0 => "%d kontakt upraven",
 	1 => "%d kontakty upraveny",
-	2 => "%d kontaktů upraveno",
+	2 => "%d kontaktu upraveno",
 	3 => "%d kontaktů upraveno",
 ];
 $a->strings["Could not access contact record."] = "Nelze získat přístup k záznamu kontaktu.";
@@ -1523,11 +1523,11 @@ $a->strings["Private communications are not available for this contact."] = "Sou
 $a->strings["Never"] = "Nikdy";
 $a->strings["(Update was successful)"] = "(Aktualizace byla úspěšná)";
 $a->strings["(Update was not successful)"] = "(Aktualizace nebyla úspěšná)";
-$a->strings["Suggest friends"] = "Navrhněte přátelé";
+$a->strings["Suggest friends"] = "Navrhnout přátele";
 $a->strings["Network type: %s"] = "Typ sítě: %s";
 $a->strings["Communications lost with this contact!"] = "Komunikace s tímto kontaktem byla ztracena!";
 $a->strings["Fetch further information for feeds"] = "Načíst další informace pro kanál";
-$a->strings["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."] = "Načíst informace jako obrázky náhledu, nadpis a popisek z položky kanálu. Toto můžete aktivovat pokud kanál neobsahuje moc textu. Klíčová slova jsou vzata z hlavičky meta v položce kanálu a jsou zveřejněna jako hashtagy.";
+$a->strings["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."] = "Načíst informace jako obrázky náhledu, nadpis a popisek z položky kanálu. Toto můžete aktivovat, pokud kanál neobsahuje moc textu. Klíčová slova jsou vzata z hlavičky meta v položce kanálu a jsou zveřejněna jako hashtagy.";
 $a->strings["Fetch information"] = "Načíst informace";
 $a->strings["Fetch keywords"] = "Načíst klíčová slova";
 $a->strings["Fetch information and keywords"] = "Načíst informace a klíčová slova";
@@ -1550,14 +1550,14 @@ $a->strings["Currently blocked"] = "V současnosti zablokováno";
 $a->strings["Currently ignored"] = "V současnosti ignorováno";
 $a->strings["Currently archived"] = "Aktuálně archivován";
 $a->strings["Awaiting connection acknowledge"] = "Čekám na potrvzení spojení";
-$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Odpovědi/oblíbení na Vaše veřejné příspěvky <strong>mohou být</strong> stále viditelné";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Odpovědi/oblíbení na Vaše veřejné příspěvky <strong>mohou</strong> být stále viditelné";
 $a->strings["Notification for new posts"] = "Upozornění na nové příspěvky";
 $a->strings["Send a notification of every new post of this contact"] = "Poslat upozornění při každém novém příspěvku tohoto kontaktu";
 $a->strings["Blacklisted keywords"] = "Zakázaná klíčová slova";
-$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Čárkou oddělený seznam klíčových slov, které by neměly být převáděna na hashtagy, když je zvoleno \"Načíst informace a klíčová slova\"";
+$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Seznam klíčových slov, které by neměly být převáděna na hashtagy, když je zvoleno \"Načíst informace a klíčová slova\". Oddělujte čárkami";
 $a->strings["XMPP:"] = "XMPP:";
 $a->strings["Actions"] = "Akce";
-$a->strings["Suggestions"] = "Doporučení";
+$a->strings["Suggestions"] = "Návrhy";
 $a->strings["Suggest potential friends"] = "Navrhnout potenciální přátele";
 $a->strings["Show all contacts"] = "Zobrazit všechny kontakty";
 $a->strings["Unblocked"] = "Odblokován";
@@ -1628,11 +1628,11 @@ $a->strings["Global Community"] = "Globální komunita";
 $a->strings["Posts from users of the whole federated network"] = "Příspěvky od uživatelů z celé federované sítě";
 $a->strings["This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users."] = "Tento komunitní proud ukazuje všechny veřejné příspěvky, které tento server přijme. Nemusí odrážet názory uživatelů serveru.";
 $a->strings["l F d, Y \\@ g:i A"] = "l d. F, Y v g:i A";
-$a->strings["Time Conversion"] = "Časová konverze";
-$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica poskytuje tuto službu pro sdílení událostí s ostatními sítěmi a přáteli v neznámých časových zónách";
+$a->strings["Time Conversion"] = "Časový převod";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica poskytuje tuto službu ke sdílení událostí s ostatními sítěmi a přáteli v neznámých časových pásmech";
 $a->strings["UTC time: %s"] = "UTC čas: %s";
 $a->strings["Current timezone: %s"] = "Aktuální časové pásmo: %s";
-$a->strings["Converted localtime: %s"] = "Převedený lokální čas : %s";
+$a->strings["Converted localtime: %s"] = "Převedený místní čas : %s";
 $a->strings["Please select your timezone:"] = "Prosím, vyberte své časové pásmo:";
 $a->strings["Poke/Prod"] = "Šťouchnout/dloubnout";
 $a->strings["poke, prod or do other things to somebody"] = "někoho šťouchnout, dloubnout, nebo mu provést jinou věc";
@@ -1647,7 +1647,7 @@ $a->strings["%s : Message delivery failed."] = "%s : Doručení zprávy se nezda
 $a->strings["%d message sent."] = [
 	0 => "%d zpráva odeslána.",
 	1 => "%d zprávy odeslány.",
-	2 => "%d zpráv odesláno.",
+	2 => "%d zprávy odesláno.",
 	3 => "%d zpráv odesláno.",
 ];
 $a->strings["You have no more invitations available"] = "Nemáte k dispozici žádné další pozvánky";
@@ -1655,7 +1655,7 @@ $a->strings["Visit %s for a list of public sites that you can join. Friendica me
 $a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "K přijetí této pozvánky prosím navštivte a registrujte se na %s nebo na kterékoliv jiném veřejném Friendica serveru.";
 $a->strings["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. See %s for a list of alternate Friendica sites you can join."] = "Stránky Friendica jsou navzájem propojené a vytváří tak obrovský sociální web s dúrazem na soukromí, kterou vlastní a kontrojují její členové, Mohou se také připojit k mnoha tradičním socilním sítím. Navštivte %s pro seznam alternativních serverů Friendica, ke kterým se můžete přidat.";
 $a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Omlouváme se. Systém nyní není nastaven tak, aby se připojil k ostatním veřejným serverům nebo umožnil pozvat nové členy.";
-$a->strings["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."] = "Stránky Friendica jsou navzájem propojené a vytváří tak obrovský sociální web s dúrazem na soukromí, kterou vlastní a kontrojují její členové, Mohou se také připojit k mnoha tradičním socilním sítím.";
+$a->strings["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."] = "Stránky Friendica jsou navzájem propojené a vytváří tak obrovský sociální web s dúrazem na soukromí, kterou vlastní a kontrolují její členové. Mohou se také připojit k mnoha tradičním sociálním sítím.";
 $a->strings["To accept this invitation, please visit and register at %s."] = "Pokud chcete tuto pozvánku přijmout, prosím navštivte %s a registrujte se tam.";
 $a->strings["Send invitations"] = "Poslat pozvánky";
 $a->strings["Enter email addresses, one per line:"] = "Zadejte e-mailové adresy, jednu na řádek:";
@@ -1702,14 +1702,14 @@ $a->strings["Relation"] = "Vztah";
 $a->strings["Miscellaneous"] = "Různé";
 $a->strings["Your Gender:"] = "Vaše pohlaví:";
 $a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Rodinný stav:";
-$a->strings["Sexual Preference:"] = "Sexuální preference:";
+$a->strings["Sexual Preference:"] = "Sexuální orientace:";
 $a->strings["Example: fishing photography software"] = "Příklad: rybaření fotografování software";
 $a->strings["Profile Name:"] = "Jméno profilu:";
 $a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Toto je váš <strong>veřejný</strong> profil.<br />Ten <strong>může</strong> být viditelný kýmkoliv na internetu.";
 $a->strings["Your Full Name:"] = "Vaše celé jméno:";
 $a->strings["Title/Description:"] = "Název / Popis:";
 $a->strings["Street Address:"] = "Ulice:";
-$a->strings["Locality/City:"] = "Lokalita/Město:";
+$a->strings["Locality/City:"] = "Poloha/město:";
 $a->strings["Region/State:"] = "Region / stát:";
 $a->strings["Postal/Zip Code:"] = "PSČ:";
 $a->strings["Country:"] = "Země:";
@@ -1718,10 +1718,10 @@ $a->strings["Who: (if applicable)"] = "Kdo: (pokud je možné)";
 $a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Příklady: jan123, Jan Novák, jan@priklad.cz";
 $a->strings["Since [date]:"] = "Od [data]:";
 $a->strings["Tell us about yourself..."] = "Řekněte nám něco o sobě ...";
-$a->strings["XMPP (Jabber) address:"] = "Adresa pro XMPP (Jabber)";
-$a->strings["The XMPP address will be propagated to your contacts so that they can follow you."] = "Adresa XMPP bude rozšířena mezi Vašimi kontakty, aby vás mohly sledovat.";
+$a->strings["XMPP (Jabber) address:"] = "Adresa XMPP (Jabber):";
+$a->strings["The XMPP address will be propagated to your contacts so that they can follow you."] = "Adresa XMPP bude rozšířena mezi Vašemi kontakty, aby vás mohly sledovat.";
 $a->strings["Homepage URL:"] = "Odkaz na domovskou stránku:";
-$a->strings["Hometown:"] = "Rodné město";
+$a->strings["Hometown:"] = "Rodné město:";
 $a->strings["Political Views:"] = "Politické přesvědčení:";
 $a->strings["Religious Views:"] = "Náboženské přesvědčení:";
 $a->strings["Public Keywords:"] = "Veřejná klíčová slova:";
@@ -1763,7 +1763,7 @@ $a->strings["No photos selected"] = "Není vybrána žádná fotka";
 $a->strings["Upload Photos"] = "Nahrát fotky";
 $a->strings["New album name: "] = "Název nového alba: ";
 $a->strings["or select existing album:"] = "nebo si vyberte existující album:";
-$a->strings["Do not show a status post for this upload"] = "Nezobrazovat stav pro toto nahrání";
+$a->strings["Do not show a status post for this upload"] = "Nezobrazovat pro toto nahrání stavový příspěvek";
 $a->strings["Edit Album"] = "Upravit album";
 $a->strings["Show Newest First"] = "Zobrazit nejprve nejnovější:";
 $a->strings["Show Oldest First"] = "Zobrazit nejprve nejstarší:";
@@ -1782,8 +1782,8 @@ $a->strings["Caption"] = "Titulek";
 $a->strings["Add a Tag"] = "Přidat štítek";
 $a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Příklad: @jan, @Lucie_Nováková, @jakub@priklad.cz, #Morava, #taboreni";
 $a->strings["Do not rotate"] = "Neotáčet";
-$a->strings["Rotate CW (right)"] = "Rotovat po směru hodinových ručiček (doprava)";
-$a->strings["Rotate CCW (left)"] = "Rotovat proti směru hodinových ručiček (doleva)";
+$a->strings["Rotate CW (right)"] = "Otáčet po směru hodinových ručiček (doprava)";
+$a->strings["Rotate CCW (left)"] = "Otáčet proti směru hodinových ručiček (doleva)";
 $a->strings["I like this (toggle)"] = "Líbí se mi to (přepínač)";
 $a->strings["I don't like this (toggle)"] = "Nelíbí se mi to (přepínač)";
 $a->strings["Comment"] = "Okomentovat";
@@ -1807,42 +1807,42 @@ $a->strings["Command line PHP"] = "Příkazový řádek PHP";
 $a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "PHP executable není php cli binary (může být verze cgi-fgci)";
 $a->strings["Found PHP version: "] = "Nalezena PHP verze:";
 $a->strings["PHP cli binary"] = "PHP cli binary";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Verze PHP pro příkazový řádek na Vašem systému nemá povolen \"register_argc_argv\".";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Verze PHP pro příkazový řádek na Vašem systému nemá povoleno nastavení \"register_argc_argv\".";
 $a->strings["This is required for message delivery to work."] = "Toto je nutné pro fungování doručování zpráv.";
 $a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
 $a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Chyba: funkce \"openssl_pkey_new\" na tomto systému není schopna generovat šifrovací klíče";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Pokud systém běží na Windows, seznamte se s \"http://www.php.net/manual/en/openssl.installation.php\".";
-$a->strings["Generate encryption keys"] = "Generovat kriptovací klíče";
-$a->strings["libCurl PHP module"] = "libCurl PHP modul";
-$a->strings["GD graphics PHP module"] = "GD graphics PHP modul";
-$a->strings["OpenSSL PHP module"] = "OpenSSL PHP modul";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Pokud systém běží na Windows, prosím přečtěte si \"http://www.php.net/manual/en/openssl.installation.php\".";
+$a->strings["Generate encryption keys"] = "Generovat šifrovací klíče";
+$a->strings["libCurl PHP module"] = "PHP modul libCurl";
+$a->strings["GD graphics PHP module"] = "PHP modul GD graphics";
+$a->strings["OpenSSL PHP module"] = "PHP modul OpenSSL";
 $a->strings["PDO or MySQLi PHP module"] = "PHP modul PDO nebo MySQLi";
-$a->strings["mb_string PHP module"] = "mb_string PHP modul";
+$a->strings["mb_string PHP module"] = "PHP modul mb_string";
 $a->strings["XML PHP module"] = "PHP modul XML";
 $a->strings["iconv PHP module"] = "PHP modul iconv";
 $a->strings["POSIX PHP module"] = "PHP modul POSIX";
-$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite modul";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Chyba: Požadovaný Apache webserver mod-rewrite modul není nainstalován.";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Chyba: požadovaný libcurl PHP modul není nainstalován.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Chyba: požadovaný GD graphics PHP modul není nainstalován.";
-$a->strings["Error: openssl PHP module required but not installed."] = "Chyba: požadovaný openssl PHP modul není nainstalován.";
-$a->strings["Error: PDO or MySQLi PHP module required but not installed."] = "Chyba: PHP modul PDO nebo MySQLi je vyžadován ale není nainstalován.";
+$a->strings["Apache mod_rewrite module"] = "Modul Apache mod_rewrite";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Chyba: Modul mod_rewrite webového serveru Apache je vyadován, ale není nainstalován.";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Chyba: PHP modul libcurl je vyžadován, ale není nainstalován.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Chyba: PHP modul GD graphics je vyžadován, ale není nainstalován.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Chyba: PHP modul openssl je vyžadován, ale není nainstalován.";
+$a->strings["Error: PDO or MySQLi PHP module required but not installed."] = "Chyba: PHP modul PDO nebo MySQLi je vyžadován, ale není nainstalován.";
 $a->strings["Error: The MySQL driver for PDO is not installed."] = "Chyba: Ovladač MySQL pro PDO není nainstalován";
 $a->strings["Error: mb_string PHP module required but not installed."] = "Chyba: PHP modul mb_string  je vyžadován, ale není nainstalován.";
-$a->strings["Error: iconv PHP module required but not installed."] = "Chyba: PHP modul iconv je vyžadován ale není nainstalován";
-$a->strings["Error: POSIX PHP module required but not installed."] = "Chyba: PHP modul POSIX je vyžadován ale není nainstalován.";
-$a->strings["Error, XML PHP module required but not installed."] = "Chyba: PHP modul XML je vyžadován ale není nainstalován";
+$a->strings["Error: iconv PHP module required but not installed."] = "Chyba: PHP modul iconv je vyžadován, ale není nainstalován";
+$a->strings["Error: POSIX PHP module required but not installed."] = "Chyba: PHP modul POSIX je vyžadován, ale není nainstalován.";
+$a->strings["Error, XML PHP module required but not installed."] = "Chyba: PHP modul XML je vyžadován, ale není nainstalován";
 $a->strings["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."] = "Webový instalátor musí být schopen vytvořit soubor s názvem \"local.ini.php\" v adresáři \"config\" Vašeho webového serveru, ale nyní mu to není umožněno. ";
 $a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Toto je nejčastěji nastavením oprávnění, kdy webový server nemusí být schopen zapisovat soubory do vašeho adresáře - i když Vy můžete.";
-$a->strings["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."] = "Na konci této procedury od nás obdržíte text k uložení v souboru pojmenovaném local.ini.php ve Vašem kořenovém adresáři Friendica. ";
+$a->strings["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."] = "Na konci této procedury od nás obdržíte text k uložení v souboru pojmenovaném local.ini.php v adresáři \"config\" na Vaší instalaci Friendica.";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativně můžete tento krok přeskočit a provést manuální instalaci. Přečtěte si prosím soubor \"INSTALL.txt\" pro další instrukce.";
-$a->strings["config/local.ini.php is writable"] = "Do souboru config/local.ini.php lze zapisovat";
-$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica používá šablonovací nástroj Smarty3 pro zobrazení svých weobvých stránek. Smarty3 kompiluje šablony do PHP pro zrychlení vykreslování.";
-$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Pro uložení kompilovaných šablon, webový server potřebuje mít přístup k zápisu do adresáře view/smarty3/ pod hlavním adresářem instalace Friendica";
-$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "prosím ujistěte se, že uživatel web serveru (jako například www-data) má právo zápisu do tohoto adresáře";
-$a->strings["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."] = "Poznámka: jako bezpečnostní opatření, přidělte právo zápisu pouze k adresáři /view/smarty3/ a nikoliv už k souborům s šablonami (.tpl), které obsahuje.";
-$a->strings["view/smarty3 is writable"] = "view/smarty3 je nastaven pro zápis";
-$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "Url rewrite v .htconfig nefunguje. Prověřte prosím Vaše nastavení serveru.";
+$a->strings["config/local.ini.php is writable"] = "Soubor config/local.ini.php je zapisovatelný";
+$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica používá k zobrazení svých webových stránek šablonovací nástroj Smarty3. Smarty3 kompiluje šablony do PHP pro zrychlení vykreslování.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Pro uložení kompilovaných šablon potřebuje webový server mít přístup k zápisu do adresáře view/smarty3/ pod kořenovým adresářem Friendica.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Prosím ujistěte se, že má uživatel webového serveru (jako například www-data) právo zápisu do tohoto adresáře";
+$a->strings["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."] = "Poznámka: jako bezpečnostní opatření byste měl/a přidělit webovém serveru právo zápisu pouze do adresáře /view/smarty3/ -- a nikoliv už do souborů s šablonami (.tpl), které obsahuje.";
+$a->strings["view/smarty3 is writable"] = "Adresář view/smarty3 je zapisovatelný";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "Funkce URL rewrite v souboru .htaccess nefunguje. Prověřte prosím Vaše nastavení serveru.";
 $a->strings["Error message from Curl when fetching"] = "Chybová zpráva od Curl při načítání";
 $a->strings["Url rewrite is working"] = "Url rewrite je funkční.";
 $a->strings["ImageMagick PHP extension is not installed"] = "PHP rozšíření ImageMagick není nainstalováno";
@@ -1881,7 +1881,7 @@ $a->strings["User profile creation error"] = "Chyba vytváření uživatelského
 $a->strings["%d contact not imported"] = [
 	0 => "%d kontakt nenaimportován",
 	1 => "%d kontakty nenaimportovány",
-	2 => "%d kontaktů nenaimportováno",
+	2 => "%d kontaktu nenaimportováno",
 	3 => "%d kontaktů nenaimportováno",
 ];
 $a->strings["Done. You can now login with your username and password"] = "Hotovo. Nyní  se můžete přihlásit se svým uživatelským jménem a heslem";
@@ -1912,7 +1912,7 @@ $a->strings["via Wall-To-Wall:"] = "ze zdi na zeď";
 $a->strings["%d comment"] = [
 	0 => "%d komentář",
 	1 => "%d komentáře",
-	2 => "%d komentářů",
+	2 => "%d komentáře",
 	3 => "%d komentářů",
 ];
 $a->strings["Bold"] = "Tučné";
@@ -1931,13 +1931,13 @@ $a->strings["We encountered a problem while logging in with the OpenID you provi
 $a->strings["The error message was:"] = "Chybová zpráva byla:";
 $a->strings["Create a New Account"] = "Vytvořit nový účet";
 $a->strings["Password: "] = "Heslo: ";
-$a->strings["Remember me"] = "Pamatuj si mne";
+$a->strings["Remember me"] = "Pamatovat si mě";
 $a->strings["Or login using OpenID: "] = "Nebo se přihlaste pomocí OpenID: ";
 $a->strings["Forgot your password?"] = "Zapomněl/a jste heslo?";
 $a->strings["Website Terms of Service"] = "Podmínky používání stránky";
 $a->strings["terms of service"] = "podmínky používání";
-$a->strings["Website Privacy Policy"] = "Pravidla ochrany soukromí serveru";
-$a->strings["privacy policy"] = "ochrana soukromí";
+$a->strings["Website Privacy Policy"] = "Zásady soukromí serveru";
+$a->strings["privacy policy"] = "zásady soukromí";
 $a->strings["At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node's user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication."] = "Ve chvíli registrace, a pro poskytování komunikace mezi uživatelským účtem a jeho kontakty, musí uživatel poskytnout zobrazované jméno (pseudonym), uživatelské jméno (přezdívku) a funkční e-mailovou adresu. Jména budou dostupná na profilové stránce účtu pro kteréhokoliv návštěvníka, i kdyby ostatní detaily nebyly zobrazeny. E-mailová adresa bude použita pouze pro zasílání oznámení o interakcích, nebude ale viditelně zobrazována. Zápis účtu do adresáře účtů serveru nebo globálního adresáře účtů je nepovinný a může být ovládán v nastavení uživatele, není potřebný pro komunikaci.";
 $a->strings["This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts."] = "Tato data jsou vyžadována ke komunikaci a jsou předávána serverům komunikačních partnerů a jsou tam ukládána. Uživatelé mohou zadávat dodatečná soukromá data, která mohou být odeslána na účty komunikačních partnerů.";
 $a->strings["At any point in time a logged in user can export their account data from the <a href=\"%1\$s/settings/uexport\">account settings</a>. If the user wants to delete their account they can do so at <a href=\"%1\$s/removeme\">%1\$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners."] = "Přihlášený uživatel si kdykoliv může exportovat svoje data účtu z <a href=\"%1\$s/settings/uexport\">nastavení účtu</a>. Pokud by chtěl uživatel svůj účet smazat, může tak učinit na stránce <a href=\"%1\$s/removeme\">%1\$s/removeme</a>. Smazání účtu bude trvalé. Na serverech komunikačních partnerů bude zároveň vyžádáno smazání dat.";
@@ -1954,16 +1954,16 @@ $a->strings["Birthday:"] = "Narozeniny:";
 $a->strings["YYYY-MM-DD or MM-DD"] = "RRRR-MM-DD nebo MM-DD";
 $a->strings["never"] = "nikdy";
 $a->strings["less than a second ago"] = "méně než před sekundou";
-$a->strings["year"] = "rokem";
-$a->strings["years"] = "lety";
-$a->strings["months"] = "měsíci";
-$a->strings["weeks"] = "týdny";
-$a->strings["days"] = "dny";
-$a->strings["hour"] = "hodinou";
-$a->strings["hours"] = "hodinami";
-$a->strings["minute"] = "minutou";
-$a->strings["minutes"] = "minutami";
-$a->strings["second"] = "sekundou";
+$a->strings["year"] = "rok";
+$a->strings["years"] = "let";
+$a->strings["months"] = "měsíců";
+$a->strings["weeks"] = "týdnů";
+$a->strings["days"] = "dní";
+$a->strings["hour"] = "hodina";
+$a->strings["hours"] = "hodin";
+$a->strings["minute"] = "minuta";
+$a->strings["minutes"] = "minut";
+$a->strings["second"] = "sekunda";
 $a->strings["seconds"] = "sekund";
 $a->strings["%1\$d %2\$s ago"] = "před %1\$d %2\$s";
 $a->strings["[no subject]"] = "[bez předmětu]";
@@ -1995,11 +1995,11 @@ $a->strings["Duplicate event"] = "Duplikovat událost";
 $a->strings["Delete event"] = "Smazat událost";
 $a->strings["D g:i A"] = "D g:i A";
 $a->strings["g:i A"] = "g:i A";
-$a->strings["Show map"] = "Ukázat mapu";
+$a->strings["Show map"] = "Zobrazit mapu";
 $a->strings["Hide map"] = "Skrýt mapu";
 $a->strings["Login failed"] = "Přihlášení selhalo";
 $a->strings["Not enough information to authenticate"] = "Není dost informací pro autentikaci";
-$a->strings["An invitation is required."] = "Pozvánka je vyžadována.";
+$a->strings["An invitation is required."] = "Je vyžadována pozvánka.";
 $a->strings["Invitation could not be verified."] = "Pozvánka nemohla být ověřena.";
 $a->strings["Invalid OpenID url"] = "Neplatný odkaz OpenID";
 $a->strings["Please enter the required information."] = "Zadejte prosím požadované informace.";
@@ -2021,7 +2021,7 @@ $a->strings["An error occurred creating your default contact group. Please try a
 $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\t\t"] = "\n\t\t\tVážený/á %1\$s,\n\t\t\t\tDěkujeme, že jste se registroval/a na %2\$s. Váš účet čeká na schválení administrátora.\n\t\t";
 $a->strings["Registration at %s"] = "Registrace na %s";
 $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "\n\t\t\tVážený/á %1\$s,\n\t\t\t\tDěkujeme, že jste se registroval/a na %2\$s. Váš účet byl vytvořen.\n\t\t";
-$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "\n\t\t\tZde jsou vaše přihlašovací detaily:\n\n\t\t\tAdresa stránky:\t\t%3\$s\n\t\t\tPřihlašovací jméno:\t%1\$s\n\t\t\tHeslo:\t\t\t%5\$s\n\n\t\t\tSvé heslo si po přihlášení můžete změnit na stránce \"Nastavení\" vašeho\n\t\t\túčtu.\n\n\t\t\tProsím, prohlédněte si na chvilku ostatní nastavení účtu na té stránce.\n\n\t\t\tMožná byste si také přáli přidat pár základních informací na svůj výchozí\n\t\t\tprofil (na stránce \"Profily\") aby vás další lidé mohli snadno najít.\n\n\t\t\tDoporučujeme nastavit si vaše celé jméno, přidat profilovou fotku,\n\t\t\tpřidat pár \"klíčových slov\" k profilu (velmi užitečné při získávání nových\n\t\t\tpřátel) - a možná v jaké zemi žijete; pokud nechcete být konkrétnější.\n\n\t\t\tZcela respektujeme vaše právo na soukromí a žádnou z těchto položek\n\t\t\tnení potřeba vyplňovat. Pokud jste zde nový/á a nikoho zde neznáte, mohou vám\n\t\t\tpomoci si získat nové a zajímavé přátele.\n\n\t\t\tPokud byste si někdy přál/a smazat účet, může tak učinit na stránce\n\t\t\t%3\$s/removeme.\n\n\t\t\tDěkujeme vám a vítáme vás na %2\$s.";
+$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "\n\t\t\tZde jsou Vaše přihlašovací detaily:\n\n\t\t\tAdresa stránky:\t\t%3\$s\n\t\t\tPřihlašovací jméno:\t%1\$s\n\t\t\tHeslo:\t\t\t%5\$s\n\n\t\t\tSvé heslo si po přihlášení můžete změnit na stránce \"Nastavení\" vašeho\n\t\t\túčtu.\n\n\t\t\tProsím, prohlédněte si na chvilku ostatní nastavení účtu na této stránce.\n\n\t\t\tMožná byste si také přál/a přidat pár základních informací na svůj výchozí\n\t\t\tprofil (na stránce \"Profily\") aby vás další lidé mohli snadno najít.\n\t\t\tDoporučujeme nastavit si Vaše celé jméno, přidat profilovou fotku,\n\t\t\tpřidat pár \"klíčových slov\" k profilu (velmi užitečné při získávání nových\n\t\t\tpřátel) - a možná v jaké zemi žijete; pokud nechcete být konkrétnější.\n\n\t\t\tZcela respektujeme Vaše právo na soukromí a žádnou z těchto položek\n\t\t\tnení potřeba vyplňovat. Pokud jste zde nový/á a nikoho zde neznáte, mohou vám\n\t\t\tpomoci si získat nové a zajímavé přátele.\n\t\t\tPokud byste si někdy přál/a smazat účet, můžete tak učinit na stránce\n\t\t\t%3\$s/removeme.\n\n\t\t\tDěkujeme Vám a vítáme Vás na %2\$s.";
 $a->strings["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."] = "Dříve smazaná skupina s tímto jménem byla obnovena. Stávající oprávnění <strong>může</strong> ovlivnit tuto skupinu a její budoucí členy. Pokud to není to, co jste chtěli, vytvořte, prosím, další skupinu s jiným názvem.";
 $a->strings["Default privacy group for new contacts"] = "Výchozí soukromá skupina pro nové kontakty.";
 $a->strings["Everybody"] = "Všichni";
@@ -2045,7 +2045,7 @@ $a->strings["Member since:"] = "Členem od:";
 $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
 $a->strings["Age:"] = "Věk:";
-$a->strings["for %1\$d %2\$s"] = "pro %1\$d %2\$s";
+$a->strings["for %1\$d %2\$s"] = "%1\$d %2\$s";
 $a->strings["Religion:"] = "Náboženství:";
 $a->strings["Hobbies/Interests:"] = "Koníčky/zájmy:";
 $a->strings["Contact information and Social Networks:"] = "Kontaktní informace a sociální sítě:";
@@ -2066,7 +2066,7 @@ $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Příklad
 $a->strings["%d invitation available"] = [
 	0 => "%d pozvánka k dispozici",
 	1 => "%d pozvánky k dispozici",
-	2 => "%d pozvánek k dispozici",
+	2 => "%d pozvánky k dispozici",
 	3 => "%d pozvánek k dispozici",
 ];
 $a->strings["Networks"] = "Sítě";
@@ -2075,10 +2075,10 @@ $a->strings["Saved Folders"] = "Uložené složky";
 $a->strings["Everything"] = "Všechno";
 $a->strings["Categories"] = "Kategorie";
 $a->strings["%d contact in common"] = [
-	0 => "%d sdílený kontakt",
-	1 => "%d sdílených kontaktů",
-	2 => "%d sdílených kontaktů",
-	3 => "%d sdílených kontaktů",
+	0 => "%d společný kontakt",
+	1 => "%d společné kontakty",
+	2 => "%d společného kontaktu",
+	3 => "%d společných kontaktů",
 ];
 $a->strings["Frequently"] = "Často";
 $a->strings["Hourly"] = "Hodinově";
@@ -2096,12 +2096,12 @@ $a->strings["Google+"] = "Google+";
 $a->strings["pump.io"] = "pump.io";
 $a->strings["Twitter"] = "Twitter";
 $a->strings["Diaspora Connector"] = "Diaspora Connector";
-$a->strings["GNU Social Connector"] = "GNU Social Connector";
+$a->strings["GNU Social Connector"] = "GNU social Connector";
 $a->strings["pnut"] = "pnut";
 $a->strings["Male"] = "Muž";
 $a->strings["Female"] = "Žena";
-$a->strings["Currently Male"] = "V současné době muž";
-$a->strings["Currently Female"] = "V současné době žena";
+$a->strings["Currently Male"] = "V současnosti muž";
+$a->strings["Currently Female"] = "V současnosti žena";
 $a->strings["Mostly Male"] = "Z větší části muž";
 $a->strings["Mostly Female"] = "Z větší části žena";
 $a->strings["Transgender"] = "Transgender";
@@ -2124,35 +2124,35 @@ $a->strings["Deviant"] = "Deviant";
 $a->strings["Fetish"] = "Fetišista";
 $a->strings["Oodles"] = "Hodně";
 $a->strings["Nonsexual"] = "Nesexuální";
-$a->strings["Single"] = "Svobodný";
-$a->strings["Lonely"] = "Osamnělý";
-$a->strings["Available"] = "Dostupný";
-$a->strings["Unavailable"] = "Nedostupný";
-$a->strings["Has crush"] = "Zamilovaný";
-$a->strings["Infatuated"] = "Zabouchnutý";
-$a->strings["Dating"] = "Seznamující se";
-$a->strings["Unfaithful"] = "Nevěrný";
-$a->strings["Sex Addict"] = "Závislý na sexu";
-$a->strings["Friends/Benefits"] = "Přátelé / výhody";
+$a->strings["Single"] = "Svobodný/á";
+$a->strings["Lonely"] = "Osamělý/á";
+$a->strings["Available"] = "Dostupný/á";
+$a->strings["Unavailable"] = "Nedostupný/á";
+$a->strings["Has crush"] = "Zamilovaný/á";
+$a->strings["Infatuated"] = "Zabouchnutý/á";
+$a->strings["Dating"] = "Chodím s někým";
+$a->strings["Unfaithful"] = "Nevěrný/á";
+$a->strings["Sex Addict"] = "Posedlý/á sexem";
+$a->strings["Friends/Benefits"] = "Přátelé/výhody";
 $a->strings["Casual"] = "Ležérní";
-$a->strings["Engaged"] = "Zadaný";
+$a->strings["Engaged"] = "Zadaný/á";
 $a->strings["Married"] = "Ženatý/vdaná";
 $a->strings["Imaginarily married"] = "Pomyslně ženatý/vdaná";
 $a->strings["Partners"] = "Partneři";
-$a->strings["Cohabiting"] = "Žijící ve společné domácnosti";
+$a->strings["Cohabiting"] = "Žiji ve společné domácnosti";
 $a->strings["Common law"] = "Zvykové právo";
-$a->strings["Happy"] = "Šťastný";
+$a->strings["Happy"] = "Šťastný/á";
 $a->strings["Not looking"] = "Nehledající";
 $a->strings["Swinger"] = "Swinger";
-$a->strings["Betrayed"] = "Zrazen";
-$a->strings["Separated"] = "Odloučený";
-$a->strings["Unstable"] = "Nestálý";
-$a->strings["Divorced"] = "Rozvedený(á)";
-$a->strings["Imaginarily divorced"] = "Pomyslně rozvedený";
-$a->strings["Widowed"] = "Ovdovělý(á)";
-$a->strings["Uncertain"] = "Nejistý";
+$a->strings["Betrayed"] = "Zrazen/a";
+$a->strings["Separated"] = "Odloučený/á";
+$a->strings["Unstable"] = "Nestálý/á";
+$a->strings["Divorced"] = "Rozvedený/á";
+$a->strings["Imaginarily divorced"] = "Pomyslně rozvedený/á";
+$a->strings["Widowed"] = "Ovdovělý/á";
+$a->strings["Uncertain"] = "Nejistý/á";
 $a->strings["It's complicated"] = "Je to složité";
-$a->strings["Don't care"] = "Nezajímá";
+$a->strings["Don't care"] = "Nezájem";
 $a->strings["Ask me"] = "Zeptej se mě";
 $a->strings["General Features"] = "Obecné vlastnosti";
 $a->strings["Multiple Profiles"] = "Vícenásobné profily";
@@ -2164,7 +2164,7 @@ $a->strings["Ability for visitors to download the public calendar"] = "Umožnit
 $a->strings["Post Composition Features"] = "Nastavení vytváření příspěvků";
 $a->strings["Post Preview"] = "Náhled příspěvku";
 $a->strings["Allow previewing posts and comments before publishing them"] = "Povolit náhledy příspěvků a komentářů před jejich zveřejněním";
-$a->strings["Auto-mention Forums"] = "Automaticky zmínit fóra";
+$a->strings["Auto-mention Forums"] = "Automaticky zmiňovat fóra";
 $a->strings["Add/remove mention when a forum page is selected/deselected in ACL window."] = "Přidat/odstranit zmínku, když je stránka na fóru označena/odznačena v okně ACL.";
 $a->strings["Network Sidebar"] = "Síťová postranní lišta";
 $a->strings["Ability to select posts by date ranges"] = "Možnost označit příspěvky dle časového intervalu";
@@ -2238,10 +2238,10 @@ $a->strings["Export"] = "Exportovat";
 $a->strings["Export calendar as ical"] = "Exportovat kalendář jako ical";
 $a->strings["Export calendar as csv"] = "Exportovat kalendář jako csv";
 $a->strings["Embedding disabled"] = "Vkládání zakázáno";
-$a->strings["Embedded content"] = "vložený obsah";
+$a->strings["Embedded content"] = "Vložený obsah";
 $a->strings["view full size"] = "zobrazit v plné velikosti";
 $a->strings["Image/photo"] = "Obrázek/fotka";
 $a->strings["$1 wrote:"] = "$1 napsal/a:";
 $a->strings["Encrypted content"] = "Šifrovaný obsah";
-$a->strings["Invalid source protocol"] = "Neplatný zdrojový protocol";
-$a->strings["Invalid link protocol"] = "Neplatný linkový protokol";
+$a->strings["Invalid source protocol"] = "Neplatný protokol zdroje";
+$a->strings["Invalid link protocol"] = "Neplatný protokol odkazu";

From 9927e7a7bf678b3d640bc31dcfad371ee8287592 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 17 Sep 2018 19:43:06 +0200
Subject: [PATCH 80/96] update to the zh-cn translation THX  tomacat

---
 view/lang/zh-cn/messages.po | 12668 +++++++++++++++++-----------------
 view/lang/zh-cn/strings.php |  2478 +++----
 2 files changed, 7627 insertions(+), 7519 deletions(-)

diff --git a/view/lang/zh-cn/messages.po b/view/lang/zh-cn/messages.po
index 5c32e3b154..b6de382591 100644
--- a/view/lang/zh-cn/messages.po
+++ b/view/lang/zh-cn/messages.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the Friendica package.
 # 
 # Translators:
+# tomacat <hexuxin@foxmail.com>, 2018
 # Matthew Exon <transifex.mexon@spamgourmet.com>, 2013-2015
 # Mike Macgirvin, 2010
 # mytbk <mytbk920423@gmail.com>, 2017
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-02 08:49+0200\n"
-"PO-Revision-Date: 2018-06-15 15:19+0000\n"
-"Last-Translator: 朱陈锬 <tangenters@outlook.com>\n"
+"POT-Creation-Date: 2018-08-25 15:34+0000\n"
+"PO-Revision-Date: 2018-09-08 06:12+0000\n"
+"Last-Translator: tomacat <hexuxin@foxmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/Friendica/friendica/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,250 +24,1165 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: include/enotify.php:31
+#: index.php:261 mod/apps.php:14
+msgid "You must be logged in to use addons. "
+msgstr "您用插件前要登录"
+
+#: index.php:308 mod/fetch.php:20 mod/fetch.php:47 mod/fetch.php:54
+#: mod/help.php:62
+msgid "Not Found"
+msgstr "未发现"
+
+#: index.php:313 mod/viewcontacts.php:35 mod/dfrn_poll.php:486 mod/help.php:65
+#: mod/cal.php:44
+msgid "Page not found."
+msgstr "页发现。"
+
+#: index.php:431 mod/group.php:83 mod/profperm.php:29
+msgid "Permission denied"
+msgstr "权限不够"
+
+#: index.php:432 include/items.php:412 mod/crepair.php:100
+#: mod/wallmessage.php:16 mod/wallmessage.php:40 mod/wallmessage.php:79
+#: mod/wallmessage.php:103 mod/dfrn_confirm.php:66 mod/dirfind.php:27
+#: mod/manage.php:131 mod/settings.php:43 mod/settings.php:149
+#: mod/settings.php:665 mod/common.php:28 mod/network.php:34 mod/group.php:26
+#: mod/delegate.php:27 mod/delegate.php:45 mod/delegate.php:56
+#: mod/repair_ostatus.php:16 mod/viewcontacts.php:60 mod/unfollow.php:17
+#: mod/unfollow.php:59 mod/unfollow.php:93 mod/register.php:53
+#: mod/notifications.php:67 mod/message.php:60 mod/message.php:105
+#: mod/ostatus_subscribe.php:17 mod/nogroup.php:23 mod/suggest.php:61
+#: mod/wall_upload.php:104 mod/wall_upload.php:107 mod/api.php:35
+#: mod/api.php:40 mod/profile_photo.php:29 mod/profile_photo.php:176
+#: mod/profile_photo.php:198 mod/wall_attach.php:80 mod/wall_attach.php:83
+#: mod/item.php:166 mod/uimport.php:28 mod/cal.php:306 mod/regmod.php:108
+#: mod/editpost.php:19 mod/fsuggest.php:80 mod/allfriends.php:23
+#: mod/contacts.php:381 mod/events.php:193 mod/follow.php:54
+#: mod/follow.php:118 mod/attach.php:39 mod/poke.php:145 mod/invite.php:21
+#: mod/invite.php:112 mod/notes.php:32 mod/profiles.php:179
+#: mod/profiles.php:511 mod/photos.php:183 mod/photos.php:1065
+msgid "Permission denied."
+msgstr "权限不够。"
+
+#: index.php:460
+msgid "toggle mobile"
+msgstr "切换移动设备"
+
+#: view/theme/duepuntozero/config.php:54 src/Model/User.php:544
+msgid "default"
+msgstr "默认"
+
+#: view/theme/duepuntozero/config.php:55
+msgid "greenzero"
+msgstr "greenzero"
+
+#: view/theme/duepuntozero/config.php:56
+msgid "purplezero"
+msgstr "purplezero"
+
+#: view/theme/duepuntozero/config.php:57
+msgid "easterbunny"
+msgstr "easterbunny"
+
+#: view/theme/duepuntozero/config.php:58
+msgid "darkzero"
+msgstr "darkzero"
+
+#: view/theme/duepuntozero/config.php:59
+msgid "comix"
+msgstr "comix"
+
+#: view/theme/duepuntozero/config.php:60
+msgid "slackr"
+msgstr "slackr"
+
+#: view/theme/duepuntozero/config.php:71 view/theme/quattro/config.php:73
+#: view/theme/vier/config.php:119 view/theme/frio/config.php:118
+#: mod/crepair.php:150 mod/install.php:206 mod/install.php:244
+#: mod/manage.php:184 mod/message.php:264 mod/message.php:430
+#: mod/fsuggest.php:114 mod/contacts.php:630 mod/events.php:533
+#: mod/localtime.php:56 mod/poke.php:195 mod/invite.php:155
+#: mod/profiles.php:577 mod/photos.php:1094 mod/photos.php:1180
+#: mod/photos.php:1452 mod/photos.php:1497 mod/photos.php:1536
+#: mod/photos.php:1596 src/Object/Post.php:795
+msgid "Submit"
+msgstr "提交"
+
+#: view/theme/duepuntozero/config.php:73 view/theme/quattro/config.php:75
+#: view/theme/vier/config.php:121 view/theme/frio/config.php:120
+#: mod/settings.php:981
+msgid "Theme settings"
+msgstr "主题设置"
+
+#: view/theme/duepuntozero/config.php:74
+msgid "Variations"
+msgstr "变化"
+
+#: view/theme/quattro/config.php:76
+msgid "Alignment"
+msgstr "对齐"
+
+#: view/theme/quattro/config.php:76
+msgid "Left"
+msgstr "左边"
+
+#: view/theme/quattro/config.php:76
+msgid "Center"
+msgstr "中间"
+
+#: view/theme/quattro/config.php:77
+msgid "Color scheme"
+msgstr "色彩方案"
+
+#: view/theme/quattro/config.php:78
+msgid "Posts font size"
+msgstr "文章"
+
+#: view/theme/quattro/config.php:79
+msgid "Textareas font size"
+msgstr "文本区字体大小"
+
+#: view/theme/vier/config.php:75
+msgid "Comma separated list of helper forums"
+msgstr ""
+
+#: view/theme/vier/config.php:115 src/Core/ACL.php:298
+msgid "don't show"
+msgstr "不要显示"
+
+#: view/theme/vier/config.php:115 src/Core/ACL.php:297
+msgid "show"
+msgstr "显示"
+
+#: view/theme/vier/config.php:122
+msgid "Set style"
+msgstr "设置风格"
+
+#: view/theme/vier/config.php:123
+msgid "Community Pages"
+msgstr "社会页"
+
+#: view/theme/vier/config.php:124 view/theme/vier/theme.php:149
+msgid "Community Profiles"
+msgstr "社会简介"
+
+#: view/theme/vier/config.php:125
+msgid "Help or @NewHere ?"
+msgstr "需要帮助或@第一次来这儿？"
+
+#: view/theme/vier/config.php:126 view/theme/vier/theme.php:386
+msgid "Connect Services"
+msgstr "连接服务"
+
+#: view/theme/vier/config.php:127
+msgid "Find Friends"
+msgstr "找朋友们"
+
+#: view/theme/vier/config.php:128 view/theme/vier/theme.php:179
+msgid "Last users"
+msgstr "上次用户"
+
+#: view/theme/vier/theme.php:197 src/Content/Widget.php:59
+msgid "Find People"
+msgstr "找人物"
+
+#: view/theme/vier/theme.php:198 src/Content/Widget.php:60
+msgid "Enter name or interest"
+msgstr "输入名字或兴趣"
+
+#: view/theme/vier/theme.php:199 include/conversation.php:881
+#: mod/dirfind.php:231 mod/match.php:90 mod/suggest.php:86
+#: mod/allfriends.php:76 mod/contacts.php:604 mod/contacts.php:610
+#: mod/follow.php:143 src/Model/Contact.php:933 src/Content/Widget.php:61
+msgid "Connect/Follow"
+msgstr "连接/关注"
+
+#: view/theme/vier/theme.php:200 src/Content/Widget.php:62
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "比如：罗伯特·摩根斯坦，钓鱼"
+
+#: view/theme/vier/theme.php:201 mod/directory.php:214 mod/contacts.php:842
+#: src/Content/Widget.php:63
+msgid "Find"
+msgstr "搜索"
+
+#: view/theme/vier/theme.php:202 mod/suggest.php:117 src/Content/Widget.php:64
+msgid "Friend Suggestions"
+msgstr "朋友推荐"
+
+#: view/theme/vier/theme.php:203 src/Content/Widget.php:65
+msgid "Similar Interests"
+msgstr "相似兴趣"
+
+#: view/theme/vier/theme.php:204 src/Content/Widget.php:66
+msgid "Random Profile"
+msgstr "随机简介"
+
+#: view/theme/vier/theme.php:205 src/Content/Widget.php:67
+msgid "Invite Friends"
+msgstr "邀请朋友们"
+
+#: view/theme/vier/theme.php:206 mod/directory.php:207
+#: src/Content/Widget.php:68
+msgid "Global Directory"
+msgstr "综合目录"
+
+#: view/theme/vier/theme.php:208 src/Content/Widget.php:70
+msgid "Local Directory"
+msgstr "本地目录"
+
+#: view/theme/vier/theme.php:251 include/text.php:909 src/Content/Nav.php:151
+#: src/Content/ForumManager.php:125
+msgid "Forums"
+msgstr "论坛"
+
+#: view/theme/vier/theme.php:253 src/Content/ForumManager.php:127
+msgid "External link to forum"
+msgstr "到论坛的外链"
+
+#: view/theme/vier/theme.php:256 include/items.php:489 src/Object/Post.php:429
+#: src/App.php:786 src/Content/Widget.php:310 src/Content/ForumManager.php:130
+msgid "show more"
+msgstr "显示更多"
+
+#: view/theme/vier/theme.php:289
+msgid "Quick Start"
+msgstr "快速入门"
+
+#: view/theme/vier/theme.php:295 mod/help.php:56 src/Content/Nav.php:134
+msgid "Help"
+msgstr "帮助"
+
+#: view/theme/frio/config.php:102
+msgid "Custom"
+msgstr ""
+
+#: view/theme/frio/config.php:114
+msgid "Note"
+msgstr "便条"
+
+#: view/theme/frio/config.php:114
+msgid "Check image permissions if all users are allowed to see the image"
+msgstr ""
+
+#: view/theme/frio/config.php:121
+msgid "Select color scheme"
+msgstr ""
+
+#: view/theme/frio/config.php:122
+msgid "Navigation bar background color"
+msgstr ""
+
+#: view/theme/frio/config.php:123
+msgid "Navigation bar icon color "
+msgstr ""
+
+#: view/theme/frio/config.php:124
+msgid "Link color"
+msgstr "链接颜色"
+
+#: view/theme/frio/config.php:125
+msgid "Set the background color"
+msgstr "设置背景色"
+
+#: view/theme/frio/config.php:126
+msgid "Content background opacity"
+msgstr ""
+
+#: view/theme/frio/config.php:127
+msgid "Set the background image"
+msgstr "设置背景图片"
+
+#: view/theme/frio/config.php:128
+msgid "Background image style"
+msgstr ""
+
+#: view/theme/frio/config.php:133
+msgid "Login page background image"
+msgstr "登录页面背景图片"
+
+#: view/theme/frio/config.php:137
+msgid "Login page background color"
+msgstr "登录页面背景色"
+
+#: view/theme/frio/config.php:137
+msgid "Leave background image and color empty for theme defaults"
+msgstr ""
+
+#: view/theme/frio/theme.php:248
+msgid "Guest"
+msgstr ""
+
+#: view/theme/frio/theme.php:253
+msgid "Visitor"
+msgstr "访客"
+
+#: view/theme/frio/theme.php:266 src/Module/Login.php:309
+#: src/Content/Nav.php:97
+msgid "Logout"
+msgstr "注销"
+
+#: view/theme/frio/theme.php:266 src/Content/Nav.php:97
+msgid "End this session"
+msgstr "结束此次会话"
+
+#: view/theme/frio/theme.php:269 mod/contacts.php:689 mod/contacts.php:877
+#: src/Model/Profile.php:875 src/Content/Nav.php:100
+msgid "Status"
+msgstr "状态"
+
+#: view/theme/frio/theme.php:269 src/Content/Nav.php:100
+#: src/Content/Nav.php:186
+msgid "Your posts and conversations"
+msgstr "你的消息和交谈"
+
+#: view/theme/frio/theme.php:270 mod/newmember.php:24 mod/profperm.php:116
+#: mod/contacts.php:691 mod/contacts.php:893 src/Model/Profile.php:717
+#: src/Model/Profile.php:850 src/Model/Profile.php:883 src/Content/Nav.php:101
+msgid "Profile"
+msgstr "简介"
+
+#: view/theme/frio/theme.php:270 src/Content/Nav.php:101
+msgid "Your profile page"
+msgstr "你的简介页"
+
+#: view/theme/frio/theme.php:271 mod/fbrowser.php:35 src/Model/Profile.php:891
+#: src/Content/Nav.php:102
+msgid "Photos"
+msgstr "照片"
+
+#: view/theme/frio/theme.php:271 src/Content/Nav.php:102
+msgid "Your photos"
+msgstr "你的照片"
+
+#: view/theme/frio/theme.php:272 src/Model/Profile.php:899
+#: src/Model/Profile.php:902 src/Content/Nav.php:103
+msgid "Videos"
+msgstr "视频"
+
+#: view/theme/frio/theme.php:272 src/Content/Nav.php:103
+msgid "Your videos"
+msgstr "你的视频"
+
+#: view/theme/frio/theme.php:273 view/theme/frio/theme.php:277 mod/cal.php:276
+#: mod/events.php:390 src/Model/Profile.php:911 src/Model/Profile.php:922
+#: src/Content/Nav.php:104 src/Content/Nav.php:170
+msgid "Events"
+msgstr "事件"
+
+#: view/theme/frio/theme.php:273 src/Content/Nav.php:104
+msgid "Your events"
+msgstr "你的项目"
+
+#: view/theme/frio/theme.php:276 mod/admin.php:771
+#: src/Core/NotificationsManager.php:179 src/Content/Nav.php:183
+msgid "Network"
+msgstr "网络"
+
+#: view/theme/frio/theme.php:276 src/Content/Nav.php:183
+msgid "Conversations from your friends"
+msgstr "来自你的朋友们的交谈"
+
+#: view/theme/frio/theme.php:277 src/Model/Profile.php:914
+#: src/Model/Profile.php:925 src/Content/Nav.php:170
+msgid "Events and Calendar"
+msgstr "事件和日历"
+
+#: view/theme/frio/theme.php:278 mod/message.php:127 src/Content/Nav.php:196
+msgid "Messages"
+msgstr "消息"
+
+#: view/theme/frio/theme.php:278 src/Content/Nav.php:196
+msgid "Private mail"
+msgstr "私人的邮件"
+
+#: view/theme/frio/theme.php:279 mod/settings.php:131 mod/newmember.php:19
+#: mod/admin.php:2015 mod/admin.php:2285 src/Content/Nav.php:207
+msgid "Settings"
+msgstr "设置"
+
+#: view/theme/frio/theme.php:279 src/Content/Nav.php:207
+msgid "Account settings"
+msgstr "帐户设置"
+
+#: view/theme/frio/theme.php:280 include/text.php:906 mod/viewcontacts.php:125
+#: mod/contacts.php:836 mod/contacts.php:905 src/Model/Profile.php:954
+#: src/Model/Profile.php:957 src/Content/Nav.php:147 src/Content/Nav.php:213
+msgid "Contacts"
+msgstr "联系人"
+
+#: view/theme/frio/theme.php:280 src/Content/Nav.php:213
+msgid "Manage/edit friends and contacts"
+msgstr "管理/编辑朋友和联系人"
+
+#: view/theme/frio/theme.php:367 include/conversation.php:866
+msgid "Follow Thread"
+msgstr ""
+
+#: view/theme/frio/php/Image.php:24
+msgid "Top Banner"
+msgstr ""
+
+#: view/theme/frio/php/Image.php:24
+msgid ""
+"Resize image to the width of the screen and show background color below on "
+"long pages."
+msgstr ""
+
+#: view/theme/frio/php/Image.php:25
+msgid "Full screen"
+msgstr ""
+
+#: view/theme/frio/php/Image.php:25
+msgid ""
+"Resize image to fill entire screen, clipping either the right or the bottom."
+msgstr ""
+
+#: view/theme/frio/php/Image.php:26
+msgid "Single row mosaic"
+msgstr ""
+
+#: view/theme/frio/php/Image.php:26
+msgid ""
+"Resize image to repeat it on a single row, either vertical or horizontal."
+msgstr ""
+
+#: view/theme/frio/php/Image.php:27
+msgid "Mosaic"
+msgstr ""
+
+#: view/theme/frio/php/Image.php:27
+msgid "Repeat image to fill the screen."
+msgstr ""
+
+#: update.php:194
+#, php-format
+msgid "%s: Updating author-id and owner-id in item and thread table. "
+msgstr ""
+
+#: update.php:240
+#, php-format
+msgid "%s: Updating post-type."
+msgstr ""
+
+#: include/items.php:355 mod/display.php:70 mod/display.php:245
+#: mod/display.php:341 mod/admin.php:283 mod/admin.php:1963 mod/admin.php:2211
+#: mod/notice.php:22 mod/viewsrc.php:22
+msgid "Item not found."
+msgstr "项目找不到。"
+
+#: include/items.php:393
+msgid "Do you really want to delete this item?"
+msgstr "您真的想删除这个项目吗？"
+
+#: include/items.php:395 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/register.php:237
+#: mod/message.php:154 mod/suggest.php:40 mod/dfrn_request.php:645
+#: mod/api.php:110 mod/contacts.php:465 mod/follow.php:150
+#: mod/profiles.php:541 mod/profiles.php:544 mod/profiles.php:566
+msgid "Yes"
+msgstr "是"
+
+#: include/items.php:398 include/conversation.php:1179 mod/videos.php:146
+#: mod/settings.php:676 mod/settings.php:702 mod/unfollow.php:120
+#: mod/message.php:157 mod/tagrm.php:19 mod/tagrm.php:91 mod/suggest.php:43
+#: mod/dfrn_request.php:655 mod/editpost.php:140 mod/contacts.php:468
+#: mod/follow.php:161 mod/fbrowser.php:104 mod/fbrowser.php:135
+#: mod/photos.php:255 mod/photos.php:327
+msgid "Cancel"
+msgstr "取消"
+
+#: include/items.php:483 src/Content/Feature.php:96
+msgid "Archives"
+msgstr "档案"
+
+#: include/conversation.php:151 include/conversation.php:287
+#: include/text.php:1611
+msgid "event"
+msgstr "事件"
+
+#: include/conversation.php:154 include/conversation.php:164
+#: include/conversation.php:290 include/conversation.php:299 mod/tagger.php:70
+#: mod/subthread.php:87
+msgid "status"
+msgstr "现状"
+
+#: include/conversation.php:159 include/conversation.php:295
+#: include/text.php:1613 mod/tagger.php:70 mod/subthread.php:87
+msgid "photo"
+msgstr "照片"
+
+#: include/conversation.php:171
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "%1$s 喜欢 %2$s 的 %3$s"
+
+#: include/conversation.php:173
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "%1$s 不喜欢 %2$s 的 %3$s"
+
+#: include/conversation.php:175
+#, php-format
+msgid "%1$s attends %2$s's %3$s"
+msgstr "%1$s 参加了 %2$s 的 %3$s"
+
+#: include/conversation.php:177
+#, php-format
+msgid "%1$s doesn't attend %2$s's %3$s"
+msgstr "%1$s 没有参加 %2$s 的 %3$s"
+
+#: include/conversation.php:179
+#, php-format
+msgid "%1$s attends maybe %2$s's %3$s"
+msgstr ""
+
+#: include/conversation.php:214
+#, php-format
+msgid "%1$s is now friends with %2$s"
+msgstr "%1$s是成为%2$s的朋友"
+
+#: include/conversation.php:255
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr "%1$s把%2$s戳"
+
+#: include/conversation.php:309 mod/tagger.php:108
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s把%4$s标签%2$s的%3$s"
+
+#: include/conversation.php:331
+msgid "post/item"
+msgstr "文章／项目"
+
+#: include/conversation.php:332
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
+msgstr "%1$s标注%2$s的%3$s为偏爱"
+
+#: include/conversation.php:545 mod/profiles.php:352 mod/photos.php:1507
+msgid "Likes"
+msgstr "喜欢"
+
+#: include/conversation.php:545 mod/profiles.php:356 mod/photos.php:1507
+msgid "Dislikes"
+msgstr "不喜欢"
+
+#: include/conversation.php:546 include/conversation.php:1492
+#: mod/photos.php:1508
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] "正在参加"
+
+#: include/conversation.php:546 mod/photos.php:1508
+msgid "Not attending"
+msgstr "不在参加"
+
+#: include/conversation.php:546 mod/photos.php:1508
+msgid "Might attend"
+msgstr "可以参加"
+
+#: include/conversation.php:626 mod/photos.php:1564 src/Object/Post.php:195
+msgid "Select"
+msgstr "选择"
+
+#: include/conversation.php:627 mod/settings.php:736 mod/admin.php:1906
+#: mod/contacts.php:852 mod/contacts.php:1130 mod/photos.php:1565
+msgid "Delete"
+msgstr "删除"
+
+#: include/conversation.php:661 src/Object/Post.php:362
+#: src/Object/Post.php:363
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "看%s的简介@ %s"
+
+#: include/conversation.php:673 src/Object/Post.php:350
+msgid "Categories:"
+msgstr "种类："
+
+#: include/conversation.php:674 src/Object/Post.php:351
+msgid "Filed under:"
+msgstr "归档在："
+
+#: include/conversation.php:681 src/Object/Post.php:376
+#, php-format
+msgid "%s from %s"
+msgstr "%s从%s"
+
+#: include/conversation.php:696
+msgid "View in context"
+msgstr "看在上下文"
+
+#: include/conversation.php:698 include/conversation.php:1160
+#: mod/wallmessage.php:145 mod/message.php:263 mod/message.php:431
+#: mod/editpost.php:115 mod/photos.php:1480 src/Object/Post.php:401
+msgid "Please wait"
+msgstr "请等一下"
+
+#: include/conversation.php:762
+msgid "remove"
+msgstr "删除"
+
+#: include/conversation.php:766
+msgid "Delete Selected Items"
+msgstr "删除选的项目"
+
+#: include/conversation.php:867 src/Model/Contact.php:937
+msgid "View Status"
+msgstr "看现状"
+
+#: include/conversation.php:868 include/conversation.php:884
+#: mod/dirfind.php:230 mod/directory.php:164 mod/match.php:89
+#: mod/suggest.php:85 mod/allfriends.php:75 src/Model/Contact.php:877
+#: src/Model/Contact.php:930 src/Model/Contact.php:938
+msgid "View Profile"
+msgstr "看简介"
+
+#: include/conversation.php:869 src/Model/Contact.php:939
+msgid "View Photos"
+msgstr "看照片"
+
+#: include/conversation.php:870 src/Model/Contact.php:931
+#: src/Model/Contact.php:940
+msgid "Network Posts"
+msgstr "网络文章"
+
+#: include/conversation.php:871 src/Model/Contact.php:932
+#: src/Model/Contact.php:941
+msgid "View Contact"
+msgstr "查看联系人"
+
+#: include/conversation.php:872 src/Model/Contact.php:943
+msgid "Send PM"
+msgstr "发送私信"
+
+#: include/conversation.php:876 src/Model/Contact.php:944
+msgid "Poke"
+msgstr "戳"
+
+#: include/conversation.php:999
+#, php-format
+msgid "%s likes this."
+msgstr "%s喜欢这个."
+
+#: include/conversation.php:1002
+#, php-format
+msgid "%s doesn't like this."
+msgstr "%s没有喜欢这个."
+
+#: include/conversation.php:1005
+#, php-format
+msgid "%s attends."
+msgstr "%s 参加。"
+
+#: include/conversation.php:1008
+#, php-format
+msgid "%s doesn't attend."
+msgstr "%s 不参加。"
+
+#: include/conversation.php:1011
+#, php-format
+msgid "%s attends maybe."
+msgstr ""
+
+#: include/conversation.php:1022
+msgid "and"
+msgstr "和"
+
+#: include/conversation.php:1028
+#, php-format
+msgid "and %d other people"
+msgstr "和 %d 个其他人"
+
+#: include/conversation.php:1037
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this"
+msgstr "<span  %1$s>%2$d个人</span>喜欢"
+
+#: include/conversation.php:1038
+#, php-format
+msgid "%s like this."
+msgstr "%s 赞了这个。"
+
+#: include/conversation.php:1041
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this"
+msgstr "<span  %1$s>%2$d个人</span>不喜欢"
+
+#: include/conversation.php:1042
+#, php-format
+msgid "%s don't like this."
+msgstr "%s 踩了这个。"
+
+#: include/conversation.php:1045
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend"
+msgstr "<span  %1$s>%2$d 人</span>参加"
+
+#: include/conversation.php:1046
+#, php-format
+msgid "%s attend."
+msgstr "%s 参加。"
+
+#: include/conversation.php:1049
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't attend"
+msgstr "<span  %1$s>%2$d 人</span>不参加"
+
+#: include/conversation.php:1050
+#, php-format
+msgid "%s don't attend."
+msgstr "%s 不参加。"
+
+#: include/conversation.php:1053
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend maybe"
+msgstr "<span  %1$s>%2$d人</span>可能参加"
+
+#: include/conversation.php:1054
+#, php-format
+msgid "%s attend maybe."
+msgstr ""
+
+#: include/conversation.php:1084 include/conversation.php:1100
+msgid "Visible to <strong>everybody</strong>"
+msgstr "<strong>大家</strong>可见的"
+
+#: include/conversation.php:1085 include/conversation.php:1101
+#: mod/wallmessage.php:120 mod/wallmessage.php:127 mod/message.php:199
+#: mod/message.php:206 mod/message.php:344 mod/message.php:351
+msgid "Please enter a link URL:"
+msgstr "请输入一个链接 URL："
+
+#: include/conversation.php:1086 include/conversation.php:1102
+msgid "Please enter a video link/URL:"
+msgstr "请输入视频连接／URL："
+
+#: include/conversation.php:1087 include/conversation.php:1103
+msgid "Please enter an audio link/URL:"
+msgstr "请输入音响连接／URL："
+
+#: include/conversation.php:1088 include/conversation.php:1104
+msgid "Tag term:"
+msgstr "标签:"
+
+#: include/conversation.php:1089 include/conversation.php:1105
+#: mod/filer.php:34
+msgid "Save to Folder:"
+msgstr "保存再文件夹："
+
+#: include/conversation.php:1090 include/conversation.php:1106
+msgid "Where are you right now?"
+msgstr "你在哪里?"
+
+#: include/conversation.php:1091
+msgid "Delete item(s)?"
+msgstr "把项目删除吗？"
+
+#: include/conversation.php:1138
+msgid "New Post"
+msgstr ""
+
+#: include/conversation.php:1141
+msgid "Share"
+msgstr "分享"
+
+#: include/conversation.php:1142 mod/wallmessage.php:143 mod/message.php:261
+#: mod/message.php:428 mod/editpost.php:101
+msgid "Upload photo"
+msgstr "上传照片"
+
+#: include/conversation.php:1143 mod/editpost.php:102
+msgid "upload photo"
+msgstr "上传照片"
+
+#: include/conversation.php:1144 mod/editpost.php:103
+msgid "Attach file"
+msgstr "附上文件"
+
+#: include/conversation.php:1145 mod/editpost.php:104
+msgid "attach file"
+msgstr "附上文件"
+
+#: include/conversation.php:1146 mod/wallmessage.php:144 mod/message.php:262
+#: mod/message.php:429 mod/editpost.php:105
+msgid "Insert web link"
+msgstr "插入网页链接"
+
+#: include/conversation.php:1147 mod/editpost.php:106
+msgid "web link"
+msgstr "网页链接"
+
+#: include/conversation.php:1148 mod/editpost.php:107
+msgid "Insert video link"
+msgstr "插入视频链接"
+
+#: include/conversation.php:1149 mod/editpost.php:108
+msgid "video link"
+msgstr "视频链接"
+
+#: include/conversation.php:1150 mod/editpost.php:109
+msgid "Insert audio link"
+msgstr "插入音频链接"
+
+#: include/conversation.php:1151 mod/editpost.php:110
+msgid "audio link"
+msgstr "音频链接"
+
+#: include/conversation.php:1152 mod/editpost.php:111
+msgid "Set your location"
+msgstr "设定您的位置"
+
+#: include/conversation.php:1153 mod/editpost.php:112
+msgid "set location"
+msgstr "指定位置"
+
+#: include/conversation.php:1154 mod/editpost.php:113
+msgid "Clear browser location"
+msgstr "清空浏览器位置"
+
+#: include/conversation.php:1155 mod/editpost.php:114
+msgid "clear location"
+msgstr "清除位置"
+
+#: include/conversation.php:1157 mod/editpost.php:129
+msgid "Set title"
+msgstr "指定标题"
+
+#: include/conversation.php:1159 mod/editpost.php:131
+msgid "Categories (comma-separated list)"
+msgstr "种类（逗号分隔单）"
+
+#: include/conversation.php:1161 mod/editpost.php:116
+msgid "Permission settings"
+msgstr "权设置"
+
+#: include/conversation.php:1162 mod/editpost.php:146
+msgid "permissions"
+msgstr "权利"
+
+#: include/conversation.php:1171 mod/editpost.php:126
+msgid "Public post"
+msgstr "公开的消息"
+
+#: include/conversation.php:1175 mod/editpost.php:137 mod/events.php:531
+#: mod/photos.php:1498 mod/photos.php:1537 mod/photos.php:1597
+#: src/Object/Post.php:804
+msgid "Preview"
+msgstr "预览"
+
+#: include/conversation.php:1184
+msgid "Post to Groups"
+msgstr "发到组"
+
+#: include/conversation.php:1185
+msgid "Post to Contacts"
+msgstr "发给联系人"
+
+#: include/conversation.php:1186
+msgid "Private post"
+msgstr "私人文章"
+
+#: include/conversation.php:1191 mod/editpost.php:144
+#: src/Model/Profile.php:344
+msgid "Message"
+msgstr "通知"
+
+#: include/conversation.php:1192 mod/editpost.php:145
+msgid "Browser"
+msgstr "浏览器"
+
+#: include/conversation.php:1463
+msgid "View all"
+msgstr "查看全部"
+
+#: include/conversation.php:1486
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "喜欢"
+
+#: include/conversation.php:1489
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "不喜欢"
+
+#: include/conversation.php:1495
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] "不在参加"
+
+#: include/conversation.php:1498 src/Content/ContactSelector.php:122
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] "未决定的"
+
+#: include/security.php:83
+msgid "Welcome "
+msgstr "欢迎"
+
+#: include/security.php:84
+msgid "Please upload a profile photo."
+msgstr "请上传一张简介照片"
+
+#: include/security.php:86
+msgid "Welcome back "
+msgstr "欢迎回来"
+
+#: include/security.php:424
+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 "表格安全令牌不对。最可能因为表格开着太久（三个小时以上）提交前。"
+
+#: include/enotify.php:52
 msgid "Friendica Notification"
 msgstr "Friendica 通知"
 
-#: include/enotify.php:34
+#: include/enotify.php:55
 msgid "Thank You,"
 msgstr "谢谢，"
 
-#: include/enotify.php:37
-#, php-format
-msgid "%s Administrator"
-msgstr "%s管理员"
-
-#: include/enotify.php:39
+#: include/enotify.php:58
 #, php-format
 msgid "%1$s, %2$s Administrator"
 msgstr "%1$s, %2$s 的管理员"
 
-#: include/enotify.php:95
+#: include/enotify.php:60
+#, php-format
+msgid "%s Administrator"
+msgstr "%s管理员"
+
+#: include/enotify.php:123
 #, php-format
 msgid "[Friendica:Notify] New mail received at %s"
 msgstr "[Friendica:Notify]收到新邮件在%s"
 
-#: include/enotify.php:97
+#: include/enotify.php:125
 #, php-format
 msgid "%1$s sent you a new private message at %2$s."
 msgstr "%1$s发给您新私人通知在%2$s."
 
-#: include/enotify.php:98
+#: include/enotify.php:126
 msgid "a private message"
 msgstr "一条私人信息"
 
-#: include/enotify.php:98
+#: include/enotify.php:126
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s发给您%2$s."
 
-#: include/enotify.php:100
+#: include/enotify.php:128
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "请访问 %s 来查看并且/或者回复你的私信。"
 
-#: include/enotify.php:138
+#: include/enotify.php:161
 #, php-format
 msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
 msgstr "%1$s于[url=%2$s]a %3$s[/url]评论了"
 
-#: include/enotify.php:146
+#: include/enotify.php:169
 #, php-format
 msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
 msgstr "%1$s于[url=%2$s]%3$s的%4$s[/url]评论了"
 
-#: include/enotify.php:156
+#: include/enotify.php:179
 #, php-format
 msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
 msgstr "%1$s于[url=%2$s]您的%3$s[/url]评论了"
 
-#: include/enotify.php:168
+#: include/enotify.php:191
 #, php-format
 msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
 msgstr "[Friendica:Notify]于交流#%1$d由%2$s评论"
 
-#: include/enotify.php:170
+#: include/enotify.php:193
 #, php-format
 msgid "%s commented on an item/conversation you have been following."
 msgstr "%s对你有兴趣的项目／ 交谈发表意见"
 
-#: include/enotify.php:173 include/enotify.php:188 include/enotify.php:203
-#: include/enotify.php:218 include/enotify.php:237 include/enotify.php:252
+#: include/enotify.php:196 include/enotify.php:211 include/enotify.php:226
+#: include/enotify.php:241 include/enotify.php:260 include/enotify.php:276
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "请访问%s来查看并且/或者回复这个对话。"
 
-#: include/enotify.php:180
+#: include/enotify.php:203
 #, php-format
 msgid "[Friendica:Notify] %s posted to your profile wall"
 msgstr "[Friendica:Notify] %s贴在您的简介墙"
 
-#: include/enotify.php:182
+#: include/enotify.php:205
 #, php-format
 msgid "%1$s posted to your profile wall at %2$s"
 msgstr "%1$s放在您的简介墙在%2$s"
 
-#: include/enotify.php:183
+#: include/enotify.php:206
 #, php-format
 msgid "%1$s posted to [url=%2$s]your wall[/url]"
 msgstr "%1$s放在[url=%2$s]您的墙[/url]"
 
-#: include/enotify.php:195
+#: include/enotify.php:218
 #, php-format
 msgid "[Friendica:Notify] %s tagged you"
 msgstr "[Friendica:Notify] %s标签您"
 
-#: include/enotify.php:197
+#: include/enotify.php:220
 #, php-format
 msgid "%1$s tagged you at %2$s"
 msgstr "%1$s把您在%2$s标签"
 
-#: include/enotify.php:198
+#: include/enotify.php:221
 #, php-format
 msgid "%1$s [url=%2$s]tagged you[/url]."
 msgstr "%1$s[url=%2$s]把您标签[/url]."
 
-#: include/enotify.php:210
+#: include/enotify.php:233
 #, php-format
 msgid "[Friendica:Notify] %s shared a new post"
 msgstr "[Friendica:Notify] %s分享新的消息"
 
-#: include/enotify.php:212
+#: include/enotify.php:235
 #, php-format
 msgid "%1$s shared a new post at %2$s"
 msgstr "%1$s分享新的消息在%2$s"
 
-#: include/enotify.php:213
+#: include/enotify.php:236
 #, php-format
 msgid "%1$s [url=%2$s]shared a post[/url]."
 msgstr "%1$s [url=%2$s]分享一个消息[/url]."
 
-#: include/enotify.php:225
+#: include/enotify.php:248
 #, php-format
 msgid "[Friendica:Notify] %1$s poked you"
 msgstr "[Friendica:Notify]您被%1$s戳"
 
-#: include/enotify.php:227
+#: include/enotify.php:250
 #, php-format
 msgid "%1$s poked you at %2$s"
 msgstr "您被%1$s戳在%2$s"
 
-#: include/enotify.php:228
+#: include/enotify.php:251
 #, php-format
 msgid "%1$s [url=%2$s]poked you[/url]."
 msgstr "%1$s[url=%2$s]把您戳[/url]。"
 
-#: include/enotify.php:244
+#: include/enotify.php:268
 #, php-format
 msgid "[Friendica:Notify] %s tagged your post"
 msgstr "[Friendica:Notify] %s标前您的文章"
 
-#: include/enotify.php:246
+#: include/enotify.php:270
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr "%1$s把您的文章在%2$s标签"
 
-#: include/enotify.php:247
+#: include/enotify.php:271
 #, php-format
 msgid "%1$s tagged [url=%2$s]your post[/url]"
 msgstr "%1$s把[url=%2$s]您的文章[/url]标签"
 
-#: include/enotify.php:259
+#: include/enotify.php:283
 msgid "[Friendica:Notify] Introduction received"
 msgstr "[Friendica:Notify] 收到介绍"
 
-#: include/enotify.php:261
+#: include/enotify.php:285
 #, php-format
 msgid "You've received an introduction from '%1$s' at %2$s"
 msgstr "您从「%1$s」受到一个介绍在%2$s"
 
-#: include/enotify.php:262
+#: include/enotify.php:286
 #, php-format
 msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
 msgstr "您从%2$s收到[url=%1$s]一个介绍[/url]。"
 
-#: include/enotify.php:267 include/enotify.php:313
+#: include/enotify.php:291 include/enotify.php:337
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "你能看他的简介在%s"
 
-#: include/enotify.php:269
+#: include/enotify.php:293
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr "请批准或拒绝介绍在%s"
 
-#: include/enotify.php:277
+#: include/enotify.php:300
 msgid "[Friendica:Notify] A new person is sharing with you"
 msgstr "[Friendica:Notify] 一个新的人正在和你分享"
 
-#: include/enotify.php:279 include/enotify.php:280
+#: include/enotify.php:302 include/enotify.php:303
 #, php-format
 msgid "%1$s is sharing with you at %2$s"
 msgstr "%1$s 正在 %2$s 和你分享"
 
-#: include/enotify.php:287
+#: include/enotify.php:310
 msgid "[Friendica:Notify] You have a new follower"
 msgstr "[Friendica:Notify] 你有一个新的粉丝"
 
-#: include/enotify.php:289 include/enotify.php:290
+#: include/enotify.php:312 include/enotify.php:313
 #, php-format
 msgid "You have a new follower at %2$s : %1$s"
 msgstr "你在 %2$s 有一个新的关注者： %1$s"
 
-#: include/enotify.php:302
+#: include/enotify.php:326
 msgid "[Friendica:Notify] Friend suggestion received"
 msgstr "[Friendica:Notify] 收到朋友建议"
 
-#: include/enotify.php:304
+#: include/enotify.php:328
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr "您从「%2$s」收到[url=%1$s]一个朋友建议[/url]。"
 
-#: include/enotify.php:305
+#: include/enotify.php:329
 #, php-format
 msgid ""
 "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
 msgstr "您从%3$s收到[url=%1$s]一个朋友建议[/url]为%2$s。"
 
-#: include/enotify.php:311
+#: include/enotify.php:335
 msgid "Name:"
 msgstr "名字："
 
-#: include/enotify.php:312
+#: include/enotify.php:336
 msgid "Photo:"
 msgstr "照片："
 
-#: include/enotify.php:315
+#: include/enotify.php:339
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "请访问%s来批准或拒绝这个建议。"
 
-#: include/enotify.php:323 include/enotify.php:338
+#: include/enotify.php:347 include/enotify.php:362
 msgid "[Friendica:Notify] Connection accepted"
 msgstr "[Friendica:Notify] 连接被接受"
 
-#: include/enotify.php:325 include/enotify.php:340
+#: include/enotify.php:349 include/enotify.php:364
 #, php-format
 msgid "'%1$s' has accepted your connection request at %2$s"
 msgstr "“%1$s”已经在 %2$s 接受了您的连接请求"
 
-#: include/enotify.php:326 include/enotify.php:341
+#: include/enotify.php:350 include/enotify.php:365
 #, php-format
 msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
 msgstr "%2$s 已经接受了你的[url=%1$s]连接请求[/url]。"
 
-#: include/enotify.php:331
+#: include/enotify.php:355
 msgid ""
 "You are now mutual friends and may exchange status updates, photos, and "
 "email without restriction."
 msgstr "你们现在已经互为朋友了，可以不受限制地交换状态更新、照片和邮件。"
 
-#: include/enotify.php:333
+#: include/enotify.php:357
 #, php-format
 msgid "Please visit %s if you wish to make any changes to this relationship."
 msgstr "请访问%s如果你希望对这个关系做任何改变。"
 
-#: include/enotify.php:346
+#: include/enotify.php:370
 #, php-format
 msgid ""
 "'%1$s' has chosen to accept you a fan, which restricts some forms of "
@@ -275,588 +1191,49 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: include/enotify.php:348
+#: include/enotify.php:372
 #, 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:350
+#: include/enotify.php:374
 #, php-format
 msgid "Please visit %s  if you wish to make any changes to this relationship."
 msgstr "请访问 %s  如果你希望对修改这个关系。"
 
-#: include/enotify.php:360 mod/removeme.php:45
+#: include/enotify.php:384 mod/removeme.php:47
 msgid "[Friendica System Notify]"
 msgstr ""
 
-#: include/enotify.php:360
+#: include/enotify.php:384
 msgid "registration request"
 msgstr "注册请求"
 
-#: include/enotify.php:362
+#: include/enotify.php:386
 #, php-format
 msgid "You've received a registration request from '%1$s' at %2$s"
 msgstr ""
 
-#: include/enotify.php:363
+#: include/enotify.php:387
 #, php-format
 msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
 msgstr ""
 
-#: include/enotify.php:368
+#: include/enotify.php:392
 #, php-format
-msgid "Full Name:\t%1$s\\nSite Location:\t%2$s\\nLogin Name:\t%3$s (%4$s)"
+msgid ""
+"Full Name:\t%s\n"
+"Site Location:\t%s\n"
+"Login Name:\t%s (%s)"
 msgstr ""
 
-#: include/enotify.php:374
+#: include/enotify.php:398
 #, php-format
 msgid "Please visit %s to approve or reject the request."
 msgstr "请访问%s来批准或拒绝这个请求。"
 
-#: include/api.php:1202
-#, 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] "达到每日 %d 发文限制。此文被拒绝发出。"
-
-#: include/api.php:1226
-#, 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] "达到每周 %d 发文限制。此文被拒绝发出。"
-
-#: include/api.php:1250
-#, php-format
-msgid "Monthly posting limit of %d post reached. The post was rejected."
-msgstr "达到每月 %d 发文限制。此文被拒绝发出。"
-
-#: include/api.php:4521 mod/profile_photo.php:85 mod/profile_photo.php:93
-#: mod/profile_photo.php:101 mod/profile_photo.php:211
-#: mod/profile_photo.php:302 mod/profile_photo.php:312 mod/photos.php:88
-#: mod/photos.php:194 mod/photos.php:710 mod/photos.php:1137
-#: mod/photos.php:1154 mod/photos.php:1678 src/Model/User.php:555
-#: src/Model/User.php:563 src/Model/User.php:571
-msgid "Profile Photos"
-msgstr "简介照片"
-
-#: include/conversation.php:144 include/conversation.php:279
-#: include/text.php:1749 src/Model/Item.php:2002
-msgid "event"
-msgstr "事件"
-
-#: include/conversation.php:147 include/conversation.php:157
-#: include/conversation.php:282 include/conversation.php:291
-#: mod/subthread.php:101 mod/tagger.php:72 src/Model/Item.php:2000
-#: src/Protocol/Diaspora.php:1957
-msgid "status"
-msgstr "现状"
-
-#: include/conversation.php:152 include/conversation.php:287
-#: include/text.php:1751 mod/subthread.php:101 mod/tagger.php:72
-#: src/Model/Item.php:2000
-msgid "photo"
-msgstr "照片"
-
-#: include/conversation.php:164 src/Model/Item.php:1873
-#: src/Protocol/Diaspora.php:1953
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s 喜欢 %2$s 的 %3$s"
-
-#: include/conversation.php:166 src/Model/Item.php:1878
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "%1$s 不喜欢 %2$s 的 %3$s"
-
-#: include/conversation.php:168
-#, php-format
-msgid "%1$s attends %2$s's %3$s"
-msgstr "%1$s 参加了 %2$s 的 %3$s"
-
-#: include/conversation.php:170
-#, php-format
-msgid "%1$s doesn't attend %2$s's %3$s"
-msgstr "%1$s 没有参加 %2$s 的 %3$s"
-
-#: include/conversation.php:172
-#, php-format
-msgid "%1$s attends maybe %2$s's %3$s"
-msgstr ""
-
-#: include/conversation.php:206
-#, php-format
-msgid "%1$s is now friends with %2$s"
-msgstr "%1$s是成为%2$s的朋友"
-
-#: include/conversation.php:247
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s把%2$s戳"
-
-#: include/conversation.php:301 mod/tagger.php:110
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s把%4$s标签%2$s的%3$s"
-
-#: include/conversation.php:328
-msgid "post/item"
-msgstr "文章／项目"
-
-#: include/conversation.php:329
-#, php-format
-msgid "%1$s marked %2$s's %3$s as favorite"
-msgstr "%1$s标注%2$s的%3$s为偏爱"
-
-#: include/conversation.php:609 mod/photos.php:1495 mod/profiles.php:355
-msgid "Likes"
-msgstr "喜欢"
-
-#: include/conversation.php:609 mod/photos.php:1495 mod/profiles.php:359
-msgid "Dislikes"
-msgstr "不喜欢"
-
-#: include/conversation.php:610 include/conversation.php:1638
-#: mod/photos.php:1496
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] "正在参加"
-
-#: include/conversation.php:610 mod/photos.php:1496
-msgid "Not attending"
-msgstr "不在参加"
-
-#: include/conversation.php:610 mod/photos.php:1496
-msgid "Might attend"
-msgstr "可以参加"
-
-#: include/conversation.php:722 mod/photos.php:1563 src/Object/Post.php:192
-msgid "Select"
-msgstr "选择"
-
-#: include/conversation.php:723 mod/contacts.php:830 mod/contacts.php:1035
-#: mod/admin.php:1832 mod/photos.php:1564 mod/settings.php:730
-msgid "Delete"
-msgstr "删除"
-
-#: include/conversation.php:761 src/Object/Post.php:371
-#: src/Object/Post.php:372
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "看%s的简介@ %s"
-
-#: include/conversation.php:773 src/Object/Post.php:359
-msgid "Categories:"
-msgstr "种类："
-
-#: include/conversation.php:774 src/Object/Post.php:360
-msgid "Filed under:"
-msgstr "归档在："
-
-#: include/conversation.php:781 src/Object/Post.php:385
-#, php-format
-msgid "%s from %s"
-msgstr "%s从%s"
-
-#: include/conversation.php:796
-msgid "View in context"
-msgstr "看在上下文"
-
-#: include/conversation.php:798 include/conversation.php:1313
-#: mod/wallmessage.php:145 mod/editpost.php:125 mod/message.php:245
-#: mod/message.php:414 mod/photos.php:1467 src/Object/Post.php:410
-msgid "Please wait"
-msgstr "请等一下"
-
-#: include/conversation.php:869
-msgid "remove"
-msgstr "删除"
-
-#: include/conversation.php:873
-msgid "Delete Selected Items"
-msgstr "删除选的项目"
-
-#: include/conversation.php:1018 view/theme/frio/theme.php:352
-msgid "Follow Thread"
-msgstr ""
-
-#: include/conversation.php:1019 src/Model/Contact.php:662
-msgid "View Status"
-msgstr "看现状"
-
-#: include/conversation.php:1020 include/conversation.php:1036
-#: mod/allfriends.php:73 mod/suggest.php:82 mod/match.php:89
-#: mod/directory.php:159 mod/dirfind.php:217 src/Model/Contact.php:602
-#: src/Model/Contact.php:615 src/Model/Contact.php:663
-msgid "View Profile"
-msgstr "看简介"
-
-#: include/conversation.php:1021 src/Model/Contact.php:664
-msgid "View Photos"
-msgstr "看照片"
-
-#: include/conversation.php:1022 src/Model/Contact.php:665
-msgid "Network Posts"
-msgstr "网络文章"
-
-#: include/conversation.php:1023 src/Model/Contact.php:666
-msgid "View Contact"
-msgstr "查看联系人"
-
-#: include/conversation.php:1024 src/Model/Contact.php:668
-msgid "Send PM"
-msgstr "发送私信"
-
-#: include/conversation.php:1028 src/Model/Contact.php:669
-msgid "Poke"
-msgstr "戳"
-
-#: include/conversation.php:1033 mod/allfriends.php:74 mod/suggest.php:83
-#: mod/match.php:90 mod/contacts.php:596 mod/dirfind.php:218
-#: mod/follow.php:143 view/theme/vier/theme.php:201 src/Content/Widget.php:61
-#: src/Model/Contact.php:616
-msgid "Connect/Follow"
-msgstr "连接/关注"
-
-#: include/conversation.php:1152
-#, php-format
-msgid "%s likes this."
-msgstr "%s喜欢这个."
-
-#: include/conversation.php:1155
-#, php-format
-msgid "%s doesn't like this."
-msgstr "%s没有喜欢这个."
-
-#: include/conversation.php:1158
-#, php-format
-msgid "%s attends."
-msgstr "%s 参加。"
-
-#: include/conversation.php:1161
-#, php-format
-msgid "%s doesn't attend."
-msgstr "%s 不参加。"
-
-#: include/conversation.php:1164
-#, php-format
-msgid "%s attends maybe."
-msgstr ""
-
-#: include/conversation.php:1175
-msgid "and"
-msgstr "和"
-
-#: include/conversation.php:1181
-#, php-format
-msgid "and %d other people"
-msgstr "和 %d 个其他人"
-
-#: include/conversation.php:1190
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this"
-msgstr "<span  %1$s>%2$d个人</span>喜欢"
-
-#: include/conversation.php:1191
-#, php-format
-msgid "%s like this."
-msgstr "%s 赞了这个。"
-
-#: include/conversation.php:1194
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this"
-msgstr "<span  %1$s>%2$d个人</span>不喜欢"
-
-#: include/conversation.php:1195
-#, php-format
-msgid "%s don't like this."
-msgstr "%s 踩了这个。"
-
-#: include/conversation.php:1198
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend"
-msgstr "<span  %1$s>%2$d 人</span>参加"
-
-#: include/conversation.php:1199
-#, php-format
-msgid "%s attend."
-msgstr "%s 参加。"
-
-#: include/conversation.php:1202
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't attend"
-msgstr "<span  %1$s>%2$d 人</span>不参加"
-
-#: include/conversation.php:1203
-#, php-format
-msgid "%s don't attend."
-msgstr "%s 不参加。"
-
-#: include/conversation.php:1206
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend maybe"
-msgstr "<span  %1$s>%2$d人</span>可能参加"
-
-#: include/conversation.php:1207
-#, php-format
-msgid "%s attend maybe."
-msgstr ""
-
-#: include/conversation.php:1237 include/conversation.php:1253
-msgid "Visible to <strong>everybody</strong>"
-msgstr "<strong>大家</strong>可见的"
-
-#: include/conversation.php:1238 include/conversation.php:1254
-#: mod/wallmessage.php:120 mod/wallmessage.php:127 mod/message.php:181
-#: mod/message.php:188 mod/message.php:324 mod/message.php:331
-msgid "Please enter a link URL:"
-msgstr "请输入一个链接 URL："
-
-#: include/conversation.php:1239 include/conversation.php:1255
-msgid "Please enter a video link/URL:"
-msgstr "请输入视频连接／URL："
-
-#: include/conversation.php:1240 include/conversation.php:1256
-msgid "Please enter an audio link/URL:"
-msgstr "请输入音响连接／URL："
-
-#: include/conversation.php:1241 include/conversation.php:1257
-msgid "Tag term:"
-msgstr "标签:"
-
-#: include/conversation.php:1242 include/conversation.php:1258
-#: mod/filer.php:34
-msgid "Save to Folder:"
-msgstr "保存再文件夹："
-
-#: include/conversation.php:1243 include/conversation.php:1259
-msgid "Where are you right now?"
-msgstr "你在哪里?"
-
-#: include/conversation.php:1244
-msgid "Delete item(s)?"
-msgstr "把项目删除吗？"
-
-#: include/conversation.php:1291
-msgid "New Post"
-msgstr ""
-
-#: include/conversation.php:1294
-msgid "Share"
-msgstr "分享"
-
-#: include/conversation.php:1295 mod/wallmessage.php:143 mod/editpost.php:111
-#: mod/message.php:243 mod/message.php:411
-msgid "Upload photo"
-msgstr "上传照片"
-
-#: include/conversation.php:1296 mod/editpost.php:112
-msgid "upload photo"
-msgstr "上传照片"
-
-#: include/conversation.php:1297 mod/editpost.php:113
-msgid "Attach file"
-msgstr "附上文件"
-
-#: include/conversation.php:1298 mod/editpost.php:114
-msgid "attach file"
-msgstr "附上文件"
-
-#: include/conversation.php:1299 mod/wallmessage.php:144 mod/editpost.php:115
-#: mod/message.php:244 mod/message.php:412
-msgid "Insert web link"
-msgstr "插入网页链接"
-
-#: include/conversation.php:1300 mod/editpost.php:116
-msgid "web link"
-msgstr "网页链接"
-
-#: include/conversation.php:1301 mod/editpost.php:117
-msgid "Insert video link"
-msgstr "插入视频链接"
-
-#: include/conversation.php:1302 mod/editpost.php:118
-msgid "video link"
-msgstr "视频链接"
-
-#: include/conversation.php:1303 mod/editpost.php:119
-msgid "Insert audio link"
-msgstr "插入音频链接"
-
-#: include/conversation.php:1304 mod/editpost.php:120
-msgid "audio link"
-msgstr "音频链接"
-
-#: include/conversation.php:1305 mod/editpost.php:121
-msgid "Set your location"
-msgstr "设定您的位置"
-
-#: include/conversation.php:1306 mod/editpost.php:122
-msgid "set location"
-msgstr "指定位置"
-
-#: include/conversation.php:1307 mod/editpost.php:123
-msgid "Clear browser location"
-msgstr "清空浏览器位置"
-
-#: include/conversation.php:1308 mod/editpost.php:124
-msgid "clear location"
-msgstr "清除位置"
-
-#: include/conversation.php:1310 mod/editpost.php:138
-msgid "Set title"
-msgstr "指定标题"
-
-#: include/conversation.php:1312 mod/editpost.php:140
-msgid "Categories (comma-separated list)"
-msgstr "种类（逗号分隔单）"
-
-#: include/conversation.php:1314 mod/editpost.php:126
-msgid "Permission settings"
-msgstr "权设置"
-
-#: include/conversation.php:1315 mod/editpost.php:155
-msgid "permissions"
-msgstr "权利"
-
-#: include/conversation.php:1323 mod/editpost.php:135
-msgid "Public post"
-msgstr "公开的消息"
-
-#: include/conversation.php:1327 mod/editpost.php:146 mod/events.php:529
-#: mod/photos.php:1486 mod/photos.php:1525 mod/photos.php:1598
-#: src/Object/Post.php:813
-msgid "Preview"
-msgstr "预览"
-
-#: include/conversation.php:1331 include/items.php:388 mod/fbrowser.php:103
-#: mod/fbrowser.php:134 mod/suggest.php:41 mod/tagrm.php:19 mod/tagrm.php:99
-#: mod/editpost.php:149 mod/contacts.php:475 mod/unfollow.php:117
-#: mod/follow.php:161 mod/message.php:141 mod/dfrn_request.php:658
-#: mod/photos.php:248 mod/photos.php:317 mod/settings.php:670
-#: mod/settings.php:696 mod/videos.php:147
-msgid "Cancel"
-msgstr "取消"
-
-#: include/conversation.php:1336
-msgid "Post to Groups"
-msgstr "发到组"
-
-#: include/conversation.php:1337
-msgid "Post to Contacts"
-msgstr "发给联系人"
-
-#: include/conversation.php:1338
-msgid "Private post"
-msgstr "私人文章"
-
-#: include/conversation.php:1343 mod/editpost.php:153
-#: src/Model/Profile.php:338
-msgid "Message"
-msgstr "通知"
-
-#: include/conversation.php:1344 mod/editpost.php:154
-msgid "Browser"
-msgstr "浏览器"
-
-#: include/conversation.php:1609
-msgid "View all"
-msgstr "查看全部"
-
-#: include/conversation.php:1632
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "喜欢"
-
-#: include/conversation.php:1635
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] "不喜欢"
-
-#: include/conversation.php:1641
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] "不在参加"
-
-#: include/conversation.php:1644 src/Content/ContactSelector.php:125
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] "未决定的"
-
-#: include/items.php:343 mod/notice.php:22 mod/viewsrc.php:21
-#: mod/admin.php:277 mod/admin.php:1888 mod/admin.php:2136 mod/display.php:72
-#: mod/display.php:255 mod/display.php:356
-msgid "Item not found."
-msgstr "项目找不到。"
-
-#: include/items.php:383
-msgid "Do you really want to delete this item?"
-msgstr "您真的想删除这个项目吗？"
-
-#: include/items.php:385 mod/api.php:110 mod/suggest.php:38
-#: mod/contacts.php:472 mod/follow.php:150 mod/message.php:138
-#: mod/dfrn_request.php:648 mod/profiles.php:543 mod/profiles.php:546
-#: mod/profiles.php:568 mod/register.php:238 mod/settings.php:1094
-#: mod/settings.php:1100 mod/settings.php:1107 mod/settings.php:1111
-#: mod/settings.php:1115 mod/settings.php:1119 mod/settings.php:1123
-#: mod/settings.php:1127 mod/settings.php:1147 mod/settings.php:1148
-#: mod/settings.php:1149 mod/settings.php:1150 mod/settings.php:1151
-msgid "Yes"
-msgstr "是"
-
-#: include/items.php:402 mod/allfriends.php:21 mod/api.php:35 mod/api.php:40
-#: mod/attach.php:38 mod/common.php:26 mod/nogroup.php:28
-#: mod/repair_ostatus.php:13 mod/suggest.php:60 mod/uimport.php:28
-#: mod/manage.php:131 mod/wall_attach.php:74 mod/wall_attach.php:77
-#: mod/poke.php:150 mod/regmod.php:108 mod/viewcontacts.php:57
-#: mod/wall_upload.php:103 mod/wall_upload.php:106 mod/wallmessage.php:16
-#: mod/wallmessage.php:40 mod/wallmessage.php:79 mod/wallmessage.php:103
-#: mod/editpost.php:18 mod/fsuggest.php:80 mod/cal.php:304
-#: mod/contacts.php:386 mod/delegate.php:25 mod/delegate.php:43
-#: mod/delegate.php:54 mod/ostatus_subscribe.php:16 mod/profile_photo.php:30
-#: mod/profile_photo.php:176 mod/profile_photo.php:187
-#: mod/profile_photo.php:200 mod/unfollow.php:15 mod/unfollow.php:57
-#: mod/unfollow.php:90 mod/dirfind.php:25 mod/follow.php:17 mod/follow.php:54
-#: mod/follow.php:118 mod/invite.php:20 mod/invite.php:111 mod/crepair.php:98
-#: mod/message.php:59 mod/message.php:104 mod/dfrn_confirm.php:68
-#: mod/events.php:194 mod/group.php:26 mod/item.php:160 mod/network.php:32
-#: mod/notes.php:30 mod/notifications.php:73 mod/photos.php:174
-#: mod/photos.php:1039 mod/profiles.php:182 mod/profiles.php:513
-#: mod/register.php:54 mod/settings.php:43 mod/settings.php:142
-#: mod/settings.php:659 index.php:436
-msgid "Permission denied."
-msgstr "权限不够。"
-
-#: include/items.php:472 src/Content/Feature.php:96
-msgid "Archives"
-msgstr "档案"
-
-#: include/items.php:478 view/theme/vier/theme.php:258
-#: src/Content/ForumManager.php:130 src/Content/Widget.php:317
-#: src/Object/Post.php:438 src/App.php:527
-msgid "show more"
-msgstr "显示更多"
-
-#: include/security.php:81
-msgid "Welcome "
-msgstr "欢迎"
-
-#: include/security.php:82
-msgid "Please upload a profile photo."
-msgstr "请上传一张简介照片"
-
-#: include/security.php:84
-msgid "Welcome back "
-msgstr "欢迎回来"
-
-#: include/security.php:449
-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 "表格安全令牌不对。最可能因为表格开着太久（三个小时以上）提交前。"
-
 #: include/text.php:302
 msgid "newer"
 msgstr "更新"
@@ -889,417 +1266,2591 @@ msgstr "没有项目..."
 msgid "The end"
 msgstr ""
 
-#: include/text.php:884
+#: include/text.php:767
 msgid "No contacts"
 msgstr "没有联系人"
 
-#: include/text.php:908
+#: include/text.php:791
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d 联系人"
 
-#: include/text.php:921
+#: include/text.php:804
 msgid "View Contacts"
 msgstr "查看联系人"
 
-#: include/text.php:1010 mod/filer.php:35 mod/editpost.php:110
-#: mod/notes.php:67
+#: include/text.php:889 mod/filer.php:35 mod/editpost.php:100 mod/notes.php:54
 msgid "Save"
 msgstr "保存"
 
-#: include/text.php:1010
+#: include/text.php:889
 msgid "Follow"
 msgstr "关注"
 
-#: include/text.php:1016 mod/search.php:155 src/Content/Nav.php:142
+#: include/text.php:895 mod/search.php:162 src/Content/Nav.php:142
 msgid "Search"
 msgstr "搜索"
 
-#: include/text.php:1019 src/Content/Nav.php:58
+#: include/text.php:898 src/Content/Nav.php:58
 msgid "@name, !forum, #tags, content"
 msgstr ""
 
-#: include/text.php:1025 src/Content/Nav.php:145
+#: include/text.php:904 src/Content/Nav.php:145
 msgid "Full Text"
 msgstr "全文"
 
-#: include/text.php:1026 src/Content/Widget/TagCloud.php:54
-#: src/Content/Nav.php:146
+#: include/text.php:905 src/Content/Nav.php:146
+#: src/Content/Widget/TagCloud.php:53
 msgid "Tags"
 msgstr "标签："
 
-#: include/text.php:1027 mod/viewcontacts.php:131 mod/contacts.php:814
-#: mod/contacts.php:875 view/theme/frio/theme.php:270 src/Content/Nav.php:147
-#: src/Content/Nav.php:213 src/Model/Profile.php:955 src/Model/Profile.php:958
-msgid "Contacts"
-msgstr "联系人"
-
-#: include/text.php:1030 view/theme/vier/theme.php:253
-#: src/Content/ForumManager.php:125 src/Content/Nav.php:151
-msgid "Forums"
-msgstr "论坛"
-
-#: include/text.php:1074
+#: include/text.php:953
 msgid "poke"
 msgstr "戳"
 
-#: include/text.php:1074
+#: include/text.php:953
 msgid "poked"
 msgstr "戳了"
 
-#: include/text.php:1075
+#: include/text.php:954
 msgid "ping"
 msgstr "砰"
 
-#: include/text.php:1075
+#: include/text.php:954
 msgid "pinged"
 msgstr "砰了"
 
-#: include/text.php:1076
+#: include/text.php:955
 msgid "prod"
 msgstr "柔戳"
 
-#: include/text.php:1076
+#: include/text.php:955
 msgid "prodded"
 msgstr "柔戳了"
 
-#: include/text.php:1077
+#: include/text.php:956
 msgid "slap"
 msgstr "掌击"
 
-#: include/text.php:1077
+#: include/text.php:956
 msgid "slapped"
 msgstr "掌击了"
 
-#: include/text.php:1078
+#: include/text.php:957
 msgid "finger"
 msgstr "指"
 
-#: include/text.php:1078
+#: include/text.php:957
 msgid "fingered"
 msgstr "指了"
 
-#: include/text.php:1079
+#: include/text.php:958
 msgid "rebuff"
 msgstr "拒绝"
 
-#: include/text.php:1079
+#: include/text.php:958
 msgid "rebuffed"
 msgstr "已拒绝"
 
-#: include/text.php:1093 mod/settings.php:935 src/Model/Event.php:379
+#: include/text.php:972 mod/settings.php:941 src/Model/Event.php:388
 msgid "Monday"
 msgstr "星期一"
 
-#: include/text.php:1093 src/Model/Event.php:380
+#: include/text.php:972 src/Model/Event.php:389
 msgid "Tuesday"
 msgstr "星期二"
 
-#: include/text.php:1093 src/Model/Event.php:381
+#: include/text.php:972 src/Model/Event.php:390
 msgid "Wednesday"
 msgstr "星期三"
 
-#: include/text.php:1093 src/Model/Event.php:382
+#: include/text.php:972 src/Model/Event.php:391
 msgid "Thursday"
 msgstr "星期四"
 
-#: include/text.php:1093 src/Model/Event.php:383
+#: include/text.php:972 src/Model/Event.php:392
 msgid "Friday"
 msgstr "星期五"
 
-#: include/text.php:1093 src/Model/Event.php:384
+#: include/text.php:972 src/Model/Event.php:393
 msgid "Saturday"
 msgstr "星期六"
 
-#: include/text.php:1093 mod/settings.php:935 src/Model/Event.php:378
+#: include/text.php:972 mod/settings.php:941 src/Model/Event.php:387
 msgid "Sunday"
 msgstr "星期天"
 
-#: include/text.php:1097 src/Model/Event.php:399
+#: include/text.php:976 src/Model/Event.php:408
 msgid "January"
 msgstr "一月"
 
-#: include/text.php:1097 src/Model/Event.php:400
+#: include/text.php:976 src/Model/Event.php:409
 msgid "February"
 msgstr "二月"
 
-#: include/text.php:1097 src/Model/Event.php:401
+#: include/text.php:976 src/Model/Event.php:410
 msgid "March"
 msgstr "三月"
 
-#: include/text.php:1097 src/Model/Event.php:402
+#: include/text.php:976 src/Model/Event.php:411
 msgid "April"
 msgstr "四月"
 
-#: include/text.php:1097 include/text.php:1114 src/Model/Event.php:390
-#: src/Model/Event.php:403
+#: include/text.php:976 include/text.php:993 src/Model/Event.php:399
+#: src/Model/Event.php:412
 msgid "May"
 msgstr "五月"
 
-#: include/text.php:1097 src/Model/Event.php:404
+#: include/text.php:976 src/Model/Event.php:413
 msgid "June"
 msgstr "六月"
 
-#: include/text.php:1097 src/Model/Event.php:405
+#: include/text.php:976 src/Model/Event.php:414
 msgid "July"
 msgstr "七月"
 
-#: include/text.php:1097 src/Model/Event.php:406
+#: include/text.php:976 src/Model/Event.php:415
 msgid "August"
 msgstr "八月"
 
-#: include/text.php:1097 src/Model/Event.php:407
+#: include/text.php:976 src/Model/Event.php:416
 msgid "September"
 msgstr "九月"
 
-#: include/text.php:1097 src/Model/Event.php:408
+#: include/text.php:976 src/Model/Event.php:417
 msgid "October"
 msgstr "十月"
 
-#: include/text.php:1097 src/Model/Event.php:409
+#: include/text.php:976 src/Model/Event.php:418
 msgid "November"
 msgstr "十一月"
 
-#: include/text.php:1097 src/Model/Event.php:410
+#: include/text.php:976 src/Model/Event.php:419
 msgid "December"
 msgstr "十二月"
 
-#: include/text.php:1111 src/Model/Event.php:371
+#: include/text.php:990 src/Model/Event.php:380
 msgid "Mon"
 msgstr "星期一"
 
-#: include/text.php:1111 src/Model/Event.php:372
+#: include/text.php:990 src/Model/Event.php:381
 msgid "Tue"
 msgstr "星期二"
 
-#: include/text.php:1111 src/Model/Event.php:373
+#: include/text.php:990 src/Model/Event.php:382
 msgid "Wed"
 msgstr "星期三"
 
-#: include/text.php:1111 src/Model/Event.php:374
+#: include/text.php:990 src/Model/Event.php:383
 msgid "Thu"
 msgstr "星期四"
 
-#: include/text.php:1111 src/Model/Event.php:375
+#: include/text.php:990 src/Model/Event.php:384
 msgid "Fri"
 msgstr "星期五"
 
-#: include/text.php:1111 src/Model/Event.php:376
+#: include/text.php:990 src/Model/Event.php:385
 msgid "Sat"
 msgstr "星期六"
 
-#: include/text.php:1111 src/Model/Event.php:370
+#: include/text.php:990 src/Model/Event.php:379
 msgid "Sun"
 msgstr "星期日"
 
-#: include/text.php:1114 src/Model/Event.php:386
+#: include/text.php:993 src/Model/Event.php:395
 msgid "Jan"
 msgstr "一月"
 
-#: include/text.php:1114 src/Model/Event.php:387
+#: include/text.php:993 src/Model/Event.php:396
 msgid "Feb"
 msgstr "二月"
 
-#: include/text.php:1114 src/Model/Event.php:388
+#: include/text.php:993 src/Model/Event.php:397
 msgid "Mar"
 msgstr "三月"
 
-#: include/text.php:1114 src/Model/Event.php:389
+#: include/text.php:993 src/Model/Event.php:398
 msgid "Apr"
 msgstr "四月"
 
-#: include/text.php:1114 src/Model/Event.php:392
+#: include/text.php:993 src/Model/Event.php:401
 msgid "Jul"
 msgstr "七月"
 
-#: include/text.php:1114 src/Model/Event.php:393
+#: include/text.php:993 src/Model/Event.php:402
 msgid "Aug"
 msgstr "八月"
 
-#: include/text.php:1114
+#: include/text.php:993
 msgid "Sep"
 msgstr ""
 
-#: include/text.php:1114 src/Model/Event.php:395
+#: include/text.php:993 src/Model/Event.php:404
 msgid "Oct"
 msgstr "十月"
 
-#: include/text.php:1114 src/Model/Event.php:396
+#: include/text.php:993 src/Model/Event.php:405
 msgid "Nov"
 msgstr "十一月"
 
-#: include/text.php:1114 src/Model/Event.php:397
+#: include/text.php:993 src/Model/Event.php:406
 msgid "Dec"
 msgstr "十二月"
 
-#: include/text.php:1254
+#: include/text.php:1139
 #, php-format
 msgid "Content warning: %s"
 msgstr "内容警告：%s"
 
-#: include/text.php:1324 mod/videos.php:380
+#: include/text.php:1204 mod/videos.php:375
 msgid "View Video"
 msgstr "察看视频"
 
-#: include/text.php:1341
+#: include/text.php:1221
 msgid "bytes"
 msgstr "字节"
 
-#: include/text.php:1374 include/text.php:1385 include/text.php:1418
+#: include/text.php:1254 include/text.php:1265 include/text.php:1300
 msgid "Click to open/close"
 msgstr "点击为开关"
 
-#: include/text.php:1533
+#: include/text.php:1415
 msgid "View on separate page"
 msgstr "在另一页面中查看"
 
-#: include/text.php:1534
+#: include/text.php:1416
 msgid "view on separate page"
 msgstr "在另一页面中查看"
 
-#: include/text.php:1539 include/text.php:1546 src/Model/Event.php:594
+#: include/text.php:1421 include/text.php:1428 src/Model/Event.php:609
 msgid "link to source"
 msgstr "链接到来源"
 
-#: include/text.php:1753
+#: include/text.php:1615
 msgid "activity"
 msgstr "活动"
 
-#: include/text.php:1755 src/Object/Post.php:437 src/Object/Post.php:449
+#: include/text.php:1617 src/Object/Post.php:428 src/Object/Post.php:440
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "评论"
 
-#: include/text.php:1758
+#: include/text.php:1620
 msgid "post"
 msgstr "文章"
 
-#: include/text.php:1916
+#: include/text.php:1775
 msgid "Item filed"
 msgstr "把项目归档了"
 
-#: mod/allfriends.php:51
-msgid "No friends to display."
-msgstr "没有朋友展示。"
+#: include/api.php:1138
+#, 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] "达到每日 %d 发文限制。此文被拒绝发出。"
 
-#: mod/allfriends.php:90 mod/suggest.php:101 mod/match.php:105
-#: mod/dirfind.php:215 src/Content/Widget.php:37 src/Model/Profile.php:293
+#: include/api.php:1152
+#, 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] "达到每周 %d 发文限制。此文被拒绝发出。"
+
+#: include/api.php:1166
+#, php-format
+msgid "Monthly posting limit of %d post reached. The post was rejected."
+msgstr "达到每月 %d 发文限制。此文被拒绝发出。"
+
+#: include/api.php:4233 mod/profile_photo.php:84 mod/profile_photo.php:93
+#: mod/profile_photo.php:102 mod/profile_photo.php:211
+#: mod/profile_photo.php:300 mod/profile_photo.php:310 mod/photos.php:90
+#: mod/photos.php:198 mod/photos.php:735 mod/photos.php:1169
+#: mod/photos.php:1186 mod/photos.php:1678 src/Model/User.php:595
+#: src/Model/User.php:603 src/Model/User.php:611
+msgid "Profile Photos"
+msgstr "简介照片"
+
+#: mod/crepair.php:89
+msgid "Contact settings applied."
+msgstr "联系人设置已应用。"
+
+#: mod/crepair.php:91
+msgid "Contact update failed."
+msgstr "联系人更新失败。"
+
+#: mod/crepair.php:112 mod/redir.php:29 mod/redir.php:127
+#: mod/dfrn_confirm.php:127 mod/fsuggest.php:30 mod/fsuggest.php:96
+msgid "Contact not found."
+msgstr "没有找到联系人。"
+
+#: mod/crepair.php:116
+msgid ""
+"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
+" information your communications with this contact may stop working."
+msgstr "<strong>警告：此为进阶</strong>，如果您输入不正确的信息，您也许无法与这位联系人的正常通讯。"
+
+#: mod/crepair.php:117
+msgid ""
+"Please use your browser 'Back' button <strong>now</strong> if you are "
+"uncertain what to do on this page."
+msgstr "请<strong>立即</strong>用后退按钮如果您不确定怎么用这页"
+
+#: mod/crepair.php:131 mod/crepair.php:133
+msgid "No mirroring"
+msgstr "没有复制"
+
+#: mod/crepair.php:131
+msgid "Mirror as forwarded posting"
+msgstr "复制为传达文章"
+
+#: mod/crepair.php:131 mod/crepair.php:133
+msgid "Mirror as my own posting"
+msgstr "复制为我自己的文章"
+
+#: mod/crepair.php:146
+msgid "Return to contact editor"
+msgstr "返回到联系人编辑器"
+
+#: mod/crepair.php:148
+msgid "Refetch contact data"
+msgstr "重新获取联系人数据"
+
+#: mod/crepair.php:151
+msgid "Remote Self"
+msgstr "遥远的自身"
+
+#: mod/crepair.php:154
+msgid "Mirror postings from this contact"
+msgstr "把这个熟人的文章复制。"
+
+#: mod/crepair.php:156
+msgid ""
+"Mark this contact as remote_self, this will cause friendica to repost new "
+"entries from this contact."
+msgstr "表明这个熟人当遥远的自身。Friendica要把这个熟人的新的文章复制。"
+
+#: mod/crepair.php:160 mod/settings.php:677 mod/settings.php:703
+#: mod/admin.php:500 mod/admin.php:1890 mod/admin.php:1901 mod/admin.php:1915
+#: mod/admin.php:1931
+msgid "Name"
+msgstr "名字"
+
+#: mod/crepair.php:161
+msgid "Account Nickname"
+msgstr "帐户昵称"
+
+#: mod/crepair.php:162
+msgid "@Tagname - overrides Name/Nickname"
+msgstr "@Tagname越过名／昵称"
+
+#: mod/crepair.php:163
+msgid "Account URL"
+msgstr "帐户URL"
+
+#: mod/crepair.php:164
+msgid "Friend Request URL"
+msgstr "朋友请求URL"
+
+#: mod/crepair.php:165
+msgid "Friend Confirm URL"
+msgstr "朋友确认URL"
+
+#: mod/crepair.php:166
+msgid "Notification Endpoint URL"
+msgstr "通知端URL"
+
+#: mod/crepair.php:167
+msgid "Poll/Feed URL"
+msgstr "喂URL"
+
+#: mod/crepair.php:168
+msgid "New photo from this URL"
+msgstr "新照片从这个URL"
+
+#: mod/wallmessage.php:49 mod/wallmessage.php:112
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr "一天最多墙通知给%s超过了。通知没有通过 。"
+
+#: mod/wallmessage.php:57 mod/message.php:74
+msgid "No recipient selected."
+msgstr "没有选择的接受者。"
+
+#: mod/wallmessage.php:60
+msgid "Unable to check your home location."
+msgstr "核对不了您的主页。"
+
+#: mod/wallmessage.php:63 mod/message.php:81
+msgid "Message could not be sent."
+msgstr "消息发不了。"
+
+#: mod/wallmessage.php:66 mod/message.php:84
+msgid "Message collection failure."
+msgstr "通信受到错误。"
+
+#: mod/wallmessage.php:69 mod/message.php:87
+msgid "Message sent."
+msgstr "消息发了"
+
+#: mod/wallmessage.php:86 mod/wallmessage.php:95
+msgid "No recipient."
+msgstr "没有接受者。"
+
+#: mod/wallmessage.php:132 mod/message.php:249
+msgid "Send Private Message"
+msgstr "发私人的通信"
+
+#: mod/wallmessage.php:133
+#, 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 "如果您想%s回答，请核对您网站的隐私设置允许生发送人的私人邮件。"
+
+#: mod/wallmessage.php:134 mod/message.php:250 mod/message.php:419
+msgid "To:"
+msgstr "到："
+
+#: mod/wallmessage.php:135 mod/message.php:254 mod/message.php:421
+msgid "Subject:"
+msgstr "题目："
+
+#: mod/wallmessage.php:141 mod/message.php:258 mod/message.php:424
+#: mod/invite.php:150
+msgid "Your message:"
+msgstr "你的消息："
+
+#: mod/lockview.php:42 mod/lockview.php:50
+msgid "Remote privacy information not available."
+msgstr "摇隐私信息无效"
+
+#: mod/lockview.php:59
+msgid "Visible to:"
+msgstr "可见给："
+
+#: mod/install.php:100
+msgid "Friendica Communications Server - Setup"
+msgstr "Friendica沟通服务器－安装"
+
+#: mod/install.php:106
+msgid "Could not connect to database."
+msgstr "解不了数据库。"
+
+#: mod/install.php:110
+msgid "Could not create table."
+msgstr "无法创建表格。"
+
+#: mod/install.php:116
+msgid "Your Friendica site database has been installed."
+msgstr "您Friendica网站数据库被安装了。"
+
+#: mod/install.php:121
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr "您可能要手工地进口文件「database.sql」用phpmyadmin或mysql。"
+
+#: mod/install.php:122 mod/install.php:166 mod/install.php:274
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "请看文件「INSTALL.txt」"
+
+#: mod/install.php:134
+msgid "Database already in use."
+msgstr "数据库已经被使用。"
+
+#: mod/install.php:163
+msgid "System check"
+msgstr "系统检测"
+
+#: mod/install.php:167 mod/cal.php:279 mod/events.php:394
+msgid "Next"
+msgstr "下"
+
+#: mod/install.php:168
+msgid "Check again"
+msgstr "再检测"
+
+#: mod/install.php:187
+msgid "Database connection"
+msgstr "数据库接通"
+
+#: mod/install.php:188
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
+msgstr "为安装Friendica我们要知道怎么连接您的数据库。"
+
+#: mod/install.php:189
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "你有关于这些设置有问题的话，请给互联网托管服务或者网页管理联系。"
+
+#: mod/install.php:190
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "您下边指定的数据库应该已经存在。如果还没有，请创建后继续。"
+
+#: mod/install.php:194
+msgid "Database Server Name"
+msgstr "数据库服务器名"
+
+#: mod/install.php:195
+msgid "Database Login Name"
+msgstr "数据库登录名"
+
+#: mod/install.php:196
+msgid "Database Login Password"
+msgstr "数据库登录密码"
+
+#: mod/install.php:196
+msgid "For security reasons the password must not be empty"
+msgstr "由于安全的原因，密码不能为空"
+
+#: mod/install.php:197
+msgid "Database Name"
+msgstr "数据库名字"
+
+#: mod/install.php:198 mod/install.php:235
+msgid "Site administrator email address"
+msgstr "网站行政人员邮件地址"
+
+#: mod/install.php:198 mod/install.php:235
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "您账户邮件地址必要符合这个为用网站处理仪表板"
+
+#: mod/install.php:200 mod/install.php:238
+msgid "Please select a default timezone for your website"
+msgstr "请选择您网站的默认时区"
+
+#: mod/install.php:225
+msgid "Site settings"
+msgstr "网站设置"
+
+#: mod/install.php:239
+msgid "System Language:"
+msgstr "系统语言："
+
+#: mod/install.php:239
+msgid ""
+"Set the default language for your Friendica installation interface and to "
+"send emails."
+msgstr "为 Friendica 安装界面及邮件发送设置默认语言。"
+
+#: mod/install.php:255
+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 ""
+
+#: mod/install.php:272
+msgid "<h1>What next</h1>"
+msgstr "<h1>下步是什么</h1>"
+
+#: mod/install.php:273
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"worker."
+msgstr ""
+
+#: mod/install.php:276
+#, php-format
+msgid ""
+"Go to your new Friendica node <a href=\"%s/register\">registration page</a> "
+"and register as new user. Remember to use the same email you have entered as"
+" administrator email. This will allow you to enter the site admin panel."
+msgstr ""
+
+#: mod/dfrn_confirm.php:72 mod/profiles.php:38 mod/profiles.php:148
+#: mod/profiles.php:193 mod/profiles.php:523
+msgid "Profile not found."
+msgstr "找不到简介。"
+
+#: mod/dfrn_confirm.php:128
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it"
+" has already been approved."
+msgstr "这会偶尔地发生熟人双方都要求和已经批准的时候。"
+
+#: mod/dfrn_confirm.php:238
+msgid "Response from remote site was not understood."
+msgstr "遥网站的回答明白不了。"
+
+#: mod/dfrn_confirm.php:245 mod/dfrn_confirm.php:251
+msgid "Unexpected response from remote site: "
+msgstr "居然回答从遥网站："
+
+#: mod/dfrn_confirm.php:260
+msgid "Confirmation completed successfully."
+msgstr "确认成功完成。"
+
+#: mod/dfrn_confirm.php:272
+msgid "Temporary failure. Please wait and try again."
+msgstr "临时失败。请等一会，再试。"
+
+#: mod/dfrn_confirm.php:275
+msgid "Introduction failed or was revoked."
+msgstr "介绍失败或被吊销。"
+
+#: mod/dfrn_confirm.php:280
+msgid "Remote site reported: "
+msgstr "远程站点报告："
+
+#: mod/dfrn_confirm.php:392
+msgid "Unable to set contact photo."
+msgstr "无法设置联系人照片。"
+
+#: mod/dfrn_confirm.php:450
+#, php-format
+msgid "No user record found for '%s' "
+msgstr "找不到「%s」的用户记录"
+
+#: mod/dfrn_confirm.php:460
+msgid "Our site encryption key is apparently messed up."
+msgstr "看起来我们的加密钥匙失灵了。"
+
+#: mod/dfrn_confirm.php:471
+msgid "Empty site URL was provided or URL could not be decrypted by us."
+msgstr "空的URL供应，或URL解不了码。"
+
+#: mod/dfrn_confirm.php:487
+msgid "Contact record was not found for you on our site."
+msgstr "无法在本站点为您找到联系人记录。"
+
+#: mod/dfrn_confirm.php:501
+#, php-format
+msgid "Site public key not available in contact record for URL %s."
+msgstr "没有网站公开钥匙在熟人记录在URL%s。"
+
+#: mod/dfrn_confirm.php:517
+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:528
+msgid "Unable to set your contact credentials on our system."
+msgstr "不能创作您的熟人证件在我们的系统。"
+
+#: mod/dfrn_confirm.php:584
+msgid "Unable to update your contact profile details on our system"
+msgstr "不能更新您的熟人简介消息在我们的系统"
+
+#: mod/dfrn_confirm.php:614 mod/dfrn_request.php:561
+#: src/Model/Contact.php:1891
+msgid "[Name Withheld]"
+msgstr "[名字拒给]"
+
+#: mod/dirfind.php:53
+#, php-format
+msgid "People Search - %s"
+msgstr "搜索人 - %s"
+
+#: mod/dirfind.php:64
+#, php-format
+msgid "Forum Search - %s"
+msgstr "搜索论坛 - %s"
+
+#: mod/dirfind.php:221 mod/match.php:105 mod/suggest.php:104
+#: mod/allfriends.php:92 src/Model/Profile.php:292 src/Content/Widget.php:37
 msgid "Connect"
 msgstr "连接"
 
-#: mod/api.php:85 mod/api.php:107
-msgid "Authorize application connection"
-msgstr "授权应用连接"
+#: mod/dirfind.php:265 mod/match.php:125
+msgid "No matches"
+msgstr "没有结果"
 
-#: mod/api.php:86
-msgid "Return to your app and insert this Securty Code:"
-msgstr "回归您的应用和输入这个安全密码："
+#: mod/manage.php:180
+msgid "Manage Identities and/or Pages"
+msgstr "管理身份或页"
 
-#: mod/api.php:95
-msgid "Please login to continue."
-msgstr "请登录以继续。"
-
-#: mod/api.php:109
+#: mod/manage.php:181
 msgid ""
-"Do you want to authorize this application to access your posts and contacts,"
-" and/or create new posts for you?"
-msgstr "你要授权这个应用访问你的文章和联系人，及/或为你创建新的文章吗？"
+"Toggle between different identities or community/group pages which share "
+"your account details or which you have been granted \"manage\" permissions"
+msgstr "交替不同同一人或社会／组页合用您的账户或给您「管理」批准"
 
-#: mod/api.php:111 mod/follow.php:150 mod/dfrn_request.php:648
-#: mod/profiles.php:543 mod/profiles.php:547 mod/profiles.php:568
-#: mod/register.php:239 mod/settings.php:1094 mod/settings.php:1100
-#: mod/settings.php:1107 mod/settings.php:1111 mod/settings.php:1115
-#: mod/settings.php:1119 mod/settings.php:1123 mod/settings.php:1127
-#: mod/settings.php:1147 mod/settings.php:1148 mod/settings.php:1149
-#: mod/settings.php:1150 mod/settings.php:1151
+#: mod/manage.php:182
+msgid "Select an identity to manage: "
+msgstr "选择同一个人管理："
+
+#: mod/videos.php:138
+msgid "Do you really want to delete this video?"
+msgstr "你真的想删除这个视频吗？"
+
+#: mod/videos.php:143
+msgid "Delete Video"
+msgstr "删除视频"
+
+#: mod/videos.php:198 mod/webfinger.php:16 mod/directory.php:42
+#: mod/search.php:105 mod/search.php:111 mod/viewcontacts.php:48
+#: mod/display.php:194 mod/dfrn_request.php:599 mod/probe.php:13
+#: mod/community.php:28 mod/photos.php:945
+msgid "Public access denied."
+msgstr "拒绝公开访问"
+
+#: mod/videos.php:206
+msgid "No videos selected"
+msgstr "没有视频被选择"
+
+#: mod/videos.php:307 mod/photos.php:1050
+msgid "Access to this item is restricted."
+msgstr "这个项目使用权限的。"
+
+#: mod/videos.php:382 mod/photos.php:1699
+msgid "View Album"
+msgstr "看照片册"
+
+#: mod/videos.php:390
+msgid "Recent Videos"
+msgstr "最近的视频"
+
+#: mod/videos.php:392
+msgid "Upload New Videos"
+msgstr "上传新视频"
+
+#: mod/webfinger.php:17 mod/probe.php:14
+msgid "Only logged in users are permitted to perform a probing."
+msgstr "只有已登录用户才被允许进行探测。"
+
+#: mod/directory.php:151 mod/notifications.php:253 mod/contacts.php:680
+#: mod/events.php:521 src/Model/Event.php:66 src/Model/Event.php:93
+#: src/Model/Event.php:430 src/Model/Event.php:915 src/Model/Profile.php:417
+msgid "Location:"
+msgstr "位置:"
+
+#: mod/directory.php:156 mod/notifications.php:259 src/Model/Profile.php:420
+#: src/Model/Profile.php:732
+msgid "Gender:"
+msgstr "性别:"
+
+#: mod/directory.php:157 src/Model/Profile.php:421 src/Model/Profile.php:756
+msgid "Status:"
+msgstr "现状:"
+
+#: mod/directory.php:158 src/Model/Profile.php:422 src/Model/Profile.php:773
+msgid "Homepage:"
+msgstr "主页:"
+
+#: mod/directory.php:159 mod/notifications.php:255 mod/contacts.php:684
+#: src/Model/Profile.php:423 src/Model/Profile.php:793
+msgid "About:"
+msgstr "关于："
+
+#: mod/directory.php:209
+msgid "Find on this site"
+msgstr "找在这网站"
+
+#: mod/directory.php:211
+msgid "Results for:"
+msgstr "结果："
+
+#: mod/directory.php:213
+msgid "Site Directory"
+msgstr "网站目录"
+
+#: mod/directory.php:218
+msgid "No entries (some entries may be hidden)."
+msgstr "没有文章(有的文章会被隐藏)。"
+
+#: mod/match.php:48
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "没有符合的关键字。请在您的默认简介加关键字。"
+
+#: mod/match.php:104
+msgid "is interested in:"
+msgstr "感兴趣对："
+
+#: mod/match.php:120
+msgid "Profile Match"
+msgstr "简介符合"
+
+#: mod/settings.php:51 mod/photos.php:134
+msgid "everybody"
+msgstr "每人"
+
+#: mod/settings.php:56
+msgid "Account"
+msgstr "帐户"
+
+#: mod/settings.php:64 src/Model/Profile.php:372 src/Content/Nav.php:210
+msgid "Profiles"
+msgstr "简介"
+
+#: mod/settings.php:72 mod/admin.php:190
+msgid "Additional features"
+msgstr "附加的特点"
+
+#: mod/settings.php:80
+msgid "Display"
+msgstr "显示"
+
+#: mod/settings.php:87 mod/settings.php:840
+msgid "Social Networks"
+msgstr "社会化网络"
+
+#: mod/settings.php:94 mod/admin.php:188 mod/admin.php:2013 mod/admin.php:2073
+msgid "Addons"
+msgstr "插件"
+
+#: mod/settings.php:101 src/Content/Nav.php:205
+msgid "Delegations"
+msgstr "代表"
+
+#: mod/settings.php:108
+msgid "Connected apps"
+msgstr "连接着应用"
+
+#: mod/settings.php:115 mod/uexport.php:52
+msgid "Export personal data"
+msgstr "导出个人信息"
+
+#: mod/settings.php:122
+msgid "Remove account"
+msgstr "删除账户"
+
+#: mod/settings.php:174
+msgid "Missing some important data!"
+msgstr "缺失一些重要数据！"
+
+#: mod/settings.php:176 mod/settings.php:701 mod/contacts.php:848
+msgid "Update"
+msgstr "更新"
+
+#: mod/settings.php:285
+msgid "Failed to connect with email account using the settings provided."
+msgstr "不能连接电子邮件账户用输入的设置。"
+
+#: mod/settings.php:290
+msgid "Email settings updated."
+msgstr "电子邮件设置更新了"
+
+#: mod/settings.php:306
+msgid "Features updated"
+msgstr "特点更新了"
+
+#: mod/settings.php:379
+msgid "Relocate message has been send to your contacts"
+msgstr "调动消息已发送给您的联系人"
+
+#: mod/settings.php:391 src/Model/User.php:377
+msgid "Passwords do not match. Password unchanged."
+msgstr "密码不匹配。密码没改变。"
+
+#: mod/settings.php:396
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "空的密码禁止。密码没未改变的。"
+
+#: mod/settings.php:401 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:407
+msgid "Wrong password."
+msgstr "密码不正确。"
+
+#: mod/settings.php:414 src/Core/Console/NewPassword.php:89
+msgid "Password changed."
+msgstr "密码变化了。"
+
+#: mod/settings.php:416 src/Core/Console/NewPassword.php:86
+msgid "Password update failed. Please try again."
+msgstr "密码更新失败了。请再试。"
+
+#: mod/settings.php:500
+msgid " Please use a shorter name."
+msgstr " 请用一个更短的名字。"
+
+#: mod/settings.php:503
+msgid " Name too short."
+msgstr " 名字过短。"
+
+#: mod/settings.php:511
+msgid "Wrong Password"
+msgstr "密码不正确"
+
+#: mod/settings.php:516
+msgid "Invalid email."
+msgstr "无效的邮箱。"
+
+#: mod/settings.php:522
+msgid "Cannot change to that email."
+msgstr "无法更改到此电子邮件地址。"
+
+#: mod/settings.php:572
+msgid "Private forum has no privacy permissions. Using default privacy group."
+msgstr "私人评坛没有隐私批准。默认隐私组用者。"
+
+#: mod/settings.php:575
+msgid "Private forum has no privacy permissions and no default privacy group."
+msgstr "私人评坛没有隐私批准或默认隐私组。"
+
+#: mod/settings.php:615
+msgid "Settings updated."
+msgstr "设置更新了。"
+
+#: mod/settings.php:674 mod/settings.php:700 mod/settings.php:734
+msgid "Add application"
+msgstr "加入应用"
+
+#: mod/settings.php:675 mod/settings.php:782 mod/settings.php:870
+#: mod/settings.php:959 mod/settings.php:1189 mod/delegate.php:170
+#: mod/admin.php:317 mod/admin.php:1426 mod/admin.php:2074 mod/admin.php:2328
+#: mod/admin.php:2403 mod/admin.php:2550
+msgid "Save Settings"
+msgstr "保存设置"
+
+#: mod/settings.php:678 mod/settings.php:704
+msgid "Consumer Key"
+msgstr "钥匙(Consumer Key)"
+
+#: mod/settings.php:679 mod/settings.php:705
+msgid "Consumer Secret"
+msgstr "密码(Consumer Secret)"
+
+#: mod/settings.php:680 mod/settings.php:706
+msgid "Redirect"
+msgstr "重定向"
+
+#: mod/settings.php:681 mod/settings.php:707
+msgid "Icon url"
+msgstr "图符URL"
+
+#: mod/settings.php:692
+msgid "You can't edit this application."
+msgstr "您不能编辑这个应用。"
+
+#: mod/settings.php:733
+msgid "Connected Apps"
+msgstr "连接着应用"
+
+#: mod/settings.php:735 src/Object/Post.php:158 src/Object/Post.php:160
+msgid "Edit"
+msgstr "编辑"
+
+#: mod/settings.php:737
+msgid "Client key starts with"
+msgstr "客户钥匙头字是"
+
+#: mod/settings.php:738
+msgid "No name"
+msgstr "无名"
+
+#: mod/settings.php:739
+msgid "Remove authorization"
+msgstr "撤消权能"
+
+#: mod/settings.php:750
+msgid "No Addon settings configured"
+msgstr "无插件设置配置完成"
+
+#: mod/settings.php:759
+msgid "Addon Settings"
+msgstr "插件设置"
+
+#: mod/settings.php:773 mod/admin.php:2539 mod/admin.php:2540
+msgid "Off"
+msgstr "关"
+
+#: mod/settings.php:773 mod/admin.php:2539 mod/admin.php:2540
+msgid "On"
+msgstr "开"
+
+#: mod/settings.php:780
+msgid "Additional Features"
+msgstr "附加特性"
+
+#: mod/settings.php:803 src/Content/ContactSelector.php:82
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: mod/settings.php:803 mod/settings.php:804
+msgid "enabled"
+msgstr "能够做的"
+
+#: mod/settings.php:803 mod/settings.php:804
+msgid "disabled"
+msgstr "已停用"
+
+#: mod/settings.php:803 mod/settings.php:804
+#, php-format
+msgid "Built-in support for %s connectivity is %s"
+msgstr "包括的支持为%s连通性是%s"
+
+#: mod/settings.php:804
+msgid "GNU Social (OStatus)"
+msgstr "GNU Social (OStatus)"
+
+#: mod/settings.php:835
+msgid "Email access is disabled on this site."
+msgstr "电子邮件访问在这个站上被禁用。"
+
+#: mod/settings.php:845
+msgid "General Social Media Settings"
+msgstr "通用社交媒体设置"
+
+#: mod/settings.php:846
+msgid "Disable Content Warning"
+msgstr "禁用内容警告"
+
+#: mod/settings.php:846
+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 "
+"collapsing and sets the content warning as the post title. Doesn't affect "
+"any other content filtering you eventually set up."
+msgstr ""
+
+#: mod/settings.php:847
+msgid "Disable intelligent shortening"
+msgstr ""
+
+#: mod/settings.php:847
+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:848
+msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
+msgstr "自动关注任何 GNU Social (OStatus) 关注者/提及者"
+
+#: mod/settings.php:848
+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:849
+msgid "Default group for OStatus contacts"
+msgstr "用于 OStatus 联系人的默认组"
+
+#: mod/settings.php:850
+msgid "Your legacy GNU Social account"
+msgstr "您遗留的 GNU Social 账户"
+
+#: mod/settings.php:850
+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 "如果您在这里输入您旧的 GNU Social/Statusnet 账号名 (格式示例 user@domain.tld) ，您的联系人列表将会被自动添加。完成后该字段将被清空。"
+
+#: mod/settings.php:853
+msgid "Repair OStatus subscriptions"
+msgstr "修复 OStatus 订阅"
+
+#: mod/settings.php:857
+msgid "Email/Mailbox Setup"
+msgstr "邮件收件箱设置"
+
+#: mod/settings.php:858
+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:859
+msgid "Last successful email check:"
+msgstr "上个成功收件箱检查："
+
+#: mod/settings.php:861
+msgid "IMAP server name:"
+msgstr "IMAP服务器名字："
+
+#: mod/settings.php:862
+msgid "IMAP port:"
+msgstr "IMAP服务器端口："
+
+#: mod/settings.php:863
+msgid "Security:"
+msgstr "安全："
+
+#: mod/settings.php:863 mod/settings.php:868
+msgid "None"
+msgstr "没有"
+
+#: mod/settings.php:864
+msgid "Email login name:"
+msgstr "邮件登录名："
+
+#: mod/settings.php:865
+msgid "Email password:"
+msgstr "邮件密码："
+
+#: mod/settings.php:866
+msgid "Reply-to address:"
+msgstr "回答地址："
+
+#: mod/settings.php:867
+msgid "Send public posts to all email contacts:"
+msgstr "发送公开文章给所有的邮件联系人："
+
+#: mod/settings.php:868
+msgid "Action after import:"
+msgstr "进口后行动："
+
+#: mod/settings.php:868 src/Content/Nav.php:193
+msgid "Mark as seen"
+msgstr "标注看过"
+
+#: mod/settings.php:868
+msgid "Move to folder"
+msgstr "搬到文件夹"
+
+#: mod/settings.php:869
+msgid "Move to folder:"
+msgstr "搬到文件夹："
+
+#: mod/settings.php:903 mod/admin.php:1316
+msgid "No special theme for mobile devices"
+msgstr "没专门适合手机的主题"
+
+#: mod/settings.php:912
+#, php-format
+msgid "%s - (Unsupported)"
+msgstr "%s - (不支持的)"
+
+#: mod/settings.php:914
+#, php-format
+msgid "%s - (Experimental)"
+msgstr "%s - (实验性)"
+
+#: mod/settings.php:957
+msgid "Display Settings"
+msgstr "表示设置"
+
+#: mod/settings.php:963 mod/settings.php:987
+msgid "Display Theme:"
+msgstr "显示主题："
+
+#: mod/settings.php:964
+msgid "Mobile Theme:"
+msgstr "手机主题："
+
+#: mod/settings.php:965
+msgid "Suppress warning of insecure networks"
+msgstr ""
+
+#: mod/settings.php:965
+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:966
+msgid "Update browser every xx seconds"
+msgstr "更新游览器每XX秒"
+
+#: mod/settings.php:966
+msgid "Minimum of 10 seconds. Enter -1 to disable it."
+msgstr "至少 10 秒。输入 -1 禁用。"
+
+#: mod/settings.php:967
+msgid "Number of items to display per page:"
+msgstr "每页表示多少项目："
+
+#: mod/settings.php:967 mod/settings.php:968
+msgid "Maximum of 100 items"
+msgstr "最多100项目"
+
+#: mod/settings.php:968
+msgid "Number of items to display per page when viewed from mobile device:"
+msgstr "用手机看一页展示多少项目："
+
+#: mod/settings.php:969
+msgid "Don't show emoticons"
+msgstr "不显示表情符号"
+
+#: mod/settings.php:970
+msgid "Calendar"
+msgstr "日历"
+
+#: mod/settings.php:971
+msgid "Beginning of week:"
+msgstr "一周的开始："
+
+#: mod/settings.php:972
+msgid "Don't show notices"
+msgstr "不显示提示"
+
+#: mod/settings.php:973
+msgid "Infinite scroll"
+msgstr "无限的滚动"
+
+#: mod/settings.php:974
+msgid "Automatic updates only at the top of the network page"
+msgstr "仅在返回到网页头部时自动更新"
+
+#: mod/settings.php:974
+msgid ""
+"When disabled, the network page is updated all the time, which could be "
+"confusing while reading."
+msgstr "禁用后，网页将会一直更新，这可能会对阅读造成干扰。"
+
+#: mod/settings.php:975
+msgid "Bandwidth Saver Mode"
+msgstr ""
+
+#: mod/settings.php:975
+msgid ""
+"When enabled, embedded content is not displayed on automatic updates, they "
+"only show on page reload."
+msgstr "当启用时，嵌入的内容不会在自动更新时显示，它们只在页面重载时显示。"
+
+#: mod/settings.php:976
+msgid "Smart Threading"
+msgstr ""
+
+#: mod/settings.php:976
+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:978
+msgid "General Theme Settings"
+msgstr "通用主题设置"
+
+#: mod/settings.php:979
+msgid "Custom Theme Settings"
+msgstr "自定义主题设置"
+
+#: mod/settings.php:980
+msgid "Content Settings"
+msgstr "内容设置"
+
+#: mod/settings.php:1000
+msgid "Unable to find your profile. Please contact your admin."
+msgstr "无法找到您的简介。请联系您的管理员。"
+
+#: mod/settings.php:1039
+msgid "Account Types"
+msgstr "账户类型"
+
+#: mod/settings.php:1040
+msgid "Personal Page Subtypes"
+msgstr ""
+
+#: mod/settings.php:1041
+msgid "Community Forum Subtypes"
+msgstr ""
+
+#: mod/settings.php:1048 mod/admin.php:1841
+msgid "Personal Page"
+msgstr "个人页面"
+
+#: mod/settings.php:1049
+msgid "Account for a personal profile."
+msgstr ""
+
+#: mod/settings.php:1052 mod/admin.php:1842
+msgid "Organisation Page"
+msgstr "组织页面"
+
+#: mod/settings.php:1053
+msgid ""
+"Account for an organisation that automatically approves contact requests as "
+"\"Followers\"."
+msgstr ""
+
+#: mod/settings.php:1056 mod/admin.php:1843
+msgid "News Page"
+msgstr "新闻页面"
+
+#: mod/settings.php:1057
+msgid ""
+"Account for a news reflector that automatically approves contact requests as"
+" \"Followers\"."
+msgstr ""
+
+#: mod/settings.php:1060 mod/admin.php:1844
+msgid "Community Forum"
+msgstr "社区论坛"
+
+#: mod/settings.php:1061
+msgid "Account for community discussions."
+msgstr ""
+
+#: mod/settings.php:1064 mod/admin.php:1834
+msgid "Normal Account Page"
+msgstr "标准账户页面"
+
+#: mod/settings.php:1065
+msgid ""
+"Account for a regular personal profile that requires manual approval of "
+"\"Friends\" and \"Followers\"."
+msgstr ""
+
+#: mod/settings.php:1068 mod/admin.php:1835
+msgid "Soapbox Page"
+msgstr "演讲台页"
+
+#: mod/settings.php:1069
+msgid ""
+"Account for a public profile that automatically approves contact requests as"
+" \"Followers\"."
+msgstr ""
+
+#: mod/settings.php:1072 mod/admin.php:1836
+msgid "Public Forum"
+msgstr "公共论坛"
+
+#: mod/settings.php:1073
+msgid "Automatically approves all contact requests."
+msgstr "自动批准所有联系人请求。"
+
+#: mod/settings.php:1076 mod/admin.php:1837
+msgid "Automatic Friend Page"
+msgstr "自动朋友页"
+
+#: mod/settings.php:1077
+msgid ""
+"Account for a popular profile that automatically approves contact requests "
+"as \"Friends\"."
+msgstr ""
+
+#: mod/settings.php:1080
+msgid "Private Forum [Experimental]"
+msgstr "隐私评坛［实验性的 ］"
+
+#: mod/settings.php:1081
+msgid "Requires manual approval of contact requests."
+msgstr "需要人工批准联系人请求。"
+
+#: mod/settings.php:1092
+msgid "OpenID:"
+msgstr "OpenID:"
+
+#: mod/settings.php:1092
+msgid "(Optional) Allow this OpenID to login to this account."
+msgstr "(可选的) 允许这个 OpenID 登录这个账户。"
+
+#: mod/settings.php:1100
+msgid "Publish your default profile in your local site directory?"
+msgstr "出版您默认简介在您当地的网站目录？"
+
+#: mod/settings.php:1100
+#, php-format
+msgid ""
+"Your profile will be published in this node's <a href=\"%s\">local "
+"directory</a>. Your profile details may be publicly visible depending on the"
+" system settings."
+msgstr ""
+
+#: 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/register.php:238 mod/dfrn_request.php:645
+#: mod/api.php:111 mod/follow.php:150 mod/profiles.php:541
+#: mod/profiles.php:545 mod/profiles.php:566
 msgid "No"
 msgstr "否"
 
-#: mod/apps.php:14 index.php:265
-msgid "You must be logged in to use addons. "
-msgstr "您用插件前要登录"
+#: mod/settings.php:1106
+msgid "Publish your default profile in the global social directory?"
+msgstr "出版您默认简介在综合社会目录？"
 
-#: mod/apps.php:19
-msgid "Applications"
-msgstr "应用"
+#: 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/apps.php:22
-msgid "No installed applications."
-msgstr "没有安装的应用"
+#: mod/settings.php:1113
+msgid "Hide your contact/friend list from viewers of your default profile?"
+msgstr "在您的默认简介中向访问者隐藏您的联系人/朋友列表？"
 
-#: mod/attach.php:15
-msgid "Item not available."
-msgstr "项目不可用的"
+#: 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/attach.php:25
-msgid "Item was not found."
-msgstr "找不到项目。"
+#: mod/settings.php:1117
+msgid "Hide your profile details from anonymous viewers?"
+msgstr "对匿名访问者隐藏详细简介？"
 
-#: mod/common.php:91
+#: 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:1121
+msgid "Allow friends to post to your profile page?"
+msgstr "允许朋友们贴文章在您的简介页？"
+
+#: 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:1125
+msgid "Allow friends to tag your posts?"
+msgstr "允许朋友们标签您的文章？"
+
+#: mod/settings.php:1125
+msgid "Your contacts can add additional tags to your posts."
+msgstr "您的联系人可以为您的帖子添加额外的标签。"
+
+#: mod/settings.php:1129
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "允许我们建议您潜力朋友给新成员？"
+
+#: mod/settings.php:1129
+msgid ""
+"If you like, Friendica may suggest new members to add you as a contact."
+msgstr "如果您愿意，Friendica 可能会建议新成员将您添加为联系人。"
+
+#: mod/settings.php:1133
+msgid "Permit unknown people to send you private mail?"
+msgstr "允许生人寄给您私人邮件？"
+
+#: mod/settings.php:1133
+msgid ""
+"Friendica network users may send you private messages even if they are not "
+"in your contact list."
+msgstr "Friendica 网络用户可能会向您发送私人信息，即使他们不在您的联系人列表中。"
+
+#: mod/settings.php:1137
+msgid "Profile is <strong>not published</strong>."
+msgstr "简介<strong>未发布</strong>。"
+
+#: mod/settings.php:1143
+#, php-format
+msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
+msgstr "你的身份地址是 <strong>'%s'</strong> 或者 '%s'."
+
+#: mod/settings.php:1150
+msgid "Automatically expire posts after this many days:"
+msgstr "在这数天后自动使文章过期："
+
+#: mod/settings.php:1150
+msgid "If empty, posts will not expire. Expired posts will be deleted"
+msgstr "如果为空，文章不会过期。过期的文章将被删除"
+
+#: mod/settings.php:1151
+msgid "Advanced expiration settings"
+msgstr "高级过期设置"
+
+#: mod/settings.php:1152
+msgid "Advanced Expiration"
+msgstr "先进的过期"
+
+#: mod/settings.php:1153
+msgid "Expire posts:"
+msgstr "把文章过期："
+
+#: mod/settings.php:1154
+msgid "Expire personal notes:"
+msgstr "把私人便条过期："
+
+#: mod/settings.php:1155
+msgid "Expire starred posts:"
+msgstr "把星的文章过期："
+
+#: mod/settings.php:1156
+msgid "Expire photos:"
+msgstr "把照片过期："
+
+#: mod/settings.php:1157
+msgid "Only expire posts by others:"
+msgstr "只别人的文章过期："
+
+#: mod/settings.php:1187
+msgid "Account Settings"
+msgstr "帐户设置"
+
+#: mod/settings.php:1195
+msgid "Password Settings"
+msgstr "密码设置"
+
+#: mod/settings.php:1196 mod/register.php:275
+msgid "New Password:"
+msgstr "新密码："
+
+#: mod/settings.php:1197 mod/register.php:276
+msgid "Confirm:"
+msgstr "确认："
+
+#: mod/settings.php:1197
+msgid "Leave password fields blank unless changing"
+msgstr "留空密码字段，除非要修改"
+
+#: mod/settings.php:1198
+msgid "Current Password:"
+msgstr "当前密码："
+
+#: mod/settings.php:1198 mod/settings.php:1199
+msgid "Your current password to confirm the changes"
+msgstr "你的当前密码，来确认修改"
+
+#: mod/settings.php:1199
+msgid "Password:"
+msgstr "密码："
+
+#: mod/settings.php:1203
+msgid "Basic Settings"
+msgstr "基础设置"
+
+#: mod/settings.php:1204 src/Model/Profile.php:725
+msgid "Full Name:"
+msgstr "全名："
+
+#: mod/settings.php:1205
+msgid "Email Address:"
+msgstr "电子邮件地址:"
+
+#: mod/settings.php:1206
+msgid "Your Timezone:"
+msgstr "你的时区："
+
+#: mod/settings.php:1207
+msgid "Your Language:"
+msgstr "你的语言："
+
+#: mod/settings.php:1207
+msgid ""
+"Set the language we use to show you friendica interface and to send you "
+"emails"
+msgstr ""
+
+#: mod/settings.php:1208
+msgid "Default Post Location:"
+msgstr "默认文章位置："
+
+#: mod/settings.php:1209
+msgid "Use Browser Location:"
+msgstr "使用浏览器位置："
+
+#: mod/settings.php:1212
+msgid "Security and Privacy Settings"
+msgstr "安全和隐私设置"
+
+#: mod/settings.php:1214
+msgid "Maximum Friend Requests/Day:"
+msgstr "每天最大朋友请求数："
+
+#: mod/settings.php:1214 mod/settings.php:1243
+msgid "(to prevent spam abuse)"
+msgstr "（用于防止垃圾信息滥用）"
+
+#: mod/settings.php:1215
+msgid "Default Post Permissions"
+msgstr "默认文章权限"
+
+#: mod/settings.php:1216
+msgid "(click to open/close)"
+msgstr "（点击来打开/关闭）"
+
+#: mod/settings.php:1224 mod/photos.php:1126 mod/photos.php:1456
+msgid "Show to Groups"
+msgstr "给组表示"
+
+#: mod/settings.php:1225 mod/photos.php:1127 mod/photos.php:1457
+msgid "Show to Contacts"
+msgstr "展示给联系人"
+
+#: mod/settings.php:1226
+msgid "Default Private Post"
+msgstr "默认私人文章"
+
+#: mod/settings.php:1227
+msgid "Default Public Post"
+msgstr "默认公开文章"
+
+#: mod/settings.php:1231
+msgid "Default Permissions for New Posts"
+msgstr "新文章的默认权限"
+
+#: mod/settings.php:1243
+msgid "Maximum private messages per day from unknown people:"
+msgstr "每天来自未知的人的私信："
+
+#: mod/settings.php:1246
+msgid "Notification Settings"
+msgstr "通知设置"
+
+#: mod/settings.php:1247
+msgid "Send a notification email when:"
+msgstr "发一个消息要是："
+
+#: mod/settings.php:1248
+msgid "You receive an introduction"
+msgstr "你收到一份介绍"
+
+#: mod/settings.php:1249
+msgid "Your introductions are confirmed"
+msgstr "你的介绍被确认了"
+
+#: mod/settings.php:1250
+msgid "Someone writes on your profile wall"
+msgstr "某人写在你的简历墙"
+
+#: mod/settings.php:1251
+msgid "Someone writes a followup comment"
+msgstr "某人写一个后续的评论"
+
+#: mod/settings.php:1252
+msgid "You receive a private message"
+msgstr "你收到一封私信"
+
+#: mod/settings.php:1253
+msgid "You receive a friend suggestion"
+msgstr "你受到一个朋友建议"
+
+#: mod/settings.php:1254
+msgid "You are tagged in a post"
+msgstr "你被在新闻标签"
+
+#: mod/settings.php:1255
+msgid "You are poked/prodded/etc. in a post"
+msgstr "您在文章被戳"
+
+#: mod/settings.php:1257
+msgid "Activate desktop notifications"
+msgstr "启用桌面通知"
+
+#: mod/settings.php:1257
+msgid "Show desktop popup on new notifications"
+msgstr "在有新的提示时显示桌面弹出窗口"
+
+#: mod/settings.php:1259
+msgid "Text-only notification emails"
+msgstr "纯文本通知邮件"
+
+#: mod/settings.php:1261
+msgid "Send text only notification emails, without the html part"
+msgstr "发送纯文本通知邮件，无 html 部分"
+
+#: mod/settings.php:1263
+msgid "Show detailled notifications"
+msgstr "显示详细通知"
+
+#: 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:1267
+msgid "Advanced Account/Page Type Settings"
+msgstr "专家账户／页种设置"
+
+#: mod/settings.php:1268
+msgid "Change the behaviour of this account for special situations"
+msgstr "把这个账户特别情况的时候行动变化"
+
+#: mod/settings.php:1271
+msgid "Relocate"
+msgstr "调动"
+
+#: 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:1273
+msgid "Resend relocate message to contacts"
+msgstr "把调动信息寄给熟人"
+
+#: mod/ping.php:289
+msgid "{0} wants to be your friend"
+msgstr "{0}想成为您的朋友"
+
+#: mod/ping.php:305
+msgid "{0} sent you a message"
+msgstr "{0}发给您一个通信"
+
+#: mod/ping.php:321
+msgid "{0} requested registration"
+msgstr "{0}要求注册"
+
+#: mod/search.php:39 mod/network.php:194
+msgid "Remove term"
+msgstr "删除关键字"
+
+#: mod/search.php:48 mod/network.php:201 src/Content/Feature.php:100
+msgid "Saved Searches"
+msgstr "保存的搜索"
+
+#: mod/search.php:112
+msgid "Only logged in users are permitted to perform a search."
+msgstr "只有已登录的用户被允许进行搜索。"
+
+#: mod/search.php:136
+msgid "Too Many Requests"
+msgstr "过多请求"
+
+#: mod/search.php:137
+msgid "Only one search per minute is permitted for not logged in users."
+msgstr "对未登录的用户，每分钟只允许一条搜索。"
+
+#: mod/search.php:240 mod/community.php:161
+msgid "No results."
+msgstr "没有结果。"
+
+#: mod/search.php:246
+#, php-format
+msgid "Items tagged with: %s"
+msgstr "项目标记为：%s"
+
+#: mod/search.php:248 mod/contacts.php:841
+#, php-format
+msgid "Results for: %s"
+msgstr ""
+
+#: mod/common.php:93
 msgid "No contacts in common."
 msgstr "没有共同的联系人。"
 
-#: mod/common.php:140 mod/contacts.php:886
+#: mod/common.php:142 mod/contacts.php:916
 msgid "Common Friends"
 msgstr "普通朋友们"
 
-#: mod/credits.php:18
-msgid "Credits"
-msgstr "贡献"
+#: mod/bookmarklet.php:24 src/Module/Login.php:310 src/Content/Nav.php:114
+msgid "Login"
+msgstr "登录"
 
-#: mod/credits.php:19
+#: mod/bookmarklet.php:52
+msgid "The post was created"
+msgstr "文章创建了"
+
+#: mod/network.php:202 src/Model/Group.php:401
+msgid "add"
+msgstr "添加"
+
+#: mod/network.php:548
+#, php-format
 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 "Friendica 是一个社区项目，如果没有许多人的努力她将无法实现。这里列出了那些为代码作出贡献或者参与本地化翻译的人们。感谢大家的努力！"
+"Warning: This group contains %s member from a network that doesn't allow non"
+" public messages."
+msgid_plural ""
+"Warning: This group contains %s members from a network that doesn't allow "
+"non public messages."
+msgstr[0] "警告：这个组包含 %s 来自不允许非公开消息的网络的成员。"
 
-#: mod/fbrowser.php:34 view/theme/frio/theme.php:261 src/Content/Nav.php:102
-#: src/Model/Profile.php:902
-msgid "Photos"
-msgstr "照片"
+#: mod/network.php:551
+msgid "Messages in this group won't be send to these receivers."
+msgstr "这个组中的消息不会被发送至这些接收者。"
 
-#: mod/fbrowser.php:43 mod/fbrowser.php:68 mod/photos.php:194
-#: mod/photos.php:1050 mod/photos.php:1137 mod/photos.php:1154
-#: mod/photos.php:1653 mod/photos.php:1667 src/Model/Photo.php:244
-#: src/Model/Photo.php:253
-msgid "Contact Photos"
-msgstr "联系人照片"
+#: mod/network.php:620
+msgid "No such group"
+msgstr "没有这个组"
 
-#: mod/fbrowser.php:105 mod/fbrowser.php:136 mod/profile_photo.php:250
-msgid "Upload"
-msgstr "上传"
+#: mod/network.php:641 mod/group.php:247
+msgid "Group is empty"
+msgstr "组没有成员"
 
-#: mod/fbrowser.php:131
-msgid "Files"
-msgstr "文件"
+#: mod/network.php:645
+#, php-format
+msgid "Group: %s"
+msgstr "组：%s"
 
-#: mod/fetch.php:16 mod/fetch.php:52 mod/fetch.php:65 mod/p.php:21
-#: mod/p.php:48 mod/p.php:57 mod/help.php:60 index.php:312
-msgid "Not Found"
-msgstr "未发现"
+#: mod/network.php:671
+msgid "Private messages to this person are at risk of public disclosure."
+msgstr "私人通信给这个人回被公开。"
 
-#: mod/hcard.php:18
+#: mod/network.php:674
+msgid "Invalid contact."
+msgstr "无效的联系人。"
+
+#: mod/network.php:945
+msgid "Commented Order"
+msgstr "评论时间顺序"
+
+#: mod/network.php:948
+msgid "Sort by Comment Date"
+msgstr "按评论日期顺序排列"
+
+#: mod/network.php:953
+msgid "Posted Order"
+msgstr "发布时间顺序"
+
+#: mod/network.php:956
+msgid "Sort by Post Date"
+msgstr "按发布日期顺序排列"
+
+#: mod/network.php:964 mod/profiles.php:594
+#: src/Core/NotificationsManager.php:186
+msgid "Personal"
+msgstr "私人"
+
+#: mod/network.php:967
+msgid "Posts that mention or involve you"
+msgstr "提及你或你参与的文章"
+
+#: mod/network.php:975
+msgid "New"
+msgstr "新"
+
+#: mod/network.php:978
+msgid "Activity Stream - by date"
+msgstr "活动流－按日期"
+
+#: mod/network.php:986
+msgid "Shared Links"
+msgstr "共享的链接"
+
+#: mod/network.php:989
+msgid "Interesting Links"
+msgstr "有意思的超链接"
+
+#: mod/network.php:997
+msgid "Starred"
+msgstr "被星"
+
+#: mod/network.php:1000
+msgid "Favourite Posts"
+msgstr "最喜欢的文章"
+
+#: mod/group.php:36
+msgid "Group created."
+msgstr "群组已创建。"
+
+#: mod/group.php:42
+msgid "Could not create group."
+msgstr "无法创建群组。"
+
+#: mod/group.php:56 mod/group.php:187
+msgid "Group not found."
+msgstr "组找不到。"
+
+#: mod/group.php:70
+msgid "Group name changed."
+msgstr "组名变化了。"
+
+#: mod/group.php:101
+msgid "Save Group"
+msgstr "保存组"
+
+#: mod/group.php:102
+msgid "Filter"
+msgstr ""
+
+#: mod/group.php:107
+msgid "Create a group of contacts/friends."
+msgstr "创建一组联系人／朋友。"
+
+#: mod/group.php:108 mod/group.php:134 mod/group.php:229
+#: src/Model/Group.php:410
+msgid "Group Name: "
+msgstr "组名："
+
+#: mod/group.php:125 src/Model/Group.php:407
+msgid "Contacts not in any group"
+msgstr "不在任何组的联系人"
+
+#: mod/group.php:157
+msgid "Group removed."
+msgstr "组删除了。"
+
+#: mod/group.php:159
+msgid "Unable to remove group."
+msgstr "不能删除组。"
+
+#: mod/group.php:222
+msgid "Delete Group"
+msgstr "删除群组"
+
+#: mod/group.php:233
+msgid "Edit Group Name"
+msgstr "编辑群组名称"
+
+#: mod/group.php:244
+msgid "Members"
+msgstr "成员"
+
+#: mod/group.php:246 mod/contacts.php:739
+msgid "All Contacts"
+msgstr "所有联系人"
+
+#: mod/group.php:260
+msgid "Remove contact from group"
+msgstr ""
+
+#: mod/group.php:278 mod/profperm.php:118
+msgid "Click on a contact to add or remove."
+msgstr "单击联系人以添加或删除。"
+
+#: mod/group.php:292
+msgid "Add contact to group"
+msgstr ""
+
+#: mod/delegate.php:39
+msgid "Parent user not found."
+msgstr "未找到家长账户。"
+
+#: mod/delegate.php:146
+msgid "No parent user"
+msgstr "无家长账户"
+
+#: mod/delegate.php:161
+msgid "Parent Password:"
+msgstr "家长密码："
+
+#: mod/delegate.php:161
+msgid ""
+"Please enter the password of the parent account to legitimize your request."
+msgstr "请为家长账户设置密码以使您的请求有效化。"
+
+#: mod/delegate.php:166
+msgid "Parent User"
+msgstr "家长账户"
+
+#: mod/delegate.php:169
+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:171 src/Content/Nav.php:205
+msgid "Delegate Page Management"
+msgstr "页代表管理"
+
+#: mod/delegate.php:172
+msgid "Delegates"
+msgstr "代表"
+
+#: mod/delegate.php:174
+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:175
+msgid "Existing Page Delegates"
+msgstr "目前页代表"
+
+#: mod/delegate.php:177
+msgid "Potential Delegates"
+msgstr "潜力的代表"
+
+#: mod/delegate.php:179 mod/tagrm.php:90
+msgid "Remove"
+msgstr "移走"
+
+#: mod/delegate.php:180
+msgid "Add"
+msgstr "加"
+
+#: mod/delegate.php:181
+msgid "No entries."
+msgstr "没有项目。"
+
+#: mod/uexport.php:44
+msgid "Export account"
+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."
+msgstr "导出你的账户信息和联系人。用这个功能来生成一个你的账户的备份，并且/或者把它移到另外一个服务器。"
+
+#: mod/uexport.php:45
+msgid "Export all"
+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)"
+msgstr "导出你的账户信息、联系人和所有你的项目为 json 格式。可能会是一个很大的文件，并可能花费很多时间。用这个功能来做一个你的账户的全备份（照片不会被导出）"
+
+#: mod/repair_ostatus.php:21
+msgid "Resubscribing to OStatus contacts"
+msgstr "重新订阅 OStatus 联系人"
+
+#: mod/repair_ostatus.php:37
+msgid "Error"
+msgstr "错误"
+
+#: mod/repair_ostatus.php:52 mod/ostatus_subscribe.php:65
+msgid "Done"
+msgstr "完成"
+
+#: mod/repair_ostatus.php:58 mod/ostatus_subscribe.php:89
+msgid "Keep this window open until done."
+msgstr "保持窗口打开直到完成。"
+
+#: mod/viewcontacts.php:20 mod/viewcontacts.php:24 mod/cal.php:32
+#: mod/cal.php:36 mod/follow.php:19 mod/community.php:35 mod/viewsrc.php:13
+msgid "Access denied."
+msgstr "没有用权。"
+
+#: mod/viewcontacts.php:90
+msgid "No contacts."
+msgstr "没有联系人。"
+
+#: mod/viewcontacts.php:106 mod/contacts.php:639 mod/contacts.php:1052
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "看%s的简介[%s]"
+
+#: mod/unfollow.php:36
+msgid "Contact wasn't found or can't be unfollowed."
+msgstr "找不到联系人或者不能关注联系人。"
+
+#: mod/unfollow.php:49
+msgid "Contact unfollowed"
+msgstr "取消关注了的联系人"
+
+#: mod/unfollow.php:67 mod/dfrn_request.php:654 mod/follow.php:62
+msgid "Submit Request"
+msgstr "提交要求"
+
+#: mod/unfollow.php:76
+msgid "You aren't a friend of this contact."
+msgstr "你不是这个联系人的朋友。"
+
+#: mod/unfollow.php:82
+msgid "Unfollowing is currently not supported by your network."
+msgstr "取消关注现在不被你的网络支持。"
+
+#: mod/unfollow.php:103 mod/contacts.php:601
+msgid "Disconnect/Unfollow"
+msgstr "断开连接/取消关注"
+
+#: mod/unfollow.php:116 mod/dfrn_request.php:652 mod/follow.php:157
+msgid "Your Identity Address:"
+msgstr "你的身份地址："
+
+#: mod/unfollow.php:125 mod/notifications.php:174 mod/notifications.php:263
+#: mod/admin.php:500 mod/admin.php:510 mod/contacts.php:676 mod/follow.php:166
+msgid "Profile URL"
+msgstr "简介 URL"
+
+#: mod/unfollow.php:135 mod/contacts.php:888 mod/follow.php:189
+#: src/Model/Profile.php:878
+msgid "Status Messages and Posts"
+msgstr "现状通知和文章"
+
+#: mod/update_notes.php:36 mod/update_network.php:33
+#: mod/update_contacts.php:24 mod/update_profile.php:35
+#: mod/update_community.php:23 mod/update_display.php:24
+msgid "[Embedded content - reload page to view]"
+msgstr "[嵌入内容－重新加载页为看]"
+
+#: mod/register.php:99
+msgid ""
+"Registration successful. Please check your email for further instructions."
+msgstr "注册成功了。请咨询说明再您的收件箱。"
+
+#: mod/register.php:103
+#, 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 "发送邮件失败。你的账户消息是：<br>用户名：%s<br> 密码: %s<br><br>。登录后能改密码。"
+
+#: mod/register.php:110
+msgid "Registration successful."
+msgstr "注册成功。"
+
+#: mod/register.php:115
+msgid "Your registration can not be processed."
+msgstr "处理不了您的注册。"
+
+#: mod/register.php:162
+msgid "Your registration is pending approval by the site owner."
+msgstr "您的注册等网页主的批准。"
+
+#: mod/register.php:191 mod/uimport.php:55
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr "这个网站超过一天最多账户注册。请明天再试。"
+
+#: mod/register.php:220
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
+msgstr "您会(可选的)用OpenID填这个表格通过提供您的OpenID和点击「注册」。"
+
+#: mod/register.php:221
+msgid ""
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
+msgstr "如果您没熟悉OpenID,请留空这个栏和填另些栏。"
+
+#: mod/register.php:222
+msgid "Your OpenID (optional): "
+msgstr "您的OpenID(可选的):"
+
+#: mod/register.php:234
+msgid "Include your profile in member directory?"
+msgstr "放您的简介再员目录？"
+
+#: mod/register.php:261
+msgid "Note for the admin"
+msgstr "给管理员的便条"
+
+#: mod/register.php:261
+msgid "Leave a message for the admin, why you want to join this node"
+msgstr "给管理员留条消息，为什么你想加入这个节点"
+
+#: mod/register.php:262
+msgid "Membership on this site is by invitation only."
+msgstr "会员身份在这个网站是光通过邀请。"
+
+#: mod/register.php:263
+msgid "Your invitation code: "
+msgstr "您的邀请码："
+
+#: mod/register.php:266 mod/admin.php:1428
+msgid "Registration"
+msgstr "注册"
+
+#: mod/register.php:272
+msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
+msgstr "你的全名 (比如张三，真名或看起来是真名)："
+
+#: mod/register.php:273
+msgid ""
+"Your Email Address: (Initial information will be send there, so this has to "
+"be an existing address.)"
+msgstr "您的电子邮件地址：(初始信息将发送到这里，所以这必须是一个存在的地址。)"
+
+#: mod/register.php:275
+msgid "Leave empty for an auto generated password."
+msgstr "留空以使用自动生成的密码。"
+
+#: mod/register.php:277
+#, 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
+msgid "Choose a nickname: "
+msgstr "选择昵称："
+
+#: mod/register.php:281 src/Module/Login.php:281 src/Content/Nav.php:128
+msgid "Register"
+msgstr "注册"
+
+#: mod/register.php:287 mod/uimport.php:70
+msgid "Import"
+msgstr ""
+
+#: mod/register.php:288
+msgid "Import your profile to this friendica instance"
+msgstr "进口您的简介到这个friendica服务器"
+
+#: mod/register.php:290 mod/admin.php:191 mod/admin.php:310
+#: src/Module/Tos.php:70 src/Content/Nav.php:178
+msgid "Terms of Service"
+msgstr "服务条款"
+
+#: mod/register.php:296
+msgid "Note: This node explicitly contains adult content"
+msgstr ""
+
+#: mod/notifications.php:35
+msgid "Invalid request identifier."
+msgstr "无效要求身份号。"
+
+#: mod/notifications.php:44 mod/notifications.php:183
+#: mod/notifications.php:235 mod/message.php:114
+msgid "Discard"
+msgstr "丢弃"
+
+#: mod/notifications.php:57 mod/notifications.php:182
+#: mod/notifications.php:271 mod/contacts.php:658 mod/contacts.php:850
+#: mod/contacts.php:1113
+msgid "Ignore"
+msgstr "忽视"
+
+#: mod/notifications.php:93 src/Content/Nav.php:191
+msgid "Notifications"
+msgstr "通知"
+
+#: mod/notifications.php:101
+msgid "Network Notifications"
+msgstr "网络通知"
+
+#: mod/notifications.php:106 mod/notify.php:81
+msgid "System Notifications"
+msgstr "系统通知"
+
+#: mod/notifications.php:111
+msgid "Personal Notifications"
+msgstr "私人通知"
+
+#: mod/notifications.php:116
+msgid "Home Notifications"
+msgstr "主页通知"
+
+#: mod/notifications.php:148
+msgid "Show Ignored Requests"
+msgstr "显示被忽视的请求"
+
+#: mod/notifications.php:148
+msgid "Hide Ignored Requests"
+msgstr "隐藏被忽视的请求"
+
+#: mod/notifications.php:161 mod/notifications.php:243
+msgid "Notification type:"
+msgstr ""
+
+#: mod/notifications.php:164
+msgid "Suggested by:"
+msgstr ""
+
+#: mod/notifications.php:176 mod/notifications.php:260 mod/contacts.php:666
+msgid "Hide this contact from others"
+msgstr "对其他人隐藏这个联系人"
+
+#: mod/notifications.php:179 mod/notifications.php:269 mod/admin.php:1904
+msgid "Approve"
+msgstr "批准"
+
+#: mod/notifications.php:202
+msgid "Claims to be known to you: "
+msgstr "声称被您认识："
+
+#: mod/notifications.php:203
+msgid "yes"
+msgstr "是"
+
+#: mod/notifications.php:203
+msgid "no"
+msgstr "否"
+
+#: mod/notifications.php:204 mod/notifications.php:209
+msgid "Shall your connection be bidirectional or not?"
+msgstr "是否启用双向连接？"
+
+#: mod/notifications.php:205 mod/notifications.php:210
+#, 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:206
+#, 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:211
+#, 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:222
+msgid "Friend"
+msgstr "朋友"
+
+#: mod/notifications.php:223
+msgid "Sharer"
+msgstr "分享者"
+
+#: mod/notifications.php:223
+msgid "Subscriber"
+msgstr "订阅者"
+
+#: mod/notifications.php:257 mod/contacts.php:686 mod/follow.php:177
+#: src/Model/Profile.php:781
+msgid "Tags:"
+msgstr "标签："
+
+#: mod/notifications.php:266 mod/contacts.php:76 src/Model/Profile.php:520
+msgid "Network:"
+msgstr "网络"
+
+#: mod/notifications.php:280
+msgid "No introductions."
+msgstr "没有介绍。"
+
+#: mod/notifications.php:318
+msgid "Show unread"
+msgstr "显示未读"
+
+#: mod/notifications.php:318
+msgid "Show all"
+msgstr "显示全部"
+
+#: mod/notifications.php:323
+#, php-format
+msgid "No more %s notifications."
+msgstr "没有更多的 %s 通知。"
+
+#: mod/message.php:31 mod/message.php:120 src/Content/Nav.php:199
+msgid "New Message"
+msgstr "新的消息"
+
+#: mod/message.php:78
+msgid "Unable to locate contact information."
+msgstr "无法找到联系人信息。"
+
+#: mod/message.php:152
+msgid "Do you really want to delete this message?"
+msgstr "您真的想删除这个通知吗？"
+
+#: mod/message.php:169
+msgid "Message deleted."
+msgstr "消息删除了。"
+
+#: mod/message.php:184
+msgid "Conversation removed."
+msgstr "交流删除了。"
+
+#: mod/message.php:290
+msgid "No messages."
+msgstr "没有消息"
+
+#: mod/message.php:331
+msgid "Message not available."
+msgstr "通信不可用的"
+
+#: mod/message.php:395
+msgid "Delete message"
+msgstr "删除消息"
+
+#: mod/message.php:397 mod/message.php:498
+msgid "D, d M Y - g:i A"
+msgstr "D, d M Y - g:i A"
+
+#: mod/message.php:412 mod/message.php:495
+msgid "Delete conversation"
+msgstr "删除交谈"
+
+#: mod/message.php:414
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "没可用的安全交通。您<strong>可能</strong>会在发送人的简介页会回答。"
+
+#: mod/message.php:418
+msgid "Send Reply"
+msgstr "发回答"
+
+#: mod/message.php:469
+#, php-format
+msgid "Unknown sender - %s"
+msgstr "生发送人－%s"
+
+#: mod/message.php:471
+#, php-format
+msgid "You and %s"
+msgstr "您和%s"
+
+#: mod/message.php:473
+#, php-format
+msgid "%s and You"
+msgstr "%s和您"
+
+#: mod/message.php:501
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d通知"
+
+#: mod/hcard.php:19
 msgid "No profile"
 msgstr "无简介"
 
+#: mod/ostatus_subscribe.php:22
+msgid "Subscribing to OStatus contacts"
+msgstr "正在订阅 OStatus 联系人"
+
+#: mod/ostatus_subscribe.php:34
+msgid "No contact provided."
+msgstr "未提供联系人。"
+
+#: mod/ostatus_subscribe.php:41
+msgid "Couldn't fetch information for contact."
+msgstr "无法获取联系人信息。"
+
+#: mod/ostatus_subscribe.php:51
+msgid "Couldn't fetch friends for contact."
+msgstr "无法取得联系人的朋友信息。"
+
+#: mod/ostatus_subscribe.php:79
+msgid "success"
+msgstr "成功"
+
+#: mod/ostatus_subscribe.php:81
+msgid "failed"
+msgstr "失败"
+
+#: mod/ostatus_subscribe.php:84 src/Object/Post.php:264
+msgid "ignored"
+msgstr "已忽视的"
+
+#: mod/dfrn_poll.php:126 mod/dfrn_poll.php:549
+#, php-format
+msgid "%1$s welcomes %2$s"
+msgstr "%1$s欢迎%2$s"
+
+#: mod/removeme.php:47
+msgid "User deleted their account"
+msgstr ""
+
+#: mod/removeme.php:48
+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
+#, php-format
+msgid "The user id is %d"
+msgstr "用户 id 为 %d"
+
+#: mod/removeme.php:81 mod/removeme.php:84
+msgid "Remove My Account"
+msgstr "删除我的账户"
+
+#: mod/removeme.php:82
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
+msgstr "这要完全删除您的账户。这一做过，就不能恢复。"
+
+#: mod/removeme.php:83
+msgid "Please enter your password for verification:"
+msgstr "请输入密码为确认："
+
+#: mod/tagrm.php:43
+msgid "Tag removed"
+msgstr "标签去除了"
+
+#: mod/tagrm.php:77
+msgid "Remove Item Tag"
+msgstr "去除项目标签"
+
+#: mod/tagrm.php:79
+msgid "Select a tag to remove: "
+msgstr "选择删除一个标签: "
+
 #: mod/home.php:39
 #, php-format
 msgid "Welcome to %s"
 msgstr "%s欢迎你"
 
-#: mod/lockview.php:38 mod/lockview.php:46
-msgid "Remote privacy information not available."
-msgstr "摇隐私信息无效"
+#: mod/suggest.php:38
+msgid "Do you really want to delete this suggestion?"
+msgstr "您真的想删除这个建议吗？"
 
-#: mod/lockview.php:55
-msgid "Visible to:"
-msgstr "可见给："
+#: mod/suggest.php:74
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "没有建议。如果这是新网站，请24小时后再试。"
 
-#: mod/maintenance.php:24
-msgid "System down for maintenance"
-msgstr "系统关闭为了维持"
+#: mod/suggest.php:87 mod/suggest.php:107
+msgid "Ignore/Hide"
+msgstr "忽视／隐藏"
+
+#: mod/filer.php:34
+msgid "- select -"
+msgstr "－选择－"
+
+#: mod/friendica.php:78
+#, 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:84
+msgid ""
+"Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
+"about the Friendica project."
+msgstr "请浏览 <a href=\"https://friendi.ca\">Friendi.ca</a> 以了解更多关于 Friendica 项目的信息。"
+
+#: mod/friendica.php:88
+msgid "Bug reports and issues: please visit"
+msgstr "Bug 及 issues 报告：请访问"
+
+#: mod/friendica.php:88
+msgid "the bugtracker at github"
+msgstr "在 github 上的错误追踪系统"
+
+#: mod/friendica.php:91
+msgid "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
+msgstr ""
+
+#: mod/friendica.php:105
+msgid "Installed addons/apps:"
+msgstr "已安装的插件/应用："
+
+#: mod/friendica.php:119
+msgid "No installed addons/apps"
+msgstr "没有已安装的插件或应用"
+
+#: mod/friendica.php:124
+#, php-format
+msgid "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
+msgstr "阅读此节点的<a href=\"%1$s/tos\">服务条款</a>。"
+
+#: mod/friendica.php:129
+msgid "On this server the following remote servers are blocked."
+msgstr "在这个服务器上以下远程服务器被封禁了。"
+
+#: mod/friendica.php:130 mod/admin.php:363 mod/admin.php:381
+#: mod/dfrn_request.php:345 src/Model/Contact.php:1582
+msgid "Blocked domain"
+msgstr "被封禁的域名"
+
+#: mod/friendica.php:130 mod/admin.php:364 mod/admin.php:382
+msgid "Reason for the block"
+msgstr "封禁原因"
+
+#: mod/display.php:303 mod/cal.php:144 mod/profile.php:175
+msgid "Access to this profile has been restricted."
+msgstr "使用权这个简介被限制了."
+
+#: mod/wall_upload.php:39 mod/wall_upload.php:55 mod/wall_upload.php:113
+#: mod/wall_upload.php:164 mod/wall_upload.php:167 mod/wall_attach.php:27
+#: mod/wall_attach.php:34 mod/wall_attach.php:89
+msgid "Invalid request."
+msgstr "无效请求。"
+
+#: mod/wall_upload.php:195 mod/profile_photo.php:151 mod/photos.php:776
+#: mod/photos.php:779 mod/photos.php:808
+#, php-format
+msgid "Image exceeds size limit of %s"
+msgstr "图片超过 %s 的大小限制"
+
+#: mod/wall_upload.php:209 mod/profile_photo.php:160 mod/photos.php:831
+msgid "Unable to process image."
+msgstr "处理不了图像."
+
+#: mod/wall_upload.php:240 mod/item.php:473 src/Object/Image.php:966
+#: src/Object/Image.php:982 src/Object/Image.php:990 src/Object/Image.php:1015
+msgid "Wall Photos"
+msgstr "墙照片"
+
+#: mod/wall_upload.php:248 mod/profile_photo.php:305 mod/photos.php:860
+msgid "Image upload failed."
+msgstr "图像上载失败了."
 
 #: mod/newmember.php:11
 msgid "Welcome to Friendica"
@@ -1332,11 +3883,6 @@ msgid ""
 " join."
 msgstr "在你的<em>快速上手</em>页－找到一个简要的对你的简介和网络标签的介绍，创建一些新的连接，并找一些群组加入。"
 
-#: mod/newmember.php:19 mod/admin.php:1940 mod/admin.php:2210
-#: mod/settings.php:124 view/theme/frio/theme.php:269 src/Content/Nav.php:207
-msgid "Settings"
-msgstr "设置"
-
 #: mod/newmember.php:21
 msgid "Go to Your Settings"
 msgstr "您的设置"
@@ -1356,14 +3902,7 @@ msgid ""
 "potential friends know exactly how to find you."
 msgstr "校对别的设置，特别是隐私设置。一个未发布的目录项目是跟未出版的电话号码一样。平时，你可能应该出版你的目录项目-除非都你的朋友们和可交的朋友们已经知道确切地怎么找你。"
 
-#: mod/newmember.php:24 mod/profperm.php:113 mod/contacts.php:671
-#: mod/contacts.php:863 view/theme/frio/theme.php:260 src/Content/Nav.php:101
-#: src/Model/Profile.php:728 src/Model/Profile.php:861
-#: src/Model/Profile.php:894
-msgid "Profile"
-msgstr "简介"
-
-#: mod/newmember.php:26 mod/profile_photo.php:249 mod/profiles.php:598
+#: mod/newmember.php:26 mod/profile_photo.php:246 mod/profiles.php:598
 msgid "Upload Profile Photo"
 msgstr "上传简历照片"
 
@@ -1446,7 +3985,7 @@ msgid ""
 "hours."
 msgstr "在熟人页的工具栏有一些工具为找新朋友们。我们会使人们相配按名或兴趣，和以网络关系作为提醒建议的根据。在新网站，朋友建议平常开始24小时后。"
 
-#: mod/newmember.php:43 src/Model/Group.php:414
+#: mod/newmember.php:43 src/Model/Group.php:402
 msgid "Groups"
 msgstr "组"
 
@@ -1486,1223 +4025,15 @@ msgid ""
 " features and resources."
 msgstr "我们<strong>帮助</strong>页可查阅到详情关于别的编程特点和资源。"
 
-#: mod/nogroup.php:42 mod/viewcontacts.php:112 mod/contacts.php:619
-#: mod/contacts.php:959
-#, php-format
-msgid "Visit %s's profile [%s]"
-msgstr "看%s的简介[%s]"
-
-#: mod/nogroup.php:43 mod/contacts.php:960
-msgid "Edit contact"
-msgstr "编辑联系人"
-
-#: mod/nogroup.php:63
-msgid "Contacts who are not members of a group"
-msgstr "不在组里的联系人"
-
-#: mod/p.php:14
-msgid "Not Extended"
-msgstr "未扩展"
-
-#: mod/repair_ostatus.php:18
-msgid "Resubscribing to OStatus contacts"
-msgstr "重新订阅 OStatus 联系人"
-
-#: mod/repair_ostatus.php:34
-msgid "Error"
-msgstr "错误"
-
-#: mod/repair_ostatus.php:48 mod/ostatus_subscribe.php:64
-msgid "Done"
-msgstr "完成"
-
-#: mod/repair_ostatus.php:54 mod/ostatus_subscribe.php:88
-msgid "Keep this window open until done."
-msgstr "保持窗口打开直到完成。"
-
-#: mod/suggest.php:36
-msgid "Do you really want to delete this suggestion?"
-msgstr "您真的想删除这个建议吗？"
-
-#: mod/suggest.php:73
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr "没有建议。如果这是新网站，请24小时后再试。"
-
-#: mod/suggest.php:84 mod/suggest.php:104
-msgid "Ignore/Hide"
-msgstr "忽视／隐藏"
-
-#: mod/suggest.php:114 view/theme/vier/theme.php:204 src/Content/Widget.php:64
-msgid "Friend Suggestions"
-msgstr "朋友推荐"
-
-#: mod/uimport.php:55 mod/register.php:192
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr "这个网站超过一天最多账户注册。请明天再试。"
-
-#: mod/uimport.php:70 mod/register.php:288
-msgid "Import"
-msgstr ""
-
-#: mod/uimport.php:72
-msgid "Move account"
-msgstr "把账户搬出"
-
-#: mod/uimport.php:73
-msgid "You can import an account from another Friendica server."
-msgstr "您会从别的Friendica服务器进口账户"
-
-#: mod/uimport.php:74
-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:75
-msgid ""
-"This feature is experimental. We can't import contacts from the OStatus "
-"network (GNU Social/Statusnet) or from Diaspora"
-msgstr "这个特性是实验性的。我们不能从 OStatus 网络 (GNU Social/Statusnet) 或者 Diaspora 导入联系人"
-
-#: mod/uimport.php:76
-msgid "Account file"
-msgstr "账户文件"
-
-#: mod/uimport.php:76
-msgid ""
-"To export your account, go to \"Settings->Export your personal data\" and "
-"select \"Export account\""
-msgstr "为了导出你的账户，点击「设置→导出你的个人信息」和选择「导出账户」"
-
-#: mod/match.php:48
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "没有符合的关键字。请在您的默认简介加关键字。"
-
-#: mod/match.php:104
-msgid "is interested in:"
-msgstr "感兴趣对："
-
-#: mod/match.php:120
-msgid "Profile Match"
-msgstr "简介符合"
-
-#: mod/match.php:125 mod/dirfind.php:253
-msgid "No matches"
-msgstr "没有结果"
-
-#: mod/manage.php:180
-msgid "Manage Identities and/or Pages"
-msgstr "管理身份或页"
-
-#: mod/manage.php:181
-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
-msgid "Select an identity to manage: "
-msgstr "选择同一个人管理："
-
-#: mod/manage.php:184 mod/localtime.php:56 mod/poke.php:199
-#: mod/fsuggest.php:114 mod/contacts.php:610 mod/invite.php:154
-#: mod/crepair.php:148 mod/install.php:198 mod/install.php:237
-#: mod/message.php:246 mod/message.php:413 mod/events.php:531
-#: mod/photos.php:1068 mod/photos.php:1148 mod/photos.php:1439
-#: mod/photos.php:1485 mod/photos.php:1524 mod/photos.php:1597
-#: mod/profiles.php:579 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/Object/Post.php:804
-msgid "Submit"
-msgstr "提交"
-
-#: mod/wall_attach.php:24 mod/wall_attach.php:32 mod/wall_attach.php:83
-#: mod/wall_upload.php:38 mod/wall_upload.php:54 mod/wall_upload.php:112
-#: mod/wall_upload.php:155 mod/wall_upload.php:158
-msgid "Invalid request."
-msgstr "无效请求。"
-
-#: mod/wall_attach.php:101
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
-msgstr "不好意思，可能你上传的是PHP设置允许的大"
-
-#: mod/wall_attach.php:101
-msgid "Or - did you try to upload an empty file?"
-msgstr "或者，你是不是上传空的文件？"
-
-#: mod/wall_attach.php:112
-#, php-format
-msgid "File exceeds size limit of %s"
-msgstr "文件超过了 %s 的大小限制"
-
-#: mod/wall_attach.php:136 mod/wall_attach.php:152
-msgid "File upload failed."
-msgstr "文件上传失败。"
-
-#: mod/filer.php:34
-msgid "- select -"
-msgstr "－选择－"
-
-#: mod/localtime.php:19 src/Model/Event.php:36 src/Model/Event.php:814
-msgid "l F d, Y \\@ g:i A"
-msgstr "l F d, Y \\@ g:i A"
-
-#: 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."
-msgstr "Friendica提供这个服务目的是分享项目跟别的网络和朋友们在别的时区。"
-
-#: mod/localtime.php:39
-#, php-format
-msgid "UTC time: %s"
-msgstr "UTC时间: %s"
-
-#: mod/localtime.php:42
-#, php-format
-msgid "Current timezone: %s"
-msgstr "现在时区: %s"
-
-#: mod/localtime.php:46
-#, php-format
-msgid "Converted localtime: %s"
-msgstr "装换的当地时间：%s"
-
-#: mod/localtime.php:52
-msgid "Please select your timezone:"
-msgstr "请选择你的时区:"
-
-#: mod/notify.php:77
-msgid "No more system notifications."
-msgstr "没别系统通知。"
-
-#: mod/notify.php:81 mod/notifications.php:113
-msgid "System Notifications"
-msgstr "系统通知"
-
-#: mod/ping.php:292
-msgid "{0} wants to be your friend"
-msgstr "{0}想成为您的朋友"
-
-#: mod/ping.php:307
-msgid "{0} sent you a message"
-msgstr "{0}发给您一个通信"
-
-#: mod/ping.php:322
-msgid "{0} requested registration"
-msgstr "{0}要求注册"
-
-#: mod/poke.php:192
-msgid "Poke/Prod"
-msgstr "戳"
-
-#: mod/poke.php:193
-msgid "poke, prod or do other things to somebody"
-msgstr "把人家戳或别的行动"
-
-#: mod/poke.php:194
-msgid "Recipient"
-msgstr "接受者"
-
-#: mod/poke.php:195
-msgid "Choose what you wish to do to recipient"
-msgstr "选择您想把别人作"
-
-#: mod/poke.php:198
-msgid "Make this post private"
-msgstr "使这个文章私人"
-
-#: mod/probe.php:13 mod/viewcontacts.php:45 mod/webfinger.php:16
-#: mod/directory.php:42 mod/community.php:27 mod/dfrn_request.php:602
-#: mod/display.php:203 mod/photos.php:920 mod/search.php:98 mod/search.php:104
-#: mod/videos.php:199
-msgid "Public access denied."
-msgstr "拒绝公开访问"
-
-#: mod/probe.php:14 mod/webfinger.php:17
-msgid "Only logged in users are permitted to perform a probing."
-msgstr "只有已登录用户才被允许进行探测。"
-
-#: mod/profperm.php:28 mod/group.php:83 index.php:435
-msgid "Permission denied"
-msgstr "权限不够"
-
-#: mod/profperm.php:34 mod/profperm.php:65
-msgid "Invalid profile identifier."
-msgstr "无限的简介标识符。"
-
-#: mod/profperm.php:111
-msgid "Profile Visibility Editor"
-msgstr "简介能见度编辑器。"
-
-#: mod/profperm.php:115 mod/group.php:265
-msgid "Click on a contact to add or remove."
-msgstr "单击联系人以添加或删除。"
-
-#: mod/profperm.php:124
-msgid "Visible To"
-msgstr "能见被"
-
-#: mod/profperm.php:140
-msgid "All Contacts (with secure profile access)"
-msgstr ""
-
-#: mod/regmod.php:68
-msgid "Account approved."
-msgstr "账户已被批准。"
-
-#: mod/regmod.php:93
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "撤销了 %s 的注册"
-
-#: mod/regmod.php:102
-msgid "Please login."
-msgstr "请登录。"
-
-#: mod/tagrm.php:47
-msgid "Tag removed"
-msgstr "标签去除了"
-
-#: mod/tagrm.php:85
-msgid "Remove Item Tag"
-msgstr "去除项目标签"
-
-#: mod/tagrm.php:87
-msgid "Select a tag to remove: "
-msgstr "选择删除一个标签: "
-
-#: mod/tagrm.php:98 mod/delegate.php:177
-msgid "Remove"
-msgstr "移走"
-
-#: mod/uexport.php:44
-msgid "Export account"
-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."
-msgstr "导出你的账户信息和联系人。用这个功能来生成一个你的账户的备份，并且/或者把它移到另外一个服务器。"
-
-#: mod/uexport.php:45
-msgid "Export all"
-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)"
-msgstr "导出你的账户信息、联系人和所有你的项目为 json 格式。可能会是一个很大的文件，并可能花费很多时间。用这个功能来做一个你的账户的全备份（照片不会被导出）"
-
-#: mod/uexport.php:52 mod/settings.php:108
-msgid "Export personal data"
-msgstr "导出个人信息"
-
-#: mod/viewcontacts.php:87
-msgid "No contacts."
-msgstr "没有联系人。"
-
-#: mod/viewsrc.php:12 mod/community.php:34
-msgid "Access denied."
-msgstr "没有用权。"
-
-#: mod/wall_upload.php:186 mod/profile_photo.php:153 mod/photos.php:751
-#: mod/photos.php:754 mod/photos.php:783
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr "图片超过 %s 的大小限制"
-
-#: mod/wall_upload.php:200 mod/profile_photo.php:162 mod/photos.php:806
-msgid "Unable to process image."
-msgstr "处理不了图像."
-
-#: mod/wall_upload.php:231 mod/item.php:471 src/Object/Image.php:953
-#: src/Object/Image.php:969 src/Object/Image.php:977 src/Object/Image.php:1002
-msgid "Wall Photos"
-msgstr "墙照片"
-
-#: mod/wall_upload.php:239 mod/profile_photo.php:307 mod/photos.php:835
-msgid "Image upload failed."
-msgstr "图像上载失败了."
-
-#: mod/wallmessage.php:49 mod/wallmessage.php:112
-#, php-format
-msgid "Number of daily wall messages for %s exceeded. Message failed."
-msgstr "一天最多墙通知给%s超过了。通知没有通过 。"
-
-#: mod/wallmessage.php:57 mod/message.php:73
-msgid "No recipient selected."
-msgstr "没有选择的接受者。"
-
-#: mod/wallmessage.php:60
-msgid "Unable to check your home location."
-msgstr "核对不了您的主页。"
-
-#: mod/wallmessage.php:63 mod/message.php:80
-msgid "Message could not be sent."
-msgstr "消息发不了。"
-
-#: mod/wallmessage.php:66 mod/message.php:83
-msgid "Message collection failure."
-msgstr "通信受到错误。"
-
-#: mod/wallmessage.php:69 mod/message.php:86
-msgid "Message sent."
-msgstr "消息发了"
-
-#: mod/wallmessage.php:86 mod/wallmessage.php:95
-msgid "No recipient."
-msgstr "没有接受者。"
-
-#: mod/wallmessage.php:132 mod/message.php:231
-msgid "Send Private Message"
-msgstr "发私人的通信"
-
-#: mod/wallmessage.php:133
-#, 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 "如果您想%s回答，请核对您网站的隐私设置允许生发送人的私人邮件。"
-
-#: mod/wallmessage.php:134 mod/message.php:232 mod/message.php:402
-msgid "To:"
-msgstr "到："
-
-#: mod/wallmessage.php:135 mod/message.php:236 mod/message.php:404
-msgid "Subject:"
-msgstr "题目："
-
-#: mod/wallmessage.php:141 mod/invite.php:149 mod/message.php:240
-#: mod/message.php:407
-msgid "Your message:"
-msgstr "你的消息："
-
-#: mod/bookmarklet.php:23 src/Content/Nav.php:114 src/Module/Login.php:313
-msgid "Login"
-msgstr "登录"
-
-#: mod/bookmarklet.php:51
-msgid "The post was created"
-msgstr "文章创建了"
-
-#: mod/editpost.php:25 mod/editpost.php:35
-msgid "Item not found"
-msgstr "项目没找到"
-
-#: mod/editpost.php:42
-msgid "Edit post"
-msgstr "编辑文章"
-
-#: mod/editpost.php:134 src/Core/ACL.php:315
-msgid "CC: email addresses"
-msgstr "抄送: 电子邮件地址"
-
-#: mod/editpost.php:141 src/Core/ACL.php:316
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "比如: li@example.com, wang@example.com"
-
-#: mod/fsuggest.php:30 mod/fsuggest.php:96 mod/crepair.php:110
-#: mod/dfrn_confirm.php:129
-msgid "Contact not found."
-msgstr "没有找到联系人。"
-
-#: mod/fsuggest.php:72
-msgid "Friend suggestion sent."
-msgstr "朋友建议发送了。"
-
-#: mod/fsuggest.php:101
-msgid "Suggest Friends"
-msgstr "推荐的朋友们"
-
-#: mod/fsuggest.php:103
-#, php-format
-msgid "Suggest a friend for %s"
-msgstr "给 %s 推荐朋友"
-
-#: mod/cal.php:142 mod/display.php:316 mod/profile.php:174
-msgid "Access to this profile has been restricted."
-msgstr "使用权这个简介被限制了."
-
-#: mod/cal.php:274 mod/events.php:391 view/theme/frio/theme.php:263
-#: view/theme/frio/theme.php:267 src/Content/Nav.php:104
-#: src/Content/Nav.php:170 src/Model/Profile.php:922 src/Model/Profile.php:933
-msgid "Events"
-msgstr "事件"
-
-#: mod/cal.php:275 mod/events.php:392
-msgid "View"
-msgstr "查看"
-
-#: mod/cal.php:276 mod/events.php:394
-msgid "Previous"
-msgstr "上"
-
-#: mod/cal.php:277 mod/install.php:156 mod/events.php:395
-msgid "Next"
-msgstr "下"
-
-#: mod/cal.php:280 mod/events.php:400 src/Model/Event.php:412
-msgid "today"
-msgstr "今天"
-
-#: mod/cal.php:281 mod/events.php:401 src/Util/Temporal.php:304
-#: src/Model/Event.php:413
-msgid "month"
-msgstr "月"
-
-#: mod/cal.php:282 mod/events.php:402 src/Util/Temporal.php:305
-#: src/Model/Event.php:414
-msgid "week"
-msgstr "星期"
-
-#: mod/cal.php:283 mod/events.php:403 src/Util/Temporal.php:306
-#: src/Model/Event.php:415
-msgid "day"
-msgstr "日"
-
-#: mod/cal.php:284 mod/events.php:404
-msgid "list"
-msgstr "列表"
-
-#: mod/cal.php:297 src/Core/Console/NewPassword.php:73 src/Model/User.php:214
-msgid "User not found"
-msgstr "找不到用户"
-
-#: mod/cal.php:313
-msgid "This calendar format is not supported"
-msgstr "这个日历格式不被支持"
-
-#: mod/cal.php:315
-msgid "No exportable data found"
-msgstr "找不到可导出的数据"
-
-#: mod/cal.php:332
-msgid "calendar"
-msgstr "日历"
-
-#: mod/contacts.php:71 mod/notifications.php:259 src/Model/Profile.php:516
-msgid "Network:"
-msgstr "网络"
-
-#: mod/contacts.php:157
-#, php-format
-msgid "%d contact edited."
-msgid_plural "%d contacts edited."
-msgstr[0] "%d 个联系人被编辑了。"
-
-#: mod/contacts.php:184 mod/contacts.php:400
-msgid "Could not access contact record."
-msgstr "无法访问联系人记录。"
-
-#: mod/contacts.php:194
-msgid "Could not locate selected profile."
-msgstr "找不到选择的简介。"
-
-#: mod/contacts.php:228
-msgid "Contact updated."
-msgstr "联系人更新了。"
-
-#: mod/contacts.php:230 mod/dfrn_request.php:415
-msgid "Failed to update contact record."
-msgstr "更新联系人记录失败。"
-
-#: mod/contacts.php:421
-msgid "Contact has been blocked"
-msgstr "联系人已被屏蔽"
-
-#: mod/contacts.php:421
-msgid "Contact has been unblocked"
-msgstr "联系人已被解除屏蔽"
-
-#: mod/contacts.php:432
-msgid "Contact has been ignored"
-msgstr "联系人已被忽视"
-
-#: mod/contacts.php:432
-msgid "Contact has been unignored"
-msgstr "联系人已被解除忽视"
-
-#: mod/contacts.php:443
-msgid "Contact has been archived"
-msgstr "联系人已存档"
-
-#: mod/contacts.php:443
-msgid "Contact has been unarchived"
-msgstr "联系人已被解除存档"
-
-#: mod/contacts.php:467
-msgid "Drop contact"
-msgstr ""
-
-#: mod/contacts.php:470 mod/contacts.php:823
-msgid "Do you really want to delete this contact?"
-msgstr "您真的想删除这个联系人吗？"
-
-#: mod/contacts.php:488
-msgid "Contact has been removed."
-msgstr "联系人被删除了。"
-
-#: mod/contacts.php:519
-#, php-format
-msgid "You are mutual friends with %s"
-msgstr "您和 %s 互为朋友"
-
-#: mod/contacts.php:523
-#, php-format
-msgid "You are sharing with %s"
-msgstr "你正在和 %s 分享"
-
-#: mod/contacts.php:527
-#, php-format
-msgid "%s is sharing with you"
-msgstr "%s 正在和你分享"
-
-#: mod/contacts.php:547
-msgid "Private communications are not available for this contact."
-msgstr "私人交流对这个联系人不可用。"
-
-#: mod/contacts.php:549
-msgid "Never"
-msgstr "从未"
-
-#: mod/contacts.php:552
-msgid "(Update was successful)"
-msgstr "(更新成功)"
-
-#: mod/contacts.php:552
-msgid "(Update was not successful)"
-msgstr "(更新不成功)"
-
-#: mod/contacts.php:554 mod/contacts.php:992
-msgid "Suggest friends"
-msgstr "建议朋友们"
-
-#: mod/contacts.php:558
-#, php-format
-msgid "Network type: %s"
-msgstr "网络种类: %s"
-
-#: mod/contacts.php:563
-msgid "Communications lost with this contact!"
-msgstr "和这个联系人的通信断开了！"
-
-#: mod/contacts.php:569
-msgid "Fetch further information for feeds"
-msgstr "拿文源别的消息"
-
-#: mod/contacts.php:571
-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 ""
-
-#: mod/contacts.php:572 mod/admin.php:1284 mod/admin.php:1449
-#: mod/admin.php:1459
-msgid "Disabled"
-msgstr "已停用"
-
-#: mod/contacts.php:573
-msgid "Fetch information"
-msgstr "取消息"
-
-#: mod/contacts.php:574
-msgid "Fetch keywords"
-msgstr "获取关键字"
-
-#: mod/contacts.php:575
-msgid "Fetch information and keywords"
-msgstr "取消息和关键词"
-
-#: mod/contacts.php:599 mod/unfollow.php:100
-msgid "Disconnect/Unfollow"
-msgstr "断开连接/取消关注"
-
-#: mod/contacts.php:608
-msgid "Contact"
-msgstr "联系人"
-
-#: mod/contacts.php:611
-msgid "Profile Visibility"
-msgstr "简历可见量"
-
-#: mod/contacts.php:612
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "请选择简介您想给%s显示他安全地看您的简介的时候。"
-
-#: mod/contacts.php:613
-msgid "Contact Information / Notes"
-msgstr "联系人信息/便条"
-
-#: mod/contacts.php:614
-msgid "Their personal note"
-msgstr ""
-
-#: mod/contacts.php:616
-msgid "Edit contact notes"
-msgstr "编辑联系人便条"
-
-#: mod/contacts.php:620
-msgid "Block/Unblock contact"
-msgstr "屏蔽/解除屏蔽联系人"
-
-#: mod/contacts.php:621
-msgid "Ignore contact"
-msgstr "忽略联系人"
-
-#: mod/contacts.php:622
-msgid "Repair URL settings"
-msgstr "维修URL设置"
-
-#: mod/contacts.php:623
-msgid "View conversations"
-msgstr "看交流"
-
-#: mod/contacts.php:628
-msgid "Last update:"
-msgstr "上个更新："
-
-#: mod/contacts.php:630
-msgid "Update public posts"
-msgstr "更新公开文章"
-
-#: mod/contacts.php:632 mod/contacts.php:1002
-msgid "Update now"
-msgstr "现在更新"
-
-#: mod/contacts.php:637 mod/contacts.php:827 mod/contacts.php:1011
-#: mod/admin.php:489 mod/admin.php:1834
-msgid "Unblock"
-msgstr "解除屏蔽"
-
-#: mod/contacts.php:637 mod/contacts.php:827 mod/contacts.php:1011
-#: mod/admin.php:488 mod/admin.php:1833
-msgid "Block"
-msgstr "屏蔽"
-
-#: mod/contacts.php:638 mod/contacts.php:828 mod/contacts.php:1019
-msgid "Unignore"
-msgstr "取消忽视"
-
-#: mod/contacts.php:638 mod/contacts.php:828 mod/contacts.php:1019
-#: mod/notifications.php:62 mod/notifications.php:181
-#: mod/notifications.php:264
-msgid "Ignore"
-msgstr "忽视"
-
-#: mod/contacts.php:642
-msgid "Currently blocked"
-msgstr "现在被封禁的"
-
-#: mod/contacts.php:643
-msgid "Currently ignored"
-msgstr "现在不理的"
-
-#: mod/contacts.php:644
-msgid "Currently archived"
-msgstr "当前已存档"
-
-#: mod/contacts.php:645
-msgid "Awaiting connection acknowledge"
-msgstr "等待连接确认"
-
-#: mod/contacts.php:646 mod/notifications.php:175 mod/notifications.php:253
-msgid "Hide this contact from others"
-msgstr "对其他人隐藏这个联系人"
-
-#: mod/contacts.php:646
-msgid ""
-"Replies/likes to your public posts <strong>may</strong> still be visible"
-msgstr "回答／喜欢关您公开文章<strong>会</strong>还可见的"
-
-#: mod/contacts.php:647
-msgid "Notification for new posts"
-msgstr "新消息提示"
-
-#: mod/contacts.php:647
-msgid "Send a notification of every new post of this contact"
-msgstr "发送这个联系人的每篇新文章的通知"
-
-#: mod/contacts.php:650
-msgid "Blacklisted keywords"
-msgstr "黑名单关键词"
-
-#: mod/contacts.php:650
-msgid ""
-"Comma separated list of keywords that should not be converted to hashtags, "
-"when \"Fetch information and keywords\" is selected"
-msgstr "逗号分的关键词不应该翻译成主题标签，如果“取消息和关键词”选择的。"
-
-#: mod/contacts.php:656 mod/unfollow.php:122 mod/follow.php:166
-#: mod/admin.php:494 mod/admin.php:504 mod/notifications.php:256
-msgid "Profile URL"
-msgstr "简介 URL"
-
-#: mod/contacts.php:660 mod/directory.php:148 mod/events.php:519
-#: mod/notifications.php:246 src/Model/Event.php:60 src/Model/Event.php:85
-#: src/Model/Event.php:421 src/Model/Event.php:900 src/Model/Profile.php:413
-msgid "Location:"
-msgstr "位置:"
-
-#: mod/contacts.php:662 src/Model/Profile.php:420
-msgid "XMPP:"
-msgstr "XMPP："
-
-#: mod/contacts.php:664 mod/directory.php:154 mod/notifications.php:248
-#: src/Model/Profile.php:419 src/Model/Profile.php:804
-msgid "About:"
-msgstr "关于："
-
-#: mod/contacts.php:666 mod/follow.php:174 mod/notifications.php:250
-#: src/Model/Profile.php:792
-msgid "Tags:"
-msgstr "标签："
-
-#: mod/contacts.php:667
-msgid "Actions"
-msgstr ""
-
-#: mod/contacts.php:669 mod/contacts.php:855 view/theme/frio/theme.php:259
-#: src/Content/Nav.php:100 src/Model/Profile.php:886
-msgid "Status"
-msgstr "状态"
-
-#: mod/contacts.php:670
-msgid "Contact Settings"
-msgstr "联系人设置"
-
-#: mod/contacts.php:711
-msgid "Suggestions"
-msgstr "建议"
-
-#: mod/contacts.php:714
-msgid "Suggest potential friends"
-msgstr "建议潜在朋友们"
-
-#: mod/contacts.php:719 mod/group.php:215
-msgid "All Contacts"
-msgstr "所有联系人"
-
-#: mod/contacts.php:722
-msgid "Show all contacts"
-msgstr "显示所有的联系人"
-
-#: mod/contacts.php:727
-msgid "Unblocked"
-msgstr "未屏蔽的"
-
-#: mod/contacts.php:730
-msgid "Only show unblocked contacts"
-msgstr "只显示没被屏蔽的联系人"
-
-#: mod/contacts.php:735
-msgid "Blocked"
-msgstr "被屏蔽的"
-
-#: mod/contacts.php:738
-msgid "Only show blocked contacts"
-msgstr "只显示被屏蔽的联系人"
-
-#: mod/contacts.php:743
-msgid "Ignored"
-msgstr "忽视的"
-
-#: mod/contacts.php:746
-msgid "Only show ignored contacts"
-msgstr "只显示忽略的联系人"
-
-#: mod/contacts.php:751
-msgid "Archived"
-msgstr "已存档"
-
-#: mod/contacts.php:754
-msgid "Only show archived contacts"
-msgstr "只显示已存档联系人"
-
-#: mod/contacts.php:759
-msgid "Hidden"
-msgstr "隐藏的"
-
-#: mod/contacts.php:762
-msgid "Only show hidden contacts"
-msgstr "只显示隐藏的联系人"
-
-#: mod/contacts.php:818
-msgid "Search your contacts"
-msgstr "搜索您的联系人"
-
-#: mod/contacts.php:819 mod/search.php:236
-#, php-format
-msgid "Results for: %s"
-msgstr ""
-
-#: mod/contacts.php:820 mod/directory.php:209 view/theme/vier/theme.php:203
-#: src/Content/Widget.php:63
-msgid "Find"
-msgstr "搜索"
-
-#: mod/contacts.php:826 mod/settings.php:169 mod/settings.php:695
-msgid "Update"
-msgstr "更新"
-
-#: mod/contacts.php:829 mod/contacts.php:1027
-msgid "Archive"
-msgstr "存档"
-
-#: mod/contacts.php:829 mod/contacts.php:1027
-msgid "Unarchive"
-msgstr "从存档拿来"
-
-#: mod/contacts.php:832
-msgid "Batch Actions"
-msgstr "批量操作"
-
-#: mod/contacts.php:858 mod/unfollow.php:132 mod/follow.php:186
-#: src/Model/Profile.php:889
-msgid "Status Messages and Posts"
-msgstr "现状通知和文章"
-
-#: mod/contacts.php:866 src/Model/Profile.php:897
-msgid "Profile Details"
-msgstr "简介内容"
-
-#: mod/contacts.php:878
-msgid "View all contacts"
-msgstr "查看所有联系人"
-
-#: mod/contacts.php:889
-msgid "View all common friends"
-msgstr "查看所有公共好友"
-
-#: mod/contacts.php:895 mod/admin.php:1362 mod/events.php:533
-#: src/Model/Profile.php:863
-msgid "Advanced"
-msgstr "高级"
-
-#: mod/contacts.php:898
-msgid "Advanced Contact Settings"
-msgstr "高级联系人设置"
-
-#: mod/contacts.php:930
-msgid "Mutual Friendship"
-msgstr "共同友谊"
-
-#: mod/contacts.php:934
-msgid "is a fan of yours"
-msgstr "是你的粉丝"
-
-#: mod/contacts.php:938
-msgid "you are a fan of"
-msgstr "您已关注"
-
-#: mod/contacts.php:953 mod/photos.php:1482 mod/photos.php:1521
-#: mod/photos.php:1594 src/Object/Post.php:801
-msgid "This is you"
-msgstr "这是你"
-
-#: mod/contacts.php:1013
-msgid "Toggle Blocked status"
-msgstr "切换屏蔽状态"
-
-#: mod/contacts.php:1021
-msgid "Toggle Ignored status"
-msgstr "交替忽视现状"
-
-#: mod/contacts.php:1029
-msgid "Toggle Archive status"
-msgstr "交替档案现状"
-
-#: mod/contacts.php:1037
-msgid "Delete contact"
-msgstr "删除联系人"
-
-#: mod/delegate.php:37
-msgid "Parent user not found."
-msgstr "未找到家长账户。"
-
-#: mod/delegate.php:144
-msgid "No parent user"
-msgstr "无家长账户"
-
-#: mod/delegate.php:159
-msgid "Parent Password:"
-msgstr "家长密码："
-
-#: mod/delegate.php:159
-msgid ""
-"Please enter the password of the parent account to legitimize your request."
-msgstr "请为家长账户设置密码以使您的请求有效化。"
-
-#: mod/delegate.php:164
-msgid "Parent User"
-msgstr "家长账户"
-
-#: mod/delegate.php:167
-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:168 mod/admin.php:311 mod/admin.php:1357
-#: mod/admin.php:1999 mod/admin.php:2253 mod/admin.php:2327 mod/admin.php:2474
-#: mod/settings.php:669 mod/settings.php:776 mod/settings.php:864
-#: mod/settings.php:953 mod/settings.php:1183
-msgid "Save Settings"
-msgstr "保存设置"
-
-#: mod/delegate.php:169 src/Content/Nav.php:205
-msgid "Delegate Page Management"
-msgstr "页代表管理"
-
-#: mod/delegate.php:170
-msgid "Delegates"
-msgstr "代表"
-
-#: mod/delegate.php:172
-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:173
-msgid "Existing Page Delegates"
-msgstr "目前页代表"
-
-#: mod/delegate.php:175
-msgid "Potential Delegates"
-msgstr "潜力的代表"
-
-#: mod/delegate.php:178
-msgid "Add"
-msgstr "加"
-
-#: mod/delegate.php:179
-msgid "No entries."
-msgstr "没有项目。"
-
-#: mod/feedtest.php:20
-msgid "You must be logged in to use this module"
-msgstr "您必须登录才能使用此模块"
-
-#: mod/feedtest.php:48
-msgid "Source URL"
-msgstr "源链接"
-
-#: mod/oexchange.php:30
-msgid "Post successful."
-msgstr "评论发表了。"
-
-#: mod/ostatus_subscribe.php:21
-msgid "Subscribing to OStatus contacts"
-msgstr "正在订阅 OStatus 联系人"
-
-#: mod/ostatus_subscribe.php:33
-msgid "No contact provided."
-msgstr "未提供联系人。"
-
-#: mod/ostatus_subscribe.php:40
-msgid "Couldn't fetch information for contact."
-msgstr "无法获取联系人信息。"
-
-#: mod/ostatus_subscribe.php:50
-msgid "Couldn't fetch friends for contact."
-msgstr "无法取得联系人的朋友信息。"
-
-#: mod/ostatus_subscribe.php:78
-msgid "success"
-msgstr "成功"
-
-#: mod/ostatus_subscribe.php:80
-msgid "failed"
-msgstr "失败"
-
-#: mod/ostatus_subscribe.php:83 src/Object/Post.php:287
-msgid "ignored"
-msgstr "已忽视的"
-
-#: mod/profile_photo.php:55
-msgid "Image uploaded but image cropping failed."
-msgstr "照片上传去了，但修剪失灵。"
-
-#: mod/profile_photo.php:88 mod/profile_photo.php:96 mod/profile_photo.php:104
-#: mod/profile_photo.php:315
-#, php-format
-msgid "Image size reduction [%s] failed."
-msgstr "照片减少[%s]失灵。"
-
-#: mod/profile_photo.php:125
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "万一新照片一会出现，换档重新加载或者成为空浏览器高速缓存。"
-
-#: mod/profile_photo.php:134
-msgid "Unable to process image"
-msgstr "不能处理照片"
-
-#: mod/profile_photo.php:247
-msgid "Upload File:"
-msgstr "上传文件："
-
-#: mod/profile_photo.php:248
-msgid "Select a profile:"
-msgstr "选择一个简介"
-
-#: mod/profile_photo.php:253
-msgid "or"
-msgstr "或者"
-
-#: mod/profile_photo.php:253
-msgid "skip this step"
-msgstr "略过这步"
-
-#: mod/profile_photo.php:253
-msgid "select a photo from your photo albums"
-msgstr "从您的照片册选择一片。"
-
-#: mod/profile_photo.php:266
-msgid "Crop Image"
-msgstr "修剪照片"
-
-#: mod/profile_photo.php:267
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "请调图片剪裁为最好看。"
-
-#: mod/profile_photo.php:269
-msgid "Done Editing"
-msgstr "编辑完成"
-
-#: mod/profile_photo.php:305
-msgid "Image uploaded successfully."
-msgstr "照片成功地上传了。"
-
-#: mod/unfollow.php:34
-msgid "Contact wasn't found or can't be unfollowed."
-msgstr "找不到联系人或者不能关注联系人。"
-
-#: mod/unfollow.php:47
-msgid "Contact unfollowed"
-msgstr "取消关注了的联系人"
-
-#: mod/unfollow.php:65 mod/follow.php:62 mod/dfrn_request.php:657
-msgid "Submit Request"
-msgstr "提交要求"
-
-#: mod/unfollow.php:73
-msgid "You aren't a friend of this contact."
-msgstr "你不是这个联系人的朋友。"
-
-#: mod/unfollow.php:79
-msgid "Unfollowing is currently not supported by your network."
-msgstr "取消关注现在不被你的网络支持。"
-
-#: mod/unfollow.php:113 mod/follow.php:157 mod/dfrn_request.php:655
-msgid "Your Identity Address:"
-msgstr "你的身份地址："
-
-#: mod/directory.php:151 mod/notifications.php:252 src/Model/Profile.php:416
-#: src/Model/Profile.php:743
-msgid "Gender:"
-msgstr "性别:"
-
-#: mod/directory.php:152 src/Model/Profile.php:417 src/Model/Profile.php:767
-msgid "Status:"
-msgstr "现状:"
-
-#: mod/directory.php:153 src/Model/Profile.php:418 src/Model/Profile.php:784
-msgid "Homepage:"
-msgstr "主页:"
-
-#: mod/directory.php:202 view/theme/vier/theme.php:208
-#: src/Content/Widget.php:68
-msgid "Global Directory"
-msgstr "综合目录"
-
-#: mod/directory.php:204
-msgid "Find on this site"
-msgstr "找在这网站"
-
-#: mod/directory.php:206
-msgid "Results for:"
-msgstr "结果："
-
-#: mod/directory.php:208
-msgid "Site Directory"
-msgstr "网站目录"
-
-#: mod/directory.php:213
-msgid "No entries (some entries may be hidden)."
-msgstr "没有文章(有的文章会被隐藏)。"
-
-#: mod/dirfind.php:49
-#, php-format
-msgid "People Search - %s"
-msgstr "搜索人 - %s"
-
-#: mod/dirfind.php:60
-#, php-format
-msgid "Forum Search - %s"
-msgstr "搜索论坛 - %s"
-
-#: mod/follow.php:45
-msgid "The contact could not be added."
-msgstr "无法添加此联系人。"
-
-#: mod/follow.php:73
-msgid "You already added this contact."
-msgstr "您已添加此联系人。"
-
-#: mod/follow.php:83
-msgid "Diaspora support isn't enabled. Contact can't be added."
-msgstr "Diaspora 支持没被启用。无法添加联系人。"
-
-#: mod/follow.php:90
-msgid "OStatus support is disabled. Contact can't be added."
-msgstr "OStatus 支持没被启用。无法添加联系人。"
-
-#: mod/follow.php:97
-msgid "The network type couldn't be detected. Contact can't be added."
-msgstr "网络类型无法被检测。无法添加联系人。"
-
-#: mod/follow.php:149 mod/dfrn_request.php:647
-msgid "Please answer the following:"
-msgstr "请回答下述的："
-
-#: mod/follow.php:150 mod/dfrn_request.php:648
-#, php-format
-msgid "Does %s know you?"
-msgstr "%s是否认识你？"
-
-#: mod/follow.php:151 mod/dfrn_request.php:649
-msgid "Add a personal note:"
-msgstr "添加一个个人便条："
-
-#: mod/lostpass.php:27
+#: mod/lostpass.php:28
 msgid "No valid account found."
 msgstr "找不到效的账户。"
 
-#: mod/lostpass.php:39
+#: mod/lostpass.php:40
 msgid "Password reset request issued. Check your email."
 msgstr "重设密码要求发布了。核对您的收件箱。"
 
-#: mod/lostpass.php:45
+#: mod/lostpass.php:46
 #, php-format
 msgid ""
 "\n"
@@ -2718,7 +4049,7 @@ msgid ""
 "\t\tissued this request."
 msgstr ""
 
-#: mod/lostpass.php:56
+#: mod/lostpass.php:57
 #, php-format
 msgid ""
 "\n"
@@ -2735,66 +4066,66 @@ msgid ""
 "\t\tLogin Name:\t%3$s"
 msgstr ""
 
-#: mod/lostpass.php:73
+#: mod/lostpass.php:76
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "重设密码要求被发布%s"
 
-#: mod/lostpass.php:89
+#: mod/lostpass.php:92
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr "要求确认不了。(您可能已经提交它。)重设密码失败了。"
 
-#: mod/lostpass.php:102
+#: mod/lostpass.php:105
 msgid "Request has expired, please make a new one."
 msgstr "请求超时，请重试。"
 
-#: mod/lostpass.php:117
+#: mod/lostpass.php:120
 msgid "Forgot your Password?"
 msgstr "忘记你的密码吗？"
 
-#: mod/lostpass.php:118
+#: mod/lostpass.php:121
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr "输入您的邮件地址和提交为重置密码。然后核对收件箱看别的说明。"
 
-#: mod/lostpass.php:119 src/Module/Login.php:315
+#: mod/lostpass.php:122 src/Module/Login.php:312
 msgid "Nickname or Email: "
 msgstr "昵称或邮件地址："
 
-#: mod/lostpass.php:120
+#: mod/lostpass.php:123
 msgid "Reset"
 msgstr "复位"
 
-#: mod/lostpass.php:136 src/Module/Login.php:327
+#: mod/lostpass.php:139 src/Module/Login.php:324
 msgid "Password Reset"
 msgstr "复位密码"
 
-#: mod/lostpass.php:137
+#: mod/lostpass.php:140
 msgid "Your password has been reset as requested."
 msgstr "您的密码被重设如要求的。"
 
-#: mod/lostpass.php:138
+#: mod/lostpass.php:141
 msgid "Your new password is"
 msgstr "你的新的密码是"
 
-#: mod/lostpass.php:139
+#: mod/lostpass.php:142
 msgid "Save or copy your new password - and then"
 msgstr "保存或复制新密码－之后"
 
-#: mod/lostpass.php:140
+#: mod/lostpass.php:143
 msgid "click here to login"
 msgstr "点击这里登录"
 
-#: mod/lostpass.php:141
+#: mod/lostpass.php:144
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr "您的密码可以在成功登录后在<em>设置</em>页修改。"
 
-#: mod/lostpass.php:149
+#: mod/lostpass.php:152
 #, php-format
 msgid ""
 "\n"
@@ -2805,7 +4136,7 @@ msgid ""
 "\t\t"
 msgstr ""
 
-#: mod/lostpass.php:155
+#: mod/lostpass.php:158
 #, php-format
 msgid ""
 "\n"
@@ -2819,7 +4150,7 @@ msgid ""
 "\t\t"
 msgstr ""
 
-#: mod/lostpass.php:169
+#: mod/lostpass.php:174
 #, php-format
 msgid "Your password has been changed at %s"
 msgstr "您密码被变化在%s"
@@ -2900,646 +4231,165 @@ msgstr "Markdown"
 msgid "HTML"
 msgstr "HTML"
 
-#: mod/friendica.php:77
-msgid "This is Friendica, version"
-msgstr "这是Friendica，版本"
-
-#: mod/friendica.php:78
-msgid "running at web location"
-msgstr "运作再网址"
-
-#: mod/friendica.php:82
-msgid ""
-"Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
-"about the Friendica project."
-msgstr "请浏览 <a href=\"https://friendi.ca\">Friendi.ca</a> 以了解更多关于 Friendica 项目的信息。"
-
-#: mod/friendica.php:86
-msgid "Bug reports and issues: please visit"
-msgstr "Bug 及 issues 报告：请访问"
-
-#: mod/friendica.php:86
-msgid "the bugtracker at github"
-msgstr "在 github 上的错误追踪系统"
-
-#: mod/friendica.php:89
-msgid "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
-msgstr ""
-
-#: mod/friendica.php:103
-msgid "Installed addons/apps:"
-msgstr "已安装的插件/应用："
-
-#: mod/friendica.php:117
-msgid "No installed addons/apps"
-msgstr "没有已安装的插件或应用"
-
-#: mod/friendica.php:122
-#, php-format
-msgid "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
-msgstr "阅读此节点的<a href=\"%1$s/tos\">服务条款</a>。"
-
-#: mod/friendica.php:127
-msgid "On this server the following remote servers are blocked."
-msgstr "在这个服务器上以下远程服务器被封禁了。"
-
-#: mod/friendica.php:128 mod/admin.php:357 mod/admin.php:375
-#: mod/dfrn_request.php:347 src/Model/Contact.php:1281
-msgid "Blocked domain"
-msgstr "被封禁的域名"
-
-#: mod/friendica.php:128 mod/admin.php:358 mod/admin.php:376
-msgid "Reason for the block"
-msgstr "封禁原因"
-
-#: mod/invite.php:33
-msgid "Total invitation limit exceeded."
-msgstr "邀请限超过了。"
-
-#: mod/invite.php:55
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s : 不是效的电子邮件地址."
-
-#: mod/invite.php:87
-msgid "Please join us on Friendica"
-msgstr "请加入我们再Friendica"
-
-#: mod/invite.php:96
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "邀请限超过了。请联系您的网站管理员。"
-
-#: mod/invite.php:100
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s : 送消息失败了。"
-
-#: mod/invite.php:104
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d消息传送了。"
-
-#: mod/invite.php:122
-msgid "You have no more invitations available"
-msgstr "您没有别的邀请"
-
-#: mod/invite.php:130
-#, php-format
-msgid ""
-"Visit %s for a list of public sites that you can join. Friendica members on "
-"other sites can all connect with each other, as well as with members of many"
-" other social networks."
-msgstr "参观%s看一单公开网站您会加入。Friendica成员在别的网站都会互相连接，再跟很多别的社会网络。"
-
-#: mod/invite.php:132
-#, php-format
-msgid ""
-"To accept this invitation, please visit and register at %s or any other "
-"public Friendica website."
-msgstr "为接受这个邀请，请再%s或什么别的Friendica网站注册。"
-
-#: mod/invite.php:133
-#, php-format
-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. See %s for a list of alternate Friendica "
-"sites you can join."
-msgstr "Friendica 站点互相连接来创建一个增强隐私的由他们的成员拥有并控制的社交网络。它们也能跟多传统的社交网络连接。看 %s 来获取一份你可以选择加入的 Friendica 站点。"
-
-#: 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: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 "各 Friendica 站点相互连接以创造出一个由其组成成员控制拥有的有强大隐私保护能力的大型社交网络。各站点同时也能够接入许多传统社交网络。"
-
-#: mod/invite.php:140
-#, php-format
-msgid "To accept this invitation, please visit and register at %s."
-msgstr "要接受这个邀请，请在 %s 访问并注册。"
-
-#: mod/invite.php:147
-msgid "Send invitations"
-msgstr "发请柬"
-
-#: mod/invite.php:148
-msgid "Enter email addresses, one per line:"
-msgstr "输入电子邮件地址，一行一个："
-
-#: 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 "在 Friendica，你被诚挚地邀请来加入我和其他亲密的朋友－并帮助我们创建更好的社会网络。"
-
-#: mod/invite.php:151
-msgid "You will need to supply this invitation code: $invite_code"
-msgstr "您要输入这个邀请密码：$invite_code"
-
-#: mod/invite.php:151
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
-msgstr "您一注册，请页跟我连接，用我的简介在："
-
-#: 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 "欲了解更多关于 Friendica 项目的信息以及为什么我们认为这很重要，请访问 http://friendi.ca"
-
-#: mod/crepair.php:87
-msgid "Contact settings applied."
-msgstr "联系人设置已应用。"
-
-#: mod/crepair.php:89
-msgid "Contact update failed."
-msgstr "联系人更新失败。"
-
-#: mod/crepair.php:114
-msgid ""
-"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
-" information your communications with this contact may stop working."
-msgstr "<strong>警告：此为进阶</strong>，如果您输入不正确的信息，您也许无法与这位联系人的正常通讯。"
-
-#: mod/crepair.php:115
-msgid ""
-"Please use your browser 'Back' button <strong>now</strong> if you are "
-"uncertain what to do on this page."
-msgstr "请<strong>立即</strong>用后退按钮如果您不确定怎么用这页"
-
-#: mod/crepair.php:129 mod/crepair.php:131
-msgid "No mirroring"
-msgstr "没有复制"
-
-#: mod/crepair.php:129
-msgid "Mirror as forwarded posting"
-msgstr "复制为传达文章"
-
-#: mod/crepair.php:129 mod/crepair.php:131
-msgid "Mirror as my own posting"
-msgstr "复制为我自己的文章"
-
-#: mod/crepair.php:144
-msgid "Return to contact editor"
-msgstr "返回到联系人编辑器"
-
-#: mod/crepair.php:146
-msgid "Refetch contact data"
-msgstr "重新获取联系人数据"
-
-#: mod/crepair.php:149
-msgid "Remote Self"
-msgstr "遥远的自身"
-
-#: mod/crepair.php:152
-msgid "Mirror postings from this contact"
-msgstr "把这个熟人的文章复制。"
-
-#: mod/crepair.php:154
-msgid ""
-"Mark this contact as remote_self, this will cause friendica to repost new "
-"entries from this contact."
-msgstr "表明这个熟人当遥远的自身。Friendica要把这个熟人的新的文章复制。"
-
-#: mod/crepair.php:158 mod/admin.php:494 mod/admin.php:1816 mod/admin.php:1827
-#: mod/admin.php:1840 mod/admin.php:1856 mod/settings.php:671
-#: mod/settings.php:697
-msgid "Name"
-msgstr "名字"
-
-#: mod/crepair.php:159
-msgid "Account Nickname"
-msgstr "帐户昵称"
-
-#: mod/crepair.php:160
-msgid "@Tagname - overrides Name/Nickname"
-msgstr "@Tagname越过名／昵称"
-
-#: mod/crepair.php:161
-msgid "Account URL"
-msgstr "帐户URL"
-
-#: mod/crepair.php:162
-msgid "Friend Request URL"
-msgstr "朋友请求URL"
-
-#: mod/crepair.php:163
-msgid "Friend Confirm URL"
-msgstr "朋友确认URL"
-
-#: mod/crepair.php:164
-msgid "Notification Endpoint URL"
-msgstr "通知端URL"
-
-#: mod/crepair.php:165
-msgid "Poll/Feed URL"
-msgstr "喂URL"
-
-#: mod/crepair.php:166
-msgid "New photo from this URL"
-msgstr "新照片从这个URL"
-
-#: mod/dfrn_poll.php:123 mod/dfrn_poll.php:539
-#, php-format
-msgid "%1$s welcomes %2$s"
-msgstr "%1$s欢迎%2$s"
-
-#: mod/help.php:48
-msgid "Help:"
-msgstr "帮助："
-
-#: mod/help.php:54 view/theme/vier/theme.php:297 src/Content/Nav.php:134
-msgid "Help"
-msgstr "帮助"
-
-#: mod/help.php:63 index.php:317
-msgid "Page not found."
-msgstr "页发现。"
-
-#: mod/install.php:87
-msgid "Friendica Communications Server - Setup"
-msgstr "Friendica沟通服务器－安装"
-
-#: mod/install.php:93
-msgid "Could not connect to database."
-msgstr "解不了数据库。"
-
-#: mod/install.php:97
-msgid "Could not create table."
-msgstr "无法创建表格。"
-
-#: mod/install.php:103
-msgid "Your Friendica site database has been installed."
-msgstr "您Friendica网站数据库被安装了。"
-
-#: mod/install.php:108
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
-msgstr "您可能要手工地进口文件「database.sql」用phpmyadmin或mysql。"
-
-#: mod/install.php:109 mod/install.php:155 mod/install.php:267
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr "请看文件「INSTALL.txt」"
-
-#: mod/install.php:121
-msgid "Database already in use."
-msgstr "数据库已经被使用。"
-
-#: mod/install.php:152
-msgid "System check"
-msgstr "系统检测"
-
-#: mod/install.php:157
-msgid "Check again"
-msgstr "再检测"
-
-#: mod/install.php:177
-msgid "Database connection"
-msgstr "数据库接通"
-
-#: mod/install.php:178
-msgid ""
-"In order to install Friendica we need to know how to connect to your "
-"database."
-msgstr "为安装Friendica我们要知道怎么连接您的数据库。"
-
-#: mod/install.php:179
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "你有关于这些设置有问题的话，请给互联网托管服务或者网页管理联系。"
-
-#: mod/install.php:180
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "您下边指定的数据库应该已经存在。如果还没有，请创建后继续。"
-
-#: mod/install.php:184
-msgid "Database Server Name"
-msgstr "数据库服务器名"
-
-#: mod/install.php:185
-msgid "Database Login Name"
-msgstr "数据库登录名"
-
-#: mod/install.php:186
-msgid "Database Login Password"
-msgstr "数据库登录密码"
-
-#: mod/install.php:186
-msgid "For security reasons the password must not be empty"
-msgstr "由于安全的原因，密码不能为空"
-
-#: mod/install.php:187
-msgid "Database Name"
-msgstr "数据库名字"
-
-#: mod/install.php:188 mod/install.php:228
-msgid "Site administrator email address"
-msgstr "网站行政人员邮件地址"
-
-#: mod/install.php:188 mod/install.php:228
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr "您账户邮件地址必要符合这个为用网站处理仪表板"
-
-#: mod/install.php:192 mod/install.php:231
-msgid "Please select a default timezone for your website"
-msgstr "请选择您网站的默认时区"
-
-#: mod/install.php:218
-msgid "Site settings"
-msgstr "网站设置"
-
-#: mod/install.php:232
-msgid "System Language:"
-msgstr "系统语言："
-
-#: mod/install.php:232
-msgid ""
-"Set the default language for your Friendica installation interface and to "
-"send emails."
-msgstr "为 Friendica 安装界面及邮件发送设置默认语言。"
-
-#: mod/install.php:248
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr "数据库配置文件 \".htconfig.php\" 无法被写入。请在 web 服务器根目录下使用附上的文字创建一个配置文件。"
-
-#: mod/install.php:265
-msgid "<h1>What next</h1>"
-msgstr "<h1>下步是什么</h1>"
-
-#: mod/install.php:266
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"worker."
-msgstr ""
-
-#: mod/install.php:269
-#, php-format
-msgid ""
-"Go to your new Friendica node <a href=\"%s/register\">registration page</a> "
-"and register as new user. Remember to use the same email you have entered as"
-" administrator email. This will allow you to enter the site admin panel."
-msgstr ""
-
-#: mod/message.php:30 src/Content/Nav.php:199
-msgid "New Message"
-msgstr "新的消息"
-
-#: mod/message.php:77
-msgid "Unable to locate contact information."
-msgstr "无法找到联系人信息。"
-
-#: mod/message.php:112 view/theme/frio/theme.php:268 src/Content/Nav.php:196
-msgid "Messages"
-msgstr "消息"
-
-#: mod/message.php:136
-msgid "Do you really want to delete this message?"
-msgstr "您真的想删除这个通知吗？"
-
-#: mod/message.php:152
-msgid "Message deleted."
-msgstr "消息删除了。"
-
-#: mod/message.php:166
-msgid "Conversation removed."
-msgstr "交流删除了。"
-
-#: mod/message.php:272
-msgid "No messages."
-msgstr "没有消息"
-
-#: mod/message.php:311
-msgid "Message not available."
-msgstr "通信不可用的"
-
-#: mod/message.php:378
-msgid "Delete message"
-msgstr "删除消息"
-
-#: mod/message.php:380 mod/message.php:481
-msgid "D, d M Y - g:i A"
-msgstr "D, d M Y - g:i A"
-
-#: mod/message.php:395 mod/message.php:478
-msgid "Delete conversation"
-msgstr "删除交谈"
-
-#: mod/message.php:397
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "没可用的安全交通。您<strong>可能</strong>会在发送人的简介页会回答。"
-
-#: mod/message.php:401
-msgid "Send Reply"
-msgstr "发回答"
-
-#: mod/message.php:452
-#, php-format
-msgid "Unknown sender - %s"
-msgstr "生发送人－%s"
-
-#: mod/message.php:454
-#, php-format
-msgid "You and %s"
-msgstr "您和%s"
-
-#: mod/message.php:456
-#, php-format
-msgid "%s and You"
-msgstr "%s和您"
-
-#: mod/message.php:484
-#, php-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] "%d通知"
-
-#: mod/admin.php:107
+#: mod/admin.php:109
 msgid "Theme settings updated."
 msgstr "主题设置更新了。"
 
-#: mod/admin.php:180 src/Content/Nav.php:175
+#: mod/admin.php:182 src/Content/Nav.php:175
 msgid "Information"
 msgstr "资料"
 
-#: mod/admin.php:181
+#: mod/admin.php:183
 msgid "Overview"
 msgstr "概览"
 
-#: mod/admin.php:182 mod/admin.php:717
+#: mod/admin.php:184 mod/admin.php:723
 msgid "Federation Statistics"
 msgstr "联邦网络统计"
 
-#: mod/admin.php:183
+#: mod/admin.php:185
 msgid "Configuration"
 msgstr "配置"
 
-#: mod/admin.php:184 mod/admin.php:1356
+#: mod/admin.php:186 mod/admin.php:1425
 msgid "Site"
 msgstr "网站"
 
-#: mod/admin.php:185 mod/admin.php:1285 mod/admin.php:1822 mod/admin.php:1838
+#: mod/admin.php:187 mod/admin.php:1354 mod/admin.php:1896 mod/admin.php:1913
 msgid "Users"
 msgstr "用户"
 
-#: mod/admin.php:186 mod/admin.php:1938 mod/admin.php:1998 mod/settings.php:87
-msgid "Addons"
-msgstr "插件"
-
-#: mod/admin.php:187 mod/admin.php:2208 mod/admin.php:2252
+#: mod/admin.php:189 mod/admin.php:2283 mod/admin.php:2327
 msgid "Themes"
 msgstr "主题"
 
-#: mod/admin.php:188 mod/settings.php:65
-msgid "Additional features"
-msgstr "附加的特点"
-
-#: mod/admin.php:189 mod/admin.php:304 mod/register.php:291
-#: src/Content/Nav.php:178 src/Module/Tos.php:70
-msgid "Terms of Service"
-msgstr "服务条款"
-
-#: mod/admin.php:190
+#: mod/admin.php:192
 msgid "Database"
 msgstr "数据库"
 
-#: mod/admin.php:191
+#: mod/admin.php:193
 msgid "DB updates"
 msgstr "数据库更新"
 
-#: mod/admin.php:192 mod/admin.php:752
+#: mod/admin.php:194 mod/admin.php:766
 msgid "Inspect Queue"
 msgstr "检查队列"
 
-#: mod/admin.php:193
+#: mod/admin.php:195
+msgid "Inspect worker Queue"
+msgstr ""
+
+#: mod/admin.php:196
 msgid "Tools"
 msgstr "工具"
 
-#: mod/admin.php:194
+#: mod/admin.php:197
 msgid "Contact Blocklist"
 msgstr "联系人屏蔽列表"
 
-#: mod/admin.php:195 mod/admin.php:366
+#: mod/admin.php:198 mod/admin.php:372
 msgid "Server Blocklist"
 msgstr "服务器屏蔽列表"
 
-#: mod/admin.php:196 mod/admin.php:525
+#: mod/admin.php:199 mod/admin.php:531
 msgid "Delete Item"
 msgstr "删除项目"
 
-#: mod/admin.php:197 mod/admin.php:198 mod/admin.php:2326
+#: mod/admin.php:200 mod/admin.php:201 mod/admin.php:2402
 msgid "Logs"
 msgstr "记录"
 
-#: mod/admin.php:199 mod/admin.php:2393
+#: mod/admin.php:202 mod/admin.php:2469
 msgid "View Logs"
 msgstr "查看日志"
 
-#: mod/admin.php:201
+#: mod/admin.php:204
 msgid "Diagnostics"
 msgstr "诊断"
 
-#: mod/admin.php:202
+#: mod/admin.php:205
 msgid "PHP Info"
 msgstr "PHP Info"
 
-#: mod/admin.php:203
+#: mod/admin.php:206
 msgid "probe address"
 msgstr "探测地址"
 
-#: mod/admin.php:204
+#: mod/admin.php:207
 msgid "check webfinger"
 msgstr "检查 webfinger"
 
-#: mod/admin.php:223 src/Content/Nav.php:218
+#: mod/admin.php:226 src/Content/Nav.php:218
 msgid "Admin"
 msgstr "管理"
 
-#: mod/admin.php:224
+#: mod/admin.php:227
 msgid "Addon Features"
 msgstr "插件特性"
 
-#: mod/admin.php:225
+#: mod/admin.php:228
 msgid "User registrations waiting for confirmation"
 msgstr "用户注册等确认"
 
-#: mod/admin.php:303 mod/admin.php:365 mod/admin.php:482 mod/admin.php:524
-#: mod/admin.php:716 mod/admin.php:751 mod/admin.php:847 mod/admin.php:1355
-#: mod/admin.php:1821 mod/admin.php:1937 mod/admin.php:1997 mod/admin.php:2207
-#: mod/admin.php:2251 mod/admin.php:2325 mod/admin.php:2392
+#: mod/admin.php:309 mod/admin.php:371 mod/admin.php:488 mod/admin.php:530
+#: mod/admin.php:722 mod/admin.php:765 mod/admin.php:806 mod/admin.php:914
+#: mod/admin.php:1424 mod/admin.php:1895 mod/admin.php:2012 mod/admin.php:2072
+#: mod/admin.php:2282 mod/admin.php:2326 mod/admin.php:2401 mod/admin.php:2468
 msgid "Administration"
 msgstr "管理"
 
-#: mod/admin.php:305
+#: mod/admin.php:311
 msgid "Display Terms of Service"
 msgstr "显示服务条款"
 
-#: mod/admin.php:305
+#: mod/admin.php:311
 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:306
+#: mod/admin.php:312
 msgid "Display Privacy Statement"
 msgstr "显示隐私说明"
 
-#: mod/admin.php:306
+#: mod/admin.php:312
 #, 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:307
+#: mod/admin.php:313
 msgid "Privacy Statement Preview"
 msgstr "隐私声明预览"
 
-#: mod/admin.php:309
+#: mod/admin.php:315
 msgid "The Terms of Service"
 msgstr "服务条款"
 
-#: mod/admin.php:309
+#: mod/admin.php:315
 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:357
+#: mod/admin.php:363
 msgid "The blocked domain"
 msgstr "被封禁的域名"
 
-#: mod/admin.php:358 mod/admin.php:371
+#: mod/admin.php:364 mod/admin.php:377
 msgid "The reason why you blocked this domain."
 msgstr "封禁这个域名的原因。"
 
-#: mod/admin.php:359
+#: mod/admin.php:365
 msgid "Delete domain"
 msgstr "删除域名"
 
-#: mod/admin.php:359
+#: mod/admin.php:365
 msgid "Check to delete this entry from the blocklist"
 msgstr "选中以从列表中删除此条目"
 
-#: mod/admin.php:367
+#: mod/admin.php:373
 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 "
@@ -3547,212 +4397,235 @@ msgid ""
 "server."
 msgstr ""
 
-#: mod/admin.php:368
+#: mod/admin.php:374
 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:369
+#: mod/admin.php:375
 msgid "Add new entry to block list"
 msgstr "添加新条目到屏蔽列表"
 
-#: mod/admin.php:370
+#: mod/admin.php:376
 msgid "Server Domain"
 msgstr "服务器域名"
 
-#: mod/admin.php:370
+#: mod/admin.php:376
 msgid ""
 "The domain of the new server to add to the block list. Do not include the "
 "protocol."
 msgstr "需要添加到服务器屏蔽列表的服务器的域名。请勿包括协议。"
 
-#: mod/admin.php:371
+#: mod/admin.php:377
 msgid "Block reason"
 msgstr "封禁原因"
 
-#: mod/admin.php:372
+#: mod/admin.php:378
 msgid "Add Entry"
 msgstr "添加条目"
 
-#: mod/admin.php:373
+#: mod/admin.php:379
 msgid "Save changes to the blocklist"
 msgstr "保存变更到屏蔽列表"
 
-#: mod/admin.php:374
+#: mod/admin.php:380
 msgid "Current Entries in the Blocklist"
 msgstr "屏蔽列表中的当前条目"
 
-#: mod/admin.php:377
+#: mod/admin.php:383
 msgid "Delete entry from blocklist"
 msgstr "删除屏蔽列表中的条目"
 
-#: mod/admin.php:380
+#: mod/admin.php:386
 msgid "Delete entry from blocklist?"
 msgstr "从屏蔽列表删除条目？"
 
-#: mod/admin.php:406
+#: mod/admin.php:412
 msgid "Server added to blocklist."
 msgstr "服务器已添加到屏蔽列表。"
 
-#: mod/admin.php:422
+#: mod/admin.php:428
 msgid "Site blocklist updated."
 msgstr "站点屏蔽列表已更新。"
 
-#: mod/admin.php:445 src/Core/Console/GlobalCommunityBlock.php:72
+#: mod/admin.php:451 src/Core/Console/GlobalCommunityBlock.php:68
 msgid "The contact has been blocked from the node"
 msgstr "该联系人已被本节点屏蔽。"
 
-#: mod/admin.php:447 src/Core/Console/GlobalCommunityBlock.php:69
+#: mod/admin.php:453 src/Core/Console/GlobalCommunityBlock.php:65
 #, php-format
 msgid "Could not find any contact entry for this URL (%s)"
 msgstr ""
 
-#: mod/admin.php:454
+#: mod/admin.php:460
 #, php-format
 msgid "%s contact unblocked"
 msgid_plural "%s contacts unblocked"
 msgstr[0] ""
 
-#: mod/admin.php:483
+#: mod/admin.php:489
 msgid "Remote Contact Blocklist"
 msgstr ""
 
-#: mod/admin.php:484
+#: mod/admin.php:490
 msgid ""
 "This page allows you to prevent any message from a remote contact to reach "
 "your node."
 msgstr ""
 
-#: mod/admin.php:485
+#: mod/admin.php:491
 msgid "Block Remote Contact"
 msgstr ""
 
-#: mod/admin.php:486 mod/admin.php:1824
+#: mod/admin.php:492 mod/admin.php:1898
 msgid "select all"
 msgstr "全选"
 
-#: mod/admin.php:487
+#: mod/admin.php:493
 msgid "select none"
 msgstr ""
 
-#: mod/admin.php:490
+#: mod/admin.php:494 mod/admin.php:1907 mod/contacts.php:657
+#: mod/contacts.php:849 mod/contacts.php:1105
+msgid "Block"
+msgstr "屏蔽"
+
+#: mod/admin.php:495 mod/admin.php:1909 mod/contacts.php:657
+#: mod/contacts.php:849 mod/contacts.php:1105
+msgid "Unblock"
+msgstr "解除屏蔽"
+
+#: mod/admin.php:496
 msgid "No remote contact is blocked from this node."
 msgstr ""
 
-#: mod/admin.php:492
+#: mod/admin.php:498
 msgid "Blocked Remote Contacts"
 msgstr ""
 
-#: mod/admin.php:493
+#: mod/admin.php:499
 msgid "Block New Remote Contact"
 msgstr ""
 
-#: mod/admin.php:494
+#: mod/admin.php:500
 msgid "Photo"
 msgstr "照片"
 
-#: mod/admin.php:494 mod/profiles.php:394
+#: mod/admin.php:500 mod/profiles.php:391
 msgid "Address"
 msgstr "地址"
 
-#: mod/admin.php:502
+#: mod/admin.php:508
 #, php-format
 msgid "%s total blocked contact"
 msgid_plural "%s total blocked contacts"
 msgstr[0] ""
 
-#: mod/admin.php:504
+#: mod/admin.php:510
 msgid "URL of the remote contact to block."
 msgstr ""
 
-#: mod/admin.php:526
+#: mod/admin.php:532
 msgid "Delete this Item"
 msgstr "删除这个项目"
 
-#: mod/admin.php:527
+#: mod/admin.php:533
 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:528
+#: mod/admin.php:534
 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:529
+#: mod/admin.php:535
 msgid "GUID"
 msgstr "GUID"
 
-#: mod/admin.php:529
+#: mod/admin.php:535
 msgid "The GUID of the item you want to delete."
 msgstr "你想要删除的项目的 GUID."
 
-#: mod/admin.php:563
+#: mod/admin.php:569
 msgid "Item marked for deletion."
 msgstr "被标记为要删除的项目。"
 
-#: mod/admin.php:634
+#: mod/admin.php:640
 msgid "unknown"
 msgstr "未知"
 
-#: mod/admin.php:710
+#: mod/admin.php:716
 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:711
+#: mod/admin.php:717
 msgid ""
 "The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
 "will improve the data displayed here."
 msgstr ""
 
-#: mod/admin.php:723
+#: mod/admin.php:729
 #, php-format
 msgid ""
 "Currently this node is aware of %d nodes with %d registered users from the "
 "following platforms:"
 msgstr ""
 
-#: mod/admin.php:754
+#: mod/admin.php:768 mod/admin.php:809
 msgid "ID"
 msgstr "ID"
 
-#: mod/admin.php:755
+#: mod/admin.php:769
 msgid "Recipient Name"
 msgstr "接收者的名字"
 
-#: mod/admin.php:756
+#: mod/admin.php:770
 msgid "Recipient Profile"
 msgstr "接收者的简介"
 
-#: mod/admin.php:757 view/theme/frio/theme.php:266
-#: src/Core/NotificationsManager.php:178 src/Content/Nav.php:183
-msgid "Network"
-msgstr "网络"
-
-#: mod/admin.php:758
+#: mod/admin.php:772 mod/admin.php:811
 msgid "Created"
 msgstr "已创建"
 
-#: mod/admin.php:759
+#: mod/admin.php:773
 msgid "Last Tried"
 msgstr "上次尝试"
 
-#: mod/admin.php:760
+#: mod/admin.php:774
 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:784
+#: mod/admin.php:807
+msgid "Inspect Worker Queue"
+msgstr ""
+
+#: mod/admin.php:810
+msgid "Job Parameters"
+msgstr ""
+
+#: mod/admin.php:812
+msgid "Priority"
+msgstr ""
+
+#: mod/admin.php:813
+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:837
 #, php-format
 msgid ""
 "Your DB still runs with MyISAM tables. You should change the engine type to "
@@ -3763,492 +4636,521 @@ msgid ""
 " an automatic conversion.<br />"
 msgstr ""
 
-#: mod/admin.php:791
+#: mod/admin.php:844
 #, 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 "有新的 Friendica 版本可供下载。您当前的版本为 %1$s，上游版本为 %2$s"
 
-#: mod/admin.php:801
+#: mod/admin.php:854
 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:807
+#: mod/admin.php:860
 msgid "The worker was never executed. Please check your database structure!"
 msgstr ""
 
-#: mod/admin.php:810
+#: mod/admin.php:863
 #, 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:815
+#: mod/admin.php:869
+#, php-format
+msgid ""
+"Friendica's configuration now is stored in config/local.ini.php, please copy"
+" config/local-sample.ini.php and move your config from "
+"<code>.htconfig.php</code>. See <a href=\"%s\">the Config help page</a> for "
+"help with the transition."
+msgstr ""
+
+#: mod/admin.php:876
+#, php-format
+msgid ""
+"<a href=\"%s\">%s</a> is not reachable on your system. This is a servere "
+"configuration issue that prevents the communication.. See <a href=\"%s\">the"
+" installation page</a> for help."
+msgstr ""
+
+#: mod/admin.php:882
 msgid "Normal Account"
 msgstr "正常帐户"
 
-#: mod/admin.php:816
+#: mod/admin.php:883
 msgid "Automatic Follower Account"
 msgstr ""
 
-#: mod/admin.php:817
+#: mod/admin.php:884
 msgid "Public Forum Account"
 msgstr ""
 
-#: mod/admin.php:818
+#: mod/admin.php:885
 msgid "Automatic Friend Account"
 msgstr "自动朋友帐户"
 
-#: mod/admin.php:819
+#: mod/admin.php:886
 msgid "Blog Account"
 msgstr "博客账户"
 
-#: mod/admin.php:820
+#: mod/admin.php:887
 msgid "Private Forum Account"
 msgstr ""
 
-#: mod/admin.php:842
+#: mod/admin.php:909
 msgid "Message queues"
 msgstr "通知排队"
 
-#: mod/admin.php:848
+#: mod/admin.php:915
 msgid "Summary"
 msgstr "概要"
 
-#: mod/admin.php:850
+#: mod/admin.php:917
 msgid "Registered users"
 msgstr "注册的用户"
 
-#: mod/admin.php:852
+#: mod/admin.php:919
 msgid "Pending registrations"
 msgstr "未决的注册"
 
-#: mod/admin.php:853
+#: mod/admin.php:920
 msgid "Version"
 msgstr "版本"
 
-#: mod/admin.php:858
+#: mod/admin.php:925
 msgid "Active addons"
 msgstr "激活插件"
 
-#: mod/admin.php:889
+#: mod/admin.php:956
 msgid "Can not parse base url. Must have at least <scheme>://<domain>"
 msgstr "不能分析基础URL。至少要<scheme>://<domain>"
 
-#: mod/admin.php:1220
+#: mod/admin.php:1289
 msgid "Site settings updated."
 msgstr "网站设置更新了。"
 
-#: mod/admin.php:1247 mod/settings.php:897
-msgid "No special theme for mobile devices"
-msgstr "没专门适合手机的主题"
-
-#: mod/admin.php:1276
+#: mod/admin.php:1345
 msgid "No community page for local users"
 msgstr ""
 
-#: mod/admin.php:1277
+#: mod/admin.php:1346
 msgid "No community page"
 msgstr "没有社会页"
 
-#: mod/admin.php:1278
+#: mod/admin.php:1347
 msgid "Public postings from users of this site"
 msgstr "本网站用户的公开文章"
 
-#: mod/admin.php:1279
+#: mod/admin.php:1348
 msgid "Public postings from the federated network"
 msgstr ""
 
-#: mod/admin.php:1280
+#: mod/admin.php:1349
 msgid "Public postings from local users and the federated network"
 msgstr ""
 
-#: mod/admin.php:1286
+#: mod/admin.php:1353 mod/admin.php:1520 mod/admin.php:1530
+#: mod/contacts.php:577
+msgid "Disabled"
+msgstr "已停用"
+
+#: mod/admin.php:1355
 msgid "Users, Global Contacts"
 msgstr "用户，全球联系人"
 
-#: mod/admin.php:1287
+#: mod/admin.php:1356
 msgid "Users, Global Contacts/fallback"
 msgstr ""
 
-#: mod/admin.php:1291
+#: mod/admin.php:1360
 msgid "One month"
 msgstr "一个月"
 
-#: mod/admin.php:1292
+#: mod/admin.php:1361
 msgid "Three months"
 msgstr "三个月"
 
-#: mod/admin.php:1293
+#: mod/admin.php:1362
 msgid "Half a year"
 msgstr "半年"
 
-#: mod/admin.php:1294
+#: mod/admin.php:1363
 msgid "One year"
 msgstr "一年"
 
-#: mod/admin.php:1299
+#: mod/admin.php:1368
 msgid "Multi user instance"
 msgstr "多用户网站"
 
-#: mod/admin.php:1325
+#: mod/admin.php:1394
 msgid "Closed"
 msgstr "关闭"
 
-#: mod/admin.php:1326
+#: mod/admin.php:1395
 msgid "Requires approval"
 msgstr "要批准"
 
-#: mod/admin.php:1327
+#: mod/admin.php:1396
 msgid "Open"
 msgstr "打开"
 
-#: mod/admin.php:1331
+#: mod/admin.php:1400
 msgid "No SSL policy, links will track page SSL state"
 msgstr "没SSL方针，环节将追踪页SSL现状"
 
-#: mod/admin.php:1332
+#: mod/admin.php:1401
 msgid "Force all links to use SSL"
 msgstr "强制所有链接使用 SSL"
 
-#: mod/admin.php:1333
+#: mod/admin.php:1402
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr "自签证书，只在本地链接使用 SSL（不推荐）"
 
-#: mod/admin.php:1337
+#: mod/admin.php:1406
 msgid "Don't check"
 msgstr "请勿检查"
 
-#: mod/admin.php:1338
+#: mod/admin.php:1407
 msgid "check the stable version"
 msgstr "检查稳定版"
 
-#: mod/admin.php:1339
+#: mod/admin.php:1408
 msgid "check the development version"
 msgstr "检查开发版本"
 
-#: mod/admin.php:1358
+#: mod/admin.php:1427
 msgid "Republish users to directory"
 msgstr ""
 
-#: mod/admin.php:1359 mod/register.php:267
-msgid "Registration"
-msgstr "注册"
-
-#: mod/admin.php:1360
+#: mod/admin.php:1429
 msgid "File upload"
 msgstr "文件上传"
 
-#: mod/admin.php:1361
+#: mod/admin.php:1430
 msgid "Policies"
 msgstr "政策"
 
-#: mod/admin.php:1363
+#: mod/admin.php:1431 mod/contacts.php:926 mod/events.php:535
+#: src/Model/Profile.php:852
+msgid "Advanced"
+msgstr "高级"
+
+#: mod/admin.php:1432
 msgid "Auto Discovered Contact Directory"
 msgstr ""
 
-#: mod/admin.php:1364
+#: mod/admin.php:1433
 msgid "Performance"
 msgstr "性能"
 
-#: mod/admin.php:1365
+#: mod/admin.php:1434
 msgid "Worker"
 msgstr ""
 
-#: mod/admin.php:1366
+#: mod/admin.php:1435
 msgid "Message Relay"
 msgstr "讯息中继"
 
-#: mod/admin.php:1367
+#: mod/admin.php:1436
 msgid ""
 "Relocate - WARNING: advanced function. Could make this server unreachable."
 msgstr "重定位 - 警告：高级功能。可能会让这个服务器不可达。"
 
-#: mod/admin.php:1370
+#: mod/admin.php:1439
 msgid "Site name"
 msgstr "网页名字"
 
-#: mod/admin.php:1371
+#: mod/admin.php:1440
 msgid "Host name"
 msgstr "服务器名"
 
-#: mod/admin.php:1372
+#: mod/admin.php:1441
 msgid "Sender Email"
 msgstr "寄主邮件"
 
-#: mod/admin.php:1372
+#: mod/admin.php:1441
 msgid ""
 "The email address your server shall use to send notification emails from."
 msgstr ""
 
-#: mod/admin.php:1373
+#: mod/admin.php:1442
 msgid "Banner/Logo"
 msgstr "标题/标志"
 
-#: mod/admin.php:1374
+#: mod/admin.php:1443
 msgid "Shortcut icon"
 msgstr "捷径小图片"
 
-#: mod/admin.php:1374
+#: mod/admin.php:1443
 msgid "Link to an icon that will be used for browsers."
 msgstr ""
 
-#: mod/admin.php:1375
+#: mod/admin.php:1444
 msgid "Touch icon"
 msgstr "触摸小图片"
 
-#: mod/admin.php:1375
+#: mod/admin.php:1444
 msgid "Link to an icon that will be used for tablets and mobiles."
 msgstr ""
 
-#: mod/admin.php:1376
+#: mod/admin.php:1445
 msgid "Additional Info"
 msgstr "别的消息"
 
-#: mod/admin.php:1376
+#: mod/admin.php:1445
 #, php-format
 msgid ""
 "For public servers: you can add additional information here that will be "
 "listed at %s/servers."
 msgstr ""
 
-#: mod/admin.php:1377
+#: mod/admin.php:1446
 msgid "System language"
 msgstr "系统语言"
 
-#: mod/admin.php:1378
+#: mod/admin.php:1447
 msgid "System theme"
 msgstr "系统主题"
 
-#: mod/admin.php:1378
+#: mod/admin.php:1447
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "默认系统主题－会被用户简介超驰－<a href='#' id='cnftheme'>把主题设置变化</a>"
 
-#: mod/admin.php:1379
+#: mod/admin.php:1448
 msgid "Mobile system theme"
 msgstr "手机系统主题"
 
-#: mod/admin.php:1379
+#: mod/admin.php:1448
 msgid "Theme for mobile devices"
 msgstr "用于移动设备的主题"
 
-#: mod/admin.php:1380
+#: mod/admin.php:1449
 msgid "SSL link policy"
 msgstr "SSL环节方针"
 
-#: mod/admin.php:1380
+#: mod/admin.php:1449
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "决定产生的链接是否应该强制使用 SSL"
 
-#: mod/admin.php:1381
+#: mod/admin.php:1450
 msgid "Force SSL"
 msgstr "强制使用 SSL"
 
-#: mod/admin.php:1381
+#: mod/admin.php:1450
 msgid ""
 "Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
 " to endless loops."
 msgstr "强逼所有非SSL的要求用SSL。注意：在有的系统会导致无限循环"
 
-#: mod/admin.php:1382
+#: mod/admin.php:1451
 msgid "Hide help entry from navigation menu"
 msgstr "在导航菜单隐藏帮助条目"
 
-#: mod/admin.php:1382
+#: mod/admin.php:1451
 msgid ""
 "Hides the menu entry for the Help pages from the navigation menu. You can "
 "still access it calling /help directly."
 msgstr "在导航菜单中隐藏帮助页面的菜单条目。您仍然可以通过输入「/help」直接访问。"
 
-#: mod/admin.php:1383
+#: mod/admin.php:1452
 msgid "Single user instance"
 msgstr "单用户网站"
 
-#: mod/admin.php:1383
+#: mod/admin.php:1452
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr "弄这网站多用户或单用户为选择的用户"
 
-#: mod/admin.php:1384
+#: mod/admin.php:1453
 msgid "Maximum image size"
 msgstr "图片最大尺寸"
 
-#: mod/admin.php:1384
+#: mod/admin.php:1453
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "最多上传照相的字节。默认是零，意思是无限。"
 
-#: mod/admin.php:1385
+#: mod/admin.php:1454
 msgid "Maximum image length"
 msgstr "最大图片大小"
 
-#: mod/admin.php:1385
+#: mod/admin.php:1454
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr "最多像素在上传图片的长度。默认-1，意思是无限。"
 
-#: mod/admin.php:1386
+#: mod/admin.php:1455
 msgid "JPEG image quality"
 msgstr "JPEG 图片质量"
 
-#: mod/admin.php:1386
+#: mod/admin.php:1455
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr "上传的JPEG被用这质量［0－100］保存。默认100，最高。"
 
-#: mod/admin.php:1388
+#: mod/admin.php:1457
 msgid "Register policy"
 msgstr "注册政策"
 
-#: mod/admin.php:1389
+#: mod/admin.php:1458
 msgid "Maximum Daily Registrations"
 msgstr "一天最多注册"
 
-#: mod/admin.php:1389
+#: mod/admin.php:1458
 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:1390
+#: mod/admin.php:1459
 msgid "Register text"
 msgstr "注册正文"
 
-#: mod/admin.php:1390
+#: mod/admin.php:1459
 msgid ""
 "Will be displayed prominently on the registration page. You can use BBCode "
 "here."
 msgstr ""
 
-#: mod/admin.php:1391
+#: mod/admin.php:1460
+msgid "Forbidden Nicknames"
+msgstr ""
+
+#: mod/admin.php:1460
+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:1461
 msgid "Accounts abandoned after x days"
 msgstr "账户丢弃X天后"
 
-#: mod/admin.php:1391
+#: mod/admin.php:1461
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "拒绝浪费系统资源看外网站找丢弃的账户。输入0为无时限。"
 
-#: mod/admin.php:1392
+#: mod/admin.php:1462
 msgid "Allowed friend domains"
 msgstr "允许的朋友域"
 
-#: mod/admin.php:1392
+#: mod/admin.php:1462
 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:1393
+#: mod/admin.php:1463
 msgid "Allowed email domains"
 msgstr "允许的电子邮件域"
 
-#: mod/admin.php:1393
+#: mod/admin.php:1463
 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:1394
+#: mod/admin.php:1464
 msgid "No OEmbed rich content"
 msgstr ""
 
-#: mod/admin.php:1394
+#: mod/admin.php:1464
 msgid ""
 "Don't show the rich content (e.g. embedded PDF), except from the domains "
 "listed below."
 msgstr ""
 
-#: mod/admin.php:1395
+#: mod/admin.php:1465
 msgid "Allowed OEmbed domains"
 msgstr ""
 
-#: mod/admin.php:1395
+#: mod/admin.php:1465
 msgid ""
 "Comma separated list of domains which oembed content is allowed to be "
 "displayed. Wildcards are accepted."
 msgstr ""
 
-#: mod/admin.php:1396
+#: mod/admin.php:1466
 msgid "Block public"
 msgstr ""
 
-#: mod/admin.php:1396
+#: mod/admin.php:1466
 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:1397
+#: mod/admin.php:1467
 msgid "Force publish"
 msgstr "强行发布"
 
-#: mod/admin.php:1397
+#: mod/admin.php:1467
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "让所有这网站的的简介表明在网站目录。"
 
-#: mod/admin.php:1397
+#: mod/admin.php:1467
 msgid "Enabling this may violate privacy laws like the GDPR"
 msgstr "启用此项可能会违反隐私法律，譬如 GDPR 等"
 
-#: mod/admin.php:1398
+#: mod/admin.php:1468
 msgid "Global directory URL"
 msgstr ""
 
-#: mod/admin.php:1398
+#: mod/admin.php:1468
 msgid ""
 "URL to the global directory. If this is not set, the global directory is "
 "completely unavailable to the application."
 msgstr ""
 
-#: mod/admin.php:1399
+#: mod/admin.php:1469
 msgid "Private posts by default for new users"
 msgstr "新用户默认写私人文章"
 
-#: mod/admin.php:1399
+#: mod/admin.php:1469
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr "默认新用户文章批准使默认隐私组，没有公开。"
 
-#: mod/admin.php:1400
+#: mod/admin.php:1470
 msgid "Don't include post content in email notifications"
 msgstr "别包含文章内容在邮件消息"
 
-#: mod/admin.php:1400
+#: mod/admin.php:1470
 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:1401
+#: mod/admin.php:1471
 msgid "Disallow public access to addons listed in the apps menu."
 msgstr "不允许插件的公众使用权在应用选单。"
 
-#: mod/admin.php:1401
+#: mod/admin.php:1471
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
 msgstr "复选这个框为把应用选内插件限制仅成员"
 
-#: mod/admin.php:1402
+#: mod/admin.php:1472
 msgid "Don't embed private images in posts"
 msgstr "别嵌入私人图案在文章里"
 
-#: mod/admin.php:1402
+#: mod/admin.php:1472
 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 "
@@ -4256,210 +5158,223 @@ msgid ""
 "while."
 msgstr "别把复制嵌入的照相代替本网站的私人照相在文章里。结果是收包括私人照相的熟人要认证才卸载个张照片，会花许久。"
 
-#: mod/admin.php:1403
+#: mod/admin.php:1473
+msgid "Explicit Content"
+msgstr ""
+
+#: mod/admin.php:1473
+msgid ""
+"Set this to announce that your node is used mostly for explicit content that"
+" might not be suited for minors. This information will be published in the "
+"node information and might be used, e.g. by the global directory, to filter "
+"your node from listings of nodes to join. Additionally a note about this "
+"will be shown at the user registration page."
+msgstr ""
+
+#: mod/admin.php:1474
 msgid "Allow Users to set remote_self"
 msgstr "允许用户用遥远的自身"
 
-#: mod/admin.php:1403
+#: mod/admin.php:1474
 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:1404
+#: mod/admin.php:1475
 msgid "Block multiple registrations"
 msgstr "阻止多次注册"
 
-#: mod/admin.php:1404
+#: mod/admin.php:1475
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr "不允许用户注册别的账户为当页。"
 
-#: mod/admin.php:1405
+#: mod/admin.php:1476
 msgid "OpenID support"
 msgstr "OpenID 支持"
 
-#: mod/admin.php:1405
+#: mod/admin.php:1476
 msgid "OpenID support for registration and logins."
 msgstr "支持使用 OpenID 注册和登录。"
 
-#: mod/admin.php:1406
+#: mod/admin.php:1477
 msgid "Fullname check"
 msgstr "全名核实"
 
-#: mod/admin.php:1406
+#: mod/admin.php:1477
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr "让用户注册的时候放空格姓名中间，省得垃圾注册。"
 
-#: mod/admin.php:1407
+#: mod/admin.php:1478
 msgid "Community pages for visitors"
 msgstr ""
 
-#: mod/admin.php:1407
+#: mod/admin.php:1478
 msgid ""
 "Which community pages should be available for visitors. Local users always "
 "see both pages."
 msgstr ""
 
-#: mod/admin.php:1408
+#: mod/admin.php:1479
 msgid "Posts per user on community page"
 msgstr "个用户文章数量在社会页"
 
-#: mod/admin.php:1408
+#: mod/admin.php:1479
 msgid ""
 "The maximum number of posts per user on the community page. (Not valid for "
 "'Global Community')"
 msgstr "一个用户最多文章在社会页。（无效在“全球社会”）"
 
-#: mod/admin.php:1409
+#: mod/admin.php:1480
 msgid "Enable OStatus support"
 msgstr "启用 OStatus 支持"
 
-#: mod/admin.php:1409
+#: mod/admin.php:1480
 msgid ""
 "Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr "提供内置的 OStatus（StatusNet、GNU Social 等）兼容性。所有 OStatus 的通信是公开的，所以会偶尔显示隐私警告。"
 
-#: mod/admin.php:1410
+#: mod/admin.php:1481
 msgid "Only import OStatus threads from our contacts"
 msgstr ""
 
-#: mod/admin.php:1410
+#: mod/admin.php:1481
 msgid ""
 "Normally we import every content from our OStatus contacts. With this option"
 " we only store threads that are started by a contact that is known on our "
 "system."
 msgstr ""
 
-#: mod/admin.php:1411
+#: mod/admin.php:1482
 msgid "OStatus support can only be enabled if threading is enabled."
 msgstr ""
 
-#: mod/admin.php:1413
+#: mod/admin.php:1484
 msgid ""
 "Diaspora support can't be enabled because Friendica was installed into a sub"
 " directory."
 msgstr "Diaspora 支持无法启用，因为 Friendica 被安装到了一个子目录。"
 
-#: mod/admin.php:1414
+#: mod/admin.php:1485
 msgid "Enable Diaspora support"
 msgstr "启用 Diaspora 支持"
 
-#: mod/admin.php:1414
+#: mod/admin.php:1485
 msgid "Provide built-in Diaspora network compatibility."
 msgstr "提供内置的 Diaspora 网络兼容性。"
 
-#: mod/admin.php:1415
+#: mod/admin.php:1486
 msgid "Only allow Friendica contacts"
 msgstr "只允许 Friendica 联系人"
 
-#: mod/admin.php:1415
+#: mod/admin.php:1486
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr "所有联系人必须使用 Friendica 协议 。所有其他内置沟通协议都已停用。"
 
-#: mod/admin.php:1416
+#: mod/admin.php:1487
 msgid "Verify SSL"
 msgstr "验证 SSL"
 
-#: mod/admin.php:1416
+#: mod/admin.php:1487
 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 "你想的话，您会使严格证书核实可用。意思是您不能根自签的SSL网站交流。"
 
-#: mod/admin.php:1417
+#: mod/admin.php:1488
 msgid "Proxy user"
 msgstr "代理用户"
 
-#: mod/admin.php:1418
+#: mod/admin.php:1489
 msgid "Proxy URL"
 msgstr "代理URL"
 
-#: mod/admin.php:1419
+#: mod/admin.php:1490
 msgid "Network timeout"
 msgstr "网络超时"
 
-#: mod/admin.php:1419
+#: mod/admin.php:1490
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "输入秒数。输入零为无限（不推荐的）。"
 
-#: mod/admin.php:1420
+#: mod/admin.php:1491
 msgid "Maximum Load Average"
 msgstr "最大平均负荷"
 
-#: mod/admin.php:1420
+#: mod/admin.php:1491
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "系统负荷平均以上转播和检查行程会被耽误－默认50。"
 
-#: mod/admin.php:1421
+#: mod/admin.php:1492
 msgid "Maximum Load Average (Frontend)"
 msgstr ""
 
-#: mod/admin.php:1421
+#: mod/admin.php:1492
 msgid "Maximum system load before the frontend quits service - default 50."
 msgstr ""
 
-#: mod/admin.php:1422
+#: mod/admin.php:1493
 msgid "Minimal Memory"
 msgstr "最少内存"
 
-#: mod/admin.php:1422
+#: mod/admin.php:1493
 msgid ""
 "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
 "default 0 (deactivated)."
 msgstr ""
 
-#: mod/admin.php:1423
+#: mod/admin.php:1494
 msgid "Maximum table size for optimization"
 msgstr ""
 
-#: mod/admin.php:1423
+#: mod/admin.php:1494
 msgid ""
 "Maximum table size (in MB) for the automatic optimization. Enter -1 to "
 "disable it."
 msgstr ""
 
-#: mod/admin.php:1424
+#: mod/admin.php:1495
 msgid "Minimum level of fragmentation"
 msgstr ""
 
-#: mod/admin.php:1424
+#: mod/admin.php:1495
 msgid ""
 "Minimum fragmenation level to start the automatic optimization - default "
 "value is 30%."
 msgstr ""
 
-#: mod/admin.php:1426
+#: mod/admin.php:1497
 msgid "Periodical check of global contacts"
 msgstr "定期检查全球联系人"
 
-#: mod/admin.php:1426
+#: mod/admin.php:1497
 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:1427
+#: mod/admin.php:1498
 msgid "Days between requery"
 msgstr "重新查询间隔天数"
 
-#: mod/admin.php:1427
+#: mod/admin.php:1498
 msgid "Number of days after which a server is requeried for his contacts."
 msgstr ""
 
-#: mod/admin.php:1428
+#: mod/admin.php:1499
 msgid "Discover contacts from other servers"
 msgstr "从其他服务器上发现联系人"
 
-#: mod/admin.php:1428
+#: mod/admin.php:1499
 msgid ""
 "Periodically query other servers for contacts. You can choose between "
 "'users': the users on the remote system, 'Global Contacts': active contacts "
@@ -4469,32 +5384,32 @@ msgid ""
 "Global Contacts'."
 msgstr ""
 
-#: mod/admin.php:1429
+#: mod/admin.php:1500
 msgid "Timeframe for fetching global contacts"
 msgstr ""
 
-#: mod/admin.php:1429
+#: mod/admin.php:1500
 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:1430
+#: mod/admin.php:1501
 msgid "Search the local directory"
 msgstr "搜索本地目录"
 
-#: mod/admin.php:1430
+#: mod/admin.php:1501
 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:1432
+#: mod/admin.php:1503
 msgid "Publish server information"
 msgstr "发布服务器信息"
 
-#: mod/admin.php:1432
+#: mod/admin.php:1503
 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 "
@@ -4502,50 +5417,50 @@ msgid ""
 " href='http://the-federation.info/'>the-federation.info</a> for details."
 msgstr ""
 
-#: mod/admin.php:1434
+#: mod/admin.php:1505
 msgid "Check upstream version"
 msgstr "检查上游版本"
 
-#: mod/admin.php:1434
+#: mod/admin.php:1505
 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 "启用在 github 上检查新的 Friendica 版本。如果发现新版本，您将在管理员概要面板得到通知。"
 
-#: mod/admin.php:1435
+#: mod/admin.php:1506
 msgid "Suppress Tags"
 msgstr "压制标签"
 
-#: mod/admin.php:1435
+#: mod/admin.php:1506
 msgid "Suppress showing a list of hashtags at the end of the posting."
 msgstr "不在文章末尾显示主题标签列表。"
 
-#: mod/admin.php:1436
+#: mod/admin.php:1507
 msgid "Clean database"
 msgstr "清理数据库"
 
-#: mod/admin.php:1436
+#: mod/admin.php:1507
 msgid ""
 "Remove old remote items, orphaned database records and old content from some"
 " other helper tables."
 msgstr ""
 
-#: mod/admin.php:1437
+#: mod/admin.php:1508
 msgid "Lifespan of remote items"
 msgstr ""
 
-#: mod/admin.php:1437
+#: mod/admin.php:1508
 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:1438
+#: mod/admin.php:1509
 msgid "Lifespan of unclaimed items"
 msgstr ""
 
-#: mod/admin.php:1438
+#: mod/admin.php:1509
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "unclaimed remote items (mostly content from the relay) will be deleted. "
@@ -4553,129 +5468,130 @@ msgid ""
 "items if set to 0."
 msgstr ""
 
-#: mod/admin.php:1439
+#: mod/admin.php:1510
 msgid "Path to item cache"
 msgstr "路线到项目缓存"
 
-#: mod/admin.php:1439
+#: mod/admin.php:1510
 msgid "The item caches buffers generated bbcode and external images."
 msgstr ""
 
-#: mod/admin.php:1440
+#: mod/admin.php:1511
 msgid "Cache duration in seconds"
 msgstr "缓存时间秒"
 
-#: mod/admin.php:1440
+#: mod/admin.php:1511
 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 "高速缓存要存文件多久？默认是86400秒钟（一天）。停用高速缓存，输入-1。"
 
-#: mod/admin.php:1441
+#: mod/admin.php:1512
 msgid "Maximum numbers of comments per post"
 msgstr "文件最多评论"
 
-#: mod/admin.php:1441
+#: mod/admin.php:1512
 msgid "How much comments should be shown for each post? Default value is 100."
 msgstr ""
 
-#: mod/admin.php:1442
+#: mod/admin.php:1513
 msgid "Temp path"
 msgstr "临时文件路线"
 
-#: mod/admin.php:1442
+#: mod/admin.php:1513
 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:1443
+#: mod/admin.php:1514
 msgid "Base path to installation"
 msgstr "基础安装路线"
 
-#: mod/admin.php:1443
+#: mod/admin.php:1514
 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:1444
+#: mod/admin.php:1515
 msgid "Disable picture proxy"
 msgstr "停用图片代理"
 
-#: mod/admin.php:1444
+#: mod/admin.php:1515
 msgid ""
 "The picture proxy increases performance and privacy. It shouldn't be used on"
 " systems with very low bandwidth."
 msgstr ""
 
-#: mod/admin.php:1445
+#: mod/admin.php:1516
 msgid "Only search in tags"
 msgstr "只在标签项内搜索"
 
-#: mod/admin.php:1445
+#: mod/admin.php:1516
 msgid "On large systems the text search can slow down the system extremely."
 msgstr "在大型系统中，正文搜索会极大降低系统运行速度。"
 
-#: mod/admin.php:1447
+#: mod/admin.php:1518
 msgid "New base url"
 msgstr "新基础URL"
 
-#: mod/admin.php:1447
+#: mod/admin.php:1518
 msgid ""
 "Change base url for this server. Sends relocate message to all Friendica and"
 " Diaspora* contacts of all users."
 msgstr ""
 
-#: mod/admin.php:1449
+#: mod/admin.php:1520
 msgid "RINO Encryption"
 msgstr "RINO 加密"
 
-#: mod/admin.php:1449
+#: mod/admin.php:1520
 msgid "Encryption layer between nodes."
 msgstr "节点之间的加密层。"
 
-#: mod/admin.php:1449
+#: mod/admin.php:1520
 msgid "Enabled"
 msgstr "已启用"
 
-#: mod/admin.php:1451
+#: mod/admin.php:1522
 msgid "Maximum number of parallel workers"
 msgstr ""
 
-#: mod/admin.php:1451
+#: mod/admin.php:1522
+#, php-format
 msgid ""
-"On shared hosters set this to 2. On larger systems, values of 10 are great. "
-"Default value is 4."
+"On shared hosters set this to %d. On larger systems, values of %d are great."
+" Default value is %d."
 msgstr ""
 
-#: mod/admin.php:1452
+#: mod/admin.php:1523
 msgid "Don't use 'proc_open' with the worker"
 msgstr ""
 
-#: mod/admin.php:1452
+#: mod/admin.php:1523
 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:1453
+#: mod/admin.php:1524
 msgid "Enable fastlane"
 msgstr "启用快车道模式"
 
-#: mod/admin.php:1453
+#: mod/admin.php:1524
 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:1454
+#: mod/admin.php:1525
 msgid "Enable frontend worker"
 msgstr ""
 
-#: mod/admin.php:1454
+#: mod/admin.php:1525
 #, php-format
 msgid ""
 "When enabled the Worker process is triggered when backend access is "
@@ -4685,132 +5601,136 @@ msgid ""
 " on your server."
 msgstr ""
 
-#: mod/admin.php:1456
+#: mod/admin.php:1527
 msgid "Subscribe to relay"
 msgstr ""
 
-#: mod/admin.php:1456
+#: mod/admin.php:1527
 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:1457
+#: mod/admin.php:1528
 msgid "Relay server"
 msgstr "中继服务器"
 
-#: mod/admin.php:1457
+#: mod/admin.php:1528
 msgid ""
 "Address of the relay server where public posts should be send to. For "
 "example https://relay.diasp.org"
 msgstr ""
 
-#: mod/admin.php:1458
+#: mod/admin.php:1529
 msgid "Direct relay transfer"
 msgstr ""
 
-#: mod/admin.php:1458
+#: mod/admin.php:1529
 msgid ""
 "Enables the direct transfer to other servers without using the relay servers"
 msgstr ""
 
-#: mod/admin.php:1459
+#: mod/admin.php:1530
 msgid "Relay scope"
 msgstr ""
 
-#: mod/admin.php:1459
+#: mod/admin.php:1530
 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:1459
+#: mod/admin.php:1530
 msgid "all"
 msgstr "所有"
 
-#: mod/admin.php:1459
+#: mod/admin.php:1530
 msgid "tags"
 msgstr ""
 
-#: mod/admin.php:1460
+#: mod/admin.php:1531
 msgid "Server tags"
 msgstr ""
 
-#: mod/admin.php:1460
+#: mod/admin.php:1531
 msgid "Comma separated list of tags for the 'tags' subscription."
 msgstr ""
 
-#: mod/admin.php:1461
+#: mod/admin.php:1532
 msgid "Allow user tags"
 msgstr ""
 
-#: mod/admin.php:1461
+#: mod/admin.php:1532
 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:1489
+#: mod/admin.php:1535
+msgid "Start Relocation"
+msgstr ""
+
+#: mod/admin.php:1561
 msgid "Update has been marked successful"
 msgstr "更新当成功标签了"
 
-#: mod/admin.php:1496
+#: mod/admin.php:1568
 #, php-format
 msgid "Database structure update %s was successfully applied."
 msgstr ""
 
-#: mod/admin.php:1499
+#: mod/admin.php:1571
 #, php-format
 msgid "Executing of database structure update %s failed with error: %s"
 msgstr ""
 
-#: mod/admin.php:1515
+#: mod/admin.php:1587
 #, php-format
 msgid "Executing %s failed with error: %s"
 msgstr "执行 %s 失败，错误：%s"
 
-#: mod/admin.php:1517
+#: mod/admin.php:1589
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "把%s更新成功地实行。"
 
-#: mod/admin.php:1520
+#: mod/admin.php:1592
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "%s更新没回答现状。不知道是否成功。"
 
-#: mod/admin.php:1523
+#: mod/admin.php:1595
 #, php-format
 msgid "There was no additional update function %s that needed to be called."
 msgstr ""
 
-#: mod/admin.php:1546
+#: mod/admin.php:1618
 msgid "No failed updates."
 msgstr "没有不通过地更新。"
 
-#: mod/admin.php:1547
+#: mod/admin.php:1619
 msgid "Check database structure"
 msgstr "检查数据库结构"
 
-#: mod/admin.php:1552
+#: mod/admin.php:1624
 msgid "Failed Updates"
 msgstr "没通过的更新"
 
-#: mod/admin.php:1553
+#: mod/admin.php:1625
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr "这个不包括1139号更新之前，它们没回答装线。"
 
-#: mod/admin.php:1554
+#: mod/admin.php:1626
 msgid "Mark success (if update was manually applied)"
 msgstr "标注成功（如果手动地把更新实行了）"
 
-#: mod/admin.php:1555
+#: mod/admin.php:1627
 msgid "Attempt to execute this update step automatically"
 msgstr "试图自动地把这步更新实行"
 
-#: mod/admin.php:1594
+#: mod/admin.php:1666
 #, php-format
 msgid ""
 "\n"
@@ -4818,7 +5738,7 @@ msgid ""
 "\t\t\t\tthe administrator of %2$s has set up an account for you."
 msgstr ""
 
-#: mod/admin.php:1597
+#: mod/admin.php:1669
 #, php-format
 msgid ""
 "\n"
@@ -4850,206 +5770,174 @@ msgid ""
 "\t\t\tThank you and welcome to %4$s."
 msgstr ""
 
-#: mod/admin.php:1631 src/Model/User.php:665
+#: mod/admin.php:1706 src/Model/User.php:707
 #, php-format
 msgid "Registration details for %s"
 msgstr "注册信息为%s"
 
-#: mod/admin.php:1641
+#: mod/admin.php:1716
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 
-#: mod/admin.php:1647
+#: mod/admin.php:1722
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] "%s 用户被删除了"
 
-#: mod/admin.php:1694
+#: mod/admin.php:1769
 #, php-format
 msgid "User '%s' deleted"
 msgstr "用户 '%s' 被删除了"
 
-#: mod/admin.php:1702
+#: mod/admin.php:1777
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "用户“%s”已解除屏蔽"
 
-#: mod/admin.php:1702
+#: mod/admin.php:1777
 #, php-format
 msgid "User '%s' blocked"
 msgstr "用户“%s”已屏蔽"
 
-#: mod/admin.php:1759 mod/settings.php:1058
-msgid "Normal Account Page"
-msgstr "标准账户页面"
-
-#: mod/admin.php:1760 mod/settings.php:1062
-msgid "Soapbox Page"
-msgstr "演讲台页"
-
-#: mod/admin.php:1761 mod/settings.php:1066
-msgid "Public Forum"
-msgstr "公共论坛"
-
-#: mod/admin.php:1762 mod/settings.php:1070
-msgid "Automatic Friend Page"
-msgstr "自动朋友页"
-
-#: mod/admin.php:1763
+#: mod/admin.php:1838
 msgid "Private Forum"
 msgstr ""
 
-#: mod/admin.php:1766 mod/settings.php:1042
-msgid "Personal Page"
-msgstr "个人页面"
-
-#: mod/admin.php:1767 mod/settings.php:1046
-msgid "Organisation Page"
-msgstr "组织页面"
-
-#: mod/admin.php:1768 mod/settings.php:1050
-msgid "News Page"
-msgstr "新闻页面"
-
-#: mod/admin.php:1769 mod/settings.php:1054
-msgid "Community Forum"
-msgstr "社区论坛"
-
-#: mod/admin.php:1816 mod/admin.php:1827 mod/admin.php:1840 mod/admin.php:1858
-#: src/Content/ContactSelector.php:82
+#: mod/admin.php:1890 mod/admin.php:1901 mod/admin.php:1915 mod/admin.php:1933
+#: src/Content/ContactSelector.php:81
 msgid "Email"
 msgstr "电子邮件"
 
-#: mod/admin.php:1816 mod/admin.php:1840
+#: mod/admin.php:1890 mod/admin.php:1915
 msgid "Register date"
 msgstr "注册日期"
 
-#: mod/admin.php:1816 mod/admin.php:1840
+#: mod/admin.php:1890 mod/admin.php:1915
 msgid "Last login"
 msgstr "上次登录"
 
-#: mod/admin.php:1816 mod/admin.php:1840
+#: mod/admin.php:1890 mod/admin.php:1915
 msgid "Last item"
 msgstr "上项目"
 
-#: mod/admin.php:1816
+#: mod/admin.php:1890
 msgid "Type"
 msgstr ""
 
-#: mod/admin.php:1823
+#: mod/admin.php:1897
 msgid "Add User"
 msgstr "添加用户"
 
-#: mod/admin.php:1825
+#: mod/admin.php:1899
 msgid "User registrations waiting for confirm"
 msgstr "用户注册等待确认"
 
-#: mod/admin.php:1826
+#: mod/admin.php:1900
 msgid "User waiting for permanent deletion"
 msgstr "用户等待长久删除"
 
-#: mod/admin.php:1827
+#: mod/admin.php:1901
 msgid "Request date"
 msgstr "要求日期"
 
-#: mod/admin.php:1828
+#: mod/admin.php:1902
 msgid "No registrations."
 msgstr "没有注册。"
 
-#: mod/admin.php:1829
+#: mod/admin.php:1903
 msgid "Note from the user"
 msgstr ""
 
-#: mod/admin.php:1830 mod/notifications.php:178 mod/notifications.php:262
-msgid "Approve"
-msgstr "批准"
-
-#: mod/admin.php:1831
+#: mod/admin.php:1905
 msgid "Deny"
 msgstr "否定"
 
-#: mod/admin.php:1835
+#: mod/admin.php:1908
+msgid "User blocked"
+msgstr ""
+
+#: mod/admin.php:1910
 msgid "Site admin"
 msgstr "网站管理员"
 
-#: mod/admin.php:1836
+#: mod/admin.php:1911
 msgid "Account expired"
 msgstr "帐户过期了"
 
-#: mod/admin.php:1839
+#: mod/admin.php:1914
 msgid "New User"
 msgstr "新用户"
 
-#: mod/admin.php:1840
+#: mod/admin.php:1915
 msgid "Deleted since"
 msgstr "删除从"
 
-#: mod/admin.php:1845
+#: mod/admin.php:1920
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "特定的用户被删除！\\n\\n什么这些用户放在这个网站被永远删除！\\n\\n您肯定吗？"
 
-#: mod/admin.php:1846
+#: mod/admin.php:1921
 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 "用户{0}将被删除！\\n\\n什么这个用户放在这个网站被永远删除！\\n\\n您肯定吗？"
 
-#: mod/admin.php:1856
+#: mod/admin.php:1931
 msgid "Name of the new user."
 msgstr "新用户的名字。"
 
-#: mod/admin.php:1857
+#: mod/admin.php:1932
 msgid "Nickname"
 msgstr "昵称"
 
-#: mod/admin.php:1857
+#: mod/admin.php:1932
 msgid "Nickname of the new user."
 msgstr "新用户的昵称。"
 
-#: mod/admin.php:1858
+#: mod/admin.php:1933
 msgid "Email address of the new user."
 msgstr "新用户的邮件地址。"
 
-#: mod/admin.php:1900
+#: mod/admin.php:1975
 #, php-format
 msgid "Addon %s disabled."
 msgstr "插件 %s 已禁用。"
 
-#: mod/admin.php:1904
+#: mod/admin.php:1979
 #, php-format
 msgid "Addon %s enabled."
 msgstr "插件 %s 已启用。"
 
-#: mod/admin.php:1914 mod/admin.php:2163
+#: mod/admin.php:1989 mod/admin.php:2238
 msgid "Disable"
 msgstr "停用"
 
-#: mod/admin.php:1917 mod/admin.php:2166
+#: mod/admin.php:1992 mod/admin.php:2241
 msgid "Enable"
 msgstr "使能用"
 
-#: mod/admin.php:1939 mod/admin.php:2209
+#: mod/admin.php:2014 mod/admin.php:2284
 msgid "Toggle"
 msgstr "肘节"
 
-#: mod/admin.php:1947 mod/admin.php:2218
+#: mod/admin.php:2022 mod/admin.php:2293
 msgid "Author: "
 msgstr "作者："
 
-#: mod/admin.php:1948 mod/admin.php:2219
+#: mod/admin.php:2023 mod/admin.php:2294
 msgid "Maintainer: "
 msgstr "维护者："
 
-#: mod/admin.php:2000
+#: mod/admin.php:2075
 msgid "Reload active addons"
 msgstr "重新加载可用插件"
 
-#: mod/admin.php:2005
+#: mod/admin.php:2080
 #, php-format
 msgid ""
 "There are currently no addons available on your node. You can find the "
@@ -5057,739 +5945,101 @@ msgid ""
 " the open addon registry at %2$s"
 msgstr "目前您的节点上没有可用插件。您可以在 %1$s 找到官方插件库，或者到开放的插件登记处 %2$s 也能找到其他有趣的插件"
 
-#: mod/admin.php:2125
+#: mod/admin.php:2200
 msgid "No themes found."
 msgstr "找不到主题。"
 
-#: mod/admin.php:2200
+#: mod/admin.php:2275
 msgid "Screenshot"
 msgstr "截图"
 
-#: mod/admin.php:2254
+#: mod/admin.php:2329
 msgid "Reload active themes"
 msgstr "重载活动的主题"
 
-#: mod/admin.php:2259
+#: mod/admin.php:2334
 #, php-format
 msgid "No themes found on the system. They should be placed in %1$s"
 msgstr "未在系统中发现主题。它们应该被放置在 %1$s"
 
-#: mod/admin.php:2260
+#: mod/admin.php:2335
 msgid "[Experimental]"
 msgstr "［试验］"
 
-#: mod/admin.php:2261
+#: mod/admin.php:2336
 msgid "[Unsupported]"
 msgstr "［没支持］"
 
-#: mod/admin.php:2285
+#: mod/admin.php:2360
 msgid "Log settings updated."
 msgstr "日志设置更新了。"
 
-#: mod/admin.php:2317
+#: mod/admin.php:2393
 msgid "PHP log currently enabled."
 msgstr "PHP 日志已启用。"
 
-#: mod/admin.php:2319
+#: mod/admin.php:2395
 msgid "PHP log currently disabled."
 msgstr "PHP 日志已禁用。"
 
-#: mod/admin.php:2328
+#: mod/admin.php:2404
 msgid "Clear"
 msgstr "清理出"
 
-#: mod/admin.php:2332
+#: mod/admin.php:2408
 msgid "Enable Debugging"
 msgstr "启用调试"
 
-#: mod/admin.php:2333
+#: mod/admin.php:2409
 msgid "Log file"
 msgstr "日志文件"
 
-#: mod/admin.php:2333
+#: mod/admin.php:2409
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "必要被网页服务器可写的。相对Friendica主文件夹。"
 
-#: mod/admin.php:2334
+#: mod/admin.php:2410
 msgid "Log level"
 msgstr "日志级别"
 
-#: mod/admin.php:2336
+#: mod/admin.php:2412
 msgid "PHP logging"
 msgstr "PHP 日志"
 
-#: mod/admin.php:2337
+#: mod/admin.php:2413
 msgid ""
-"To enable logging of PHP errors and warnings you can add the following to "
-"the .htconfig.php file of your installation. The filename set in the "
-"'error_log' line is relative to the friendica top-level directory and must "
-"be writeable by the web server. The option '1' for 'log_errors' and "
+"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 "
+"the 'error_log' line is relative to the friendica top-level directory and "
+"must be writeable by the web server. The option '1' for 'log_errors' and "
 "'display_errors' is to enable these options, set to '0' to disable them."
 msgstr ""
 
-#: mod/admin.php:2368
+#: mod/admin.php:2444
 #, 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 "打开  <strong>%1$s</strong> 日志文件出错。\\r\\n <br/> 请检查 %1$s 文件是否存在并且可读。"
 
-#: mod/admin.php:2372
+#: mod/admin.php:2448
 #, 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 "无法打开 <strong>%1$s</strong> 日志文件。\\r\\n <br/> 请检查 %1$s 文件是否可读。"
 
-#: mod/admin.php:2463 mod/admin.php:2464 mod/settings.php:767
-msgid "Off"
-msgstr "关"
-
-#: mod/admin.php:2463 mod/admin.php:2464 mod/settings.php:767
-msgid "On"
-msgstr "开"
-
-#: mod/admin.php:2464
+#: mod/admin.php:2540
 #, php-format
 msgid "Lock feature %s"
 msgstr "锁定特性 %s"
 
-#: mod/admin.php:2472
+#: mod/admin.php:2548
 msgid "Manage Additional Features"
 msgstr "管理附加特性"
 
-#: mod/community.php:51
-msgid "Community option not available."
-msgstr "社区选项不可用。"
-
-#: mod/community.php:68
-msgid "Not available."
-msgstr "不可用的"
-
-#: mod/community.php:81
-msgid "Local Community"
-msgstr "本地社区"
-
-#: mod/community.php:84
-msgid "Posts from local users on this server"
-msgstr ""
-
-#: mod/community.php:92
-msgid "Global Community"
-msgstr "全球社区"
-
-#: mod/community.php:95
-msgid "Posts from users of the whole federated network"
-msgstr ""
-
-#: mod/community.php:141 mod/search.php:228
-msgid "No results."
-msgstr "没有结果。"
-
-#: mod/community.php:185
-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/dfrn_confirm.php:74 mod/profiles.php:39 mod/profiles.php:149
-#: mod/profiles.php:196 mod/profiles.php:525
-msgid "Profile not found."
-msgstr "找不到简介。"
-
-#: mod/dfrn_confirm.php:130
-msgid ""
-"This may occasionally happen if contact was requested by both persons and it"
-" has already been approved."
-msgstr "这会偶尔地发生熟人双方都要求和已经批准的时候。"
-
-#: mod/dfrn_confirm.php:240
-msgid "Response from remote site was not understood."
-msgstr "遥网站的回答明白不了。"
-
-#: mod/dfrn_confirm.php:247 mod/dfrn_confirm.php:252
-msgid "Unexpected response from remote site: "
-msgstr "居然回答从遥网站："
-
-#: mod/dfrn_confirm.php:261
-msgid "Confirmation completed successfully."
-msgstr "确认成功完成。"
-
-#: mod/dfrn_confirm.php:273
-msgid "Temporary failure. Please wait and try again."
-msgstr "临时失败。请等一会，再试。"
-
-#: mod/dfrn_confirm.php:276
-msgid "Introduction failed or was revoked."
-msgstr "介绍失败或被吊销。"
-
-#: mod/dfrn_confirm.php:281
-msgid "Remote site reported: "
-msgstr "远程站点报告："
-
-#: mod/dfrn_confirm.php:392
-msgid "Unable to set contact photo."
-msgstr "无法设置联系人照片。"
-
-#: mod/dfrn_confirm.php:450
-#, php-format
-msgid "No user record found for '%s' "
-msgstr "找不到「%s」的用户记录"
-
-#: mod/dfrn_confirm.php:460
-msgid "Our site encryption key is apparently messed up."
-msgstr "看起来我们的加密钥匙失灵了。"
-
-#: mod/dfrn_confirm.php:471
-msgid "Empty site URL was provided or URL could not be decrypted by us."
-msgstr "空的URL供应，或URL解不了码。"
-
-#: mod/dfrn_confirm.php:487
-msgid "Contact record was not found for you on our site."
-msgstr "无法在本站点为您找到联系人记录。"
-
-#: mod/dfrn_confirm.php:501
-#, php-format
-msgid "Site public key not available in contact record for URL %s."
-msgstr "没有网站公开钥匙在熟人记录在URL%s。"
-
-#: mod/dfrn_confirm.php:517
-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:528
-msgid "Unable to set your contact credentials on our system."
-msgstr "不能创作您的熟人证件在我们的系统。"
-
-#: mod/dfrn_confirm.php:583
-msgid "Unable to update your contact profile details on our system"
-msgstr "不能更新您的熟人简介消息在我们的系统"
-
-#: mod/dfrn_confirm.php:613 mod/dfrn_request.php:564
-#: src/Model/Contact.php:1578
-msgid "[Name Withheld]"
-msgstr "[名字拒给]"
-
-#: mod/dfrn_request.php:94
-msgid "This introduction has already been accepted."
-msgstr "这个介绍已经接受了。"
-
-#: mod/dfrn_request.php:112 mod/dfrn_request.php:355
-msgid "Profile location is not valid or does not contain profile information."
-msgstr "简介位置失效或不包含简介信息。"
-
-#: mod/dfrn_request.php:116 mod/dfrn_request.php:359
-msgid "Warning: profile location has no identifiable owner name."
-msgstr "警告：简介位置没有可设别的主名。"
-
-#: mod/dfrn_request.php:119 mod/dfrn_request.php:362
-msgid "Warning: profile location has no profile photo."
-msgstr "警告：简介位置没有简介图。"
-
-#: mod/dfrn_request.php:123 mod/dfrn_request.php:366
-#, 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] "%d需要的参数没找到在输入的位置。"
-
-#: mod/dfrn_request.php:162
-msgid "Introduction complete."
-msgstr "介绍完成的。"
-
-#: mod/dfrn_request.php:199
-msgid "Unrecoverable protocol error."
-msgstr "不能恢复的协议错误"
-
-#: mod/dfrn_request.php:226
-msgid "Profile unavailable."
-msgstr "简介无效"
-
-#: mod/dfrn_request.php:248
-#, php-format
-msgid "%s has received too many connection requests today."
-msgstr "%s今天已经受到了太多联络要求"
-
-#: mod/dfrn_request.php:249
-msgid "Spam protection measures have been invoked."
-msgstr "垃圾保护措施被用了。"
-
-#: mod/dfrn_request.php:250
-msgid "Friends are advised to please try again in 24 hours."
-msgstr "朋友们被建议请24小时后再试。"
-
-#: mod/dfrn_request.php:276
-msgid "Invalid locator"
-msgstr "无效找到物"
-
-#: mod/dfrn_request.php:312
-msgid "You have already introduced yourself here."
-msgstr "您已经自我介绍这儿。"
-
-#: mod/dfrn_request.php:315
-#, php-format
-msgid "Apparently you are already friends with %s."
-msgstr "看上去您已经是%s的朋友。"
-
-#: mod/dfrn_request.php:335
-msgid "Invalid profile URL."
-msgstr "无效的简介URL。"
-
-#: mod/dfrn_request.php:341 src/Model/Contact.php:1276
-msgid "Disallowed profile URL."
-msgstr "不允许的简介地址."
-
-#: mod/dfrn_request.php:435
-msgid "Your introduction has been sent."
-msgstr "您的介绍发布了。"
-
-#: 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:489
-msgid "Please login to confirm introduction."
-msgstr "请登录以确认介绍。"
-
-#: mod/dfrn_request.php:497
-msgid ""
-"Incorrect identity currently logged in. Please login to "
-"<strong>this</strong> profile."
-msgstr "当前登录的身份不正确。请登录到<strong>这个</strong>用户。"
-
-#: mod/dfrn_request.php:511 mod/dfrn_request.php:528
-msgid "Confirm"
-msgstr "确认"
-
-#: mod/dfrn_request.php:523
-msgid "Hide this contact"
-msgstr "隐藏这个联系人"
-
-#: mod/dfrn_request.php:526
-#, php-format
-msgid "Welcome home %s."
-msgstr "欢迎%s。"
-
-#: mod/dfrn_request.php:527
-#, php-format
-msgid "Please confirm your introduction/connection request to %s."
-msgstr "请确认您的介绍／联络要求给%s。"
-
-#: mod/dfrn_request.php:637
-msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"communications networks:"
-msgstr "请从以下支持的通信网络之一输入你的 “身份地址”："
-
-#: 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 "如果您还不是自由社交网络用户中的一员，<a href=\"%s\"> 请通过此链接查找公共 Friendica 站点并在今天加入我们吧 </a>。"
-
-#: mod/dfrn_request.php:645
-msgid "Friend/Connection Request"
-msgstr "朋友/连接请求"
-
-#: mod/dfrn_request.php:646
-msgid ""
-"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
-"testuser@gnusocial.de"
-msgstr "例如：jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de"
-
-#: mod/dfrn_request.php:651 src/Content/ContactSelector.php:79
-msgid "Friendica"
-msgstr "Friendica"
-
-#: mod/dfrn_request.php:652
-msgid "GNU Social (Pleroma, Mastodon)"
-msgstr "GNU Social (Pleroma, Mastodon)"
-
-#: mod/dfrn_request.php:653
-msgid "Diaspora (Socialhome, Hubzilla)"
-msgstr "Diaspora (Socialhome, Hubzilla)"
-
-#: mod/dfrn_request.php:654
-#, php-format
-msgid ""
-" - please do not use this form.  Instead, enter %s into your Diaspora search"
-" bar."
-msgstr " - 请别用这个表格。而是在你的 Diaspora 搜索栏输入 %s."
-
-#: mod/events.php:105 mod/events.php:107
-msgid "Event can not end before it has started."
-msgstr "事件不能在开始前结束。"
-
-#: mod/events.php:114 mod/events.php:116
-msgid "Event title and start time are required."
-msgstr "项目标题和开始时间是必须的。"
-
-#: mod/events.php:393
-msgid "Create New Event"
-msgstr "创建新的事件"
-
-#: mod/events.php:507
-msgid "Event details"
-msgstr "事件细节"
-
-#: mod/events.php:508
-msgid "Starting date and Title are required."
-msgstr "需要开始日期和标题。"
-
-#: mod/events.php:509 mod/events.php:510
-msgid "Event Starts:"
-msgstr "事件开始:"
-
-#: mod/events.php:509 mod/events.php:521 mod/profiles.php:607
-msgid "Required"
-msgstr "必须的"
-
-#: mod/events.php:511 mod/events.php:527
-msgid "Finish date/time is not known or not relevant"
-msgstr "结束日期/时间未知或无关"
-
-#: mod/events.php:513 mod/events.php:514
-msgid "Event Finishes:"
-msgstr "事件结束:"
-
-#: mod/events.php:515 mod/events.php:528
-msgid "Adjust for viewer timezone"
-msgstr "调整为浏览者的时区"
-
-#: mod/events.php:517
-msgid "Description:"
-msgstr "描述："
-
-#: mod/events.php:521 mod/events.php:523
-msgid "Title:"
-msgstr "标题："
-
-#: mod/events.php:524 mod/events.php:525
-msgid "Share this event"
-msgstr "分享这个事件"
-
-#: mod/events.php:532 src/Model/Profile.php:862
-msgid "Basic"
-msgstr "基本"
-
-#: mod/events.php:534 mod/photos.php:1086 mod/photos.php:1435
-#: src/Core/ACL.php:318
-msgid "Permissions"
-msgstr "权限"
-
-#: mod/events.php:553
-msgid "Failed to remove event"
-msgstr "删除事件失败"
-
-#: mod/events.php:555
-msgid "Event removed"
-msgstr "事件已删除"
-
-#: mod/group.php:36
-msgid "Group created."
-msgstr "群组已创建。"
-
-#: mod/group.php:42
-msgid "Could not create group."
-msgstr "无法创建群组。"
-
-#: mod/group.php:56 mod/group.php:157
-msgid "Group not found."
-msgstr "组找不到。"
-
-#: mod/group.php:70
-msgid "Group name changed."
-msgstr "组名变化了。"
-
-#: mod/group.php:97
-msgid "Save Group"
-msgstr "保存组"
-
-#: mod/group.php:102
-msgid "Create a group of contacts/friends."
-msgstr "创建一组联系人／朋友。"
-
-#: mod/group.php:103 mod/group.php:199 src/Model/Group.php:421
-msgid "Group Name: "
-msgstr "组名："
-
-#: mod/group.php:127
-msgid "Group removed."
-msgstr "组删除了。"
-
-#: mod/group.php:129
-msgid "Unable to remove group."
-msgstr "不能删除组。"
-
-#: mod/group.php:192
-msgid "Delete Group"
-msgstr "删除群组"
-
-#: mod/group.php:198
-msgid "Group Editor"
-msgstr "组编辑器"
-
-#: mod/group.php:203
-msgid "Edit Group Name"
-msgstr "编辑群组名称"
-
-#: mod/group.php:213
-msgid "Members"
-msgstr "成员"
-
-#: mod/group.php:216 mod/network.php:639
-msgid "Group is empty"
-msgstr "组没有成员"
-
-#: mod/group.php:229
-msgid "Remove contact from group"
-msgstr ""
-
-#: mod/group.php:253
-msgid "Add contact to group"
-msgstr ""
-
-#: mod/item.php:114
-msgid "Unable to locate original post."
-msgstr "找不到当初的新闻"
-
-#: mod/item.php:274
-msgid "Empty post discarded."
-msgstr "空帖子被丢弃了。"
-
-#: mod/item.php:804
-#, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendica social "
-"network."
-msgstr "这个新闻是由%s，Friendica社会化网络成员之一，发给你。"
-
-#: mod/item.php:806
-#, php-format
-msgid "You may visit them online at %s"
-msgstr "你可以网上拜访他在%s"
-
-#: mod/item.php:807
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
-msgstr "你不想受到这些新闻的话，请回答这个新闻给发者联系。"
-
-#: mod/item.php:811
-#, php-format
-msgid "%s posted an update."
-msgstr "%s贴上一个新闻。"
-
-#: mod/network.php:194 mod/search.php:37
-msgid "Remove term"
-msgstr "删除关键字"
-
-#: mod/network.php:201 mod/search.php:46 src/Content/Feature.php:100
-msgid "Saved Searches"
-msgstr "保存的搜索"
-
-#: mod/network.php:202 src/Model/Group.php:413
-msgid "add"
-msgstr "添加"
-
-#: mod/network.php:547
-#, php-format
-msgid ""
-"Warning: This group contains %s member from a network that doesn't allow non"
-" public messages."
-msgid_plural ""
-"Warning: This group contains %s members from a network that doesn't allow "
-"non public messages."
-msgstr[0] "警告：这个组包含 %s 来自不允许非公开消息的网络的成员。"
-
-#: mod/network.php:550
-msgid "Messages in this group won't be send to these receivers."
-msgstr "这个组中的消息不会被发送至这些接收者。"
-
-#: mod/network.php:618
-msgid "No such group"
-msgstr "没有这个组"
-
-#: mod/network.php:643
-#, php-format
-msgid "Group: %s"
-msgstr "组：%s"
-
-#: mod/network.php:669
-msgid "Private messages to this person are at risk of public disclosure."
-msgstr "私人通信给这个人回被公开。"
-
-#: mod/network.php:672
-msgid "Invalid contact."
-msgstr "无效的联系人。"
-
-#: mod/network.php:943
-msgid "Commented Order"
-msgstr "评论时间顺序"
-
-#: mod/network.php:946
-msgid "Sort by Comment Date"
-msgstr "按评论日期顺序排列"
-
-#: mod/network.php:951
-msgid "Posted Order"
-msgstr "发布时间顺序"
-
-#: mod/network.php:954
-msgid "Sort by Post Date"
-msgstr "按发布日期顺序排列"
-
-#: mod/network.php:962 mod/profiles.php:594
-#: src/Core/NotificationsManager.php:185
-msgid "Personal"
-msgstr "私人"
-
-#: mod/network.php:965
-msgid "Posts that mention or involve you"
-msgstr "提及你或你参与的文章"
-
-#: mod/network.php:973
-msgid "New"
-msgstr "新"
-
-#: mod/network.php:976
-msgid "Activity Stream - by date"
-msgstr "活动流－按日期"
-
-#: mod/network.php:984
-msgid "Shared Links"
-msgstr "共享的链接"
-
-#: mod/network.php:987
-msgid "Interesting Links"
-msgstr "有意思的超链接"
-
-#: mod/network.php:995
-msgid "Starred"
-msgstr "被星"
-
-#: mod/network.php:998
-msgid "Favourite Posts"
-msgstr "最喜欢的文章"
-
-#: mod/notes.php:52 src/Model/Profile.php:944
-msgid "Personal Notes"
-msgstr "私人便条"
-
-#: mod/notifications.php:37
-msgid "Invalid request identifier."
-msgstr "无效要求身份号。"
-
-#: mod/notifications.php:46 mod/notifications.php:182
-#: mod/notifications.php:229
-msgid "Discard"
-msgstr "丢弃"
-
-#: mod/notifications.php:98 src/Content/Nav.php:191
-msgid "Notifications"
-msgstr "通知"
-
-#: mod/notifications.php:107
-msgid "Network Notifications"
-msgstr "网络通知"
-
-#: mod/notifications.php:119
-msgid "Personal Notifications"
-msgstr "私人通知"
-
-#: mod/notifications.php:125
-msgid "Home Notifications"
-msgstr "主页通知"
-
-#: mod/notifications.php:155
-msgid "Show Ignored Requests"
-msgstr "显示被忽视的请求"
-
-#: mod/notifications.php:155
-msgid "Hide Ignored Requests"
-msgstr "隐藏被忽视的请求"
-
-#: mod/notifications.php:167 mod/notifications.php:236
-msgid "Notification type: "
-msgstr "通知种类："
-
-#: mod/notifications.php:170
-#, php-format
-msgid "suggested by %s"
-msgstr "由%s建议的"
-
-#: mod/notifications.php:197
-msgid "Claims to be known to you: "
-msgstr "声称被您认识："
-
-#: mod/notifications.php:198
-msgid "yes"
-msgstr "是"
-
-#: mod/notifications.php:198
-msgid "no"
-msgstr "否"
-
-#: mod/notifications.php:199 mod/notifications.php:204
-msgid "Shall your connection be bidirectional or not?"
-msgstr "是否启用双向连接？"
-
-#: mod/notifications.php:200 mod/notifications.php:205
-#, 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:201
-#, 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:206
-#, 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:217
-msgid "Friend"
-msgstr "朋友"
-
-#: mod/notifications.php:218
-msgid "Sharer"
-msgstr "分享者"
-
-#: mod/notifications.php:218
-msgid "Subscriber"
-msgstr "订阅者"
-
-#: mod/notifications.php:273
-msgid "No introductions."
-msgstr "没有介绍。"
-
-#: mod/notifications.php:314
-msgid "Show unread"
-msgstr "显示未读"
-
-#: mod/notifications.php:314
-msgid "Show all"
-msgstr "显示全部"
-
-#: mod/notifications.php:320
-#, php-format
-msgid "No more %s notifications."
-msgstr "没有更多的 %s 通知。"
-
 #: mod/openid.php:29
 msgid "OpenID protocol error. No ID returned."
 msgstr "OpenID协议错误。没ID还。 "
@@ -5799,331 +6049,1267 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr "找不到账户和OpenID注册不允许。"
 
-#: mod/openid.php:116 src/Module/Login.php:86 src/Module/Login.php:135
+#: mod/openid.php:116 src/Module/Login.php:85 src/Module/Login.php:134
 msgid "Login failed."
 msgstr "登录失败。"
 
-#: mod/photos.php:108 src/Model/Profile.php:905
-msgid "Photo Albums"
-msgstr "相册"
+#: mod/dfrn_request.php:94
+msgid "This introduction has already been accepted."
+msgstr "这个介绍已经接受了。"
 
-#: mod/photos.php:109 mod/photos.php:1708
-msgid "Recent Photos"
-msgstr "最近的照片"
+#: mod/dfrn_request.php:112 mod/dfrn_request.php:353
+msgid "Profile location is not valid or does not contain profile information."
+msgstr "简介位置失效或不包含简介信息。"
 
-#: mod/photos.php:112 mod/photos.php:1198 mod/photos.php:1710
-msgid "Upload New Photos"
-msgstr "上传新照片"
+#: mod/dfrn_request.php:116 mod/dfrn_request.php:357
+msgid "Warning: profile location has no identifiable owner name."
+msgstr "警告：简介位置没有可设别的主名。"
 
-#: mod/photos.php:126 mod/settings.php:51
-msgid "everybody"
-msgstr "每人"
+#: mod/dfrn_request.php:119 mod/dfrn_request.php:360
+msgid "Warning: profile location has no profile photo."
+msgstr "警告：简介位置没有简介图。"
 
-#: mod/photos.php:184
-msgid "Contact information unavailable"
-msgstr "联系人信息不可用"
-
-#: mod/photos.php:204
-msgid "Album not found."
-msgstr "取回不了相册."
-
-#: mod/photos.php:234 mod/photos.php:245 mod/photos.php:1149
-msgid "Delete Album"
-msgstr "删除相册"
-
-#: mod/photos.php:243
-msgid "Do you really want to delete this photo album and all its photos?"
-msgstr "您真的想删除这个相册和所有里面的照相吗？"
-
-#: mod/photos.php:303 mod/photos.php:314 mod/photos.php:1440
-msgid "Delete Photo"
-msgstr "删除照片"
-
-#: mod/photos.php:312
-msgid "Do you really want to delete this photo?"
-msgstr "您真的想删除这个照相吗？"
-
-#: mod/photos.php:655
-msgid "a photo"
-msgstr "一张照片"
-
-#: mod/photos.php:655
+#: mod/dfrn_request.php:123 mod/dfrn_request.php:364
 #, php-format
-msgid "%1$s was tagged in %2$s by %3$s"
-msgstr "%1$s被%3$s标签在%2$s"
+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] "%d需要的参数没找到在输入的位置。"
 
-#: mod/photos.php:757
-msgid "Image upload didn't complete, please try again"
-msgstr "图片上传未完成，请重试"
+#: mod/dfrn_request.php:161
+msgid "Introduction complete."
+msgstr "介绍完成的。"
 
-#: mod/photos.php:760
-msgid "Image file is missing"
-msgstr "缺少图片文件"
+#: mod/dfrn_request.php:197
+msgid "Unrecoverable protocol error."
+msgstr "不能恢复的协议错误"
 
-#: mod/photos.php:765
+#: mod/dfrn_request.php:224
+msgid "Profile unavailable."
+msgstr "简介无效"
+
+#: mod/dfrn_request.php:246
+#, php-format
+msgid "%s has received too many connection requests today."
+msgstr "%s今天已经受到了太多联络要求"
+
+#: mod/dfrn_request.php:247
+msgid "Spam protection measures have been invoked."
+msgstr "垃圾保护措施被用了。"
+
+#: mod/dfrn_request.php:248
+msgid "Friends are advised to please try again in 24 hours."
+msgstr "朋友们被建议请24小时后再试。"
+
+#: mod/dfrn_request.php:274
+msgid "Invalid locator"
+msgstr "无效找到物"
+
+#: mod/dfrn_request.php:310
+msgid "You have already introduced yourself here."
+msgstr "您已经自我介绍这儿。"
+
+#: mod/dfrn_request.php:313
+#, php-format
+msgid "Apparently you are already friends with %s."
+msgstr "看上去您已经是%s的朋友。"
+
+#: mod/dfrn_request.php:333
+msgid "Invalid profile URL."
+msgstr "无效的简介URL。"
+
+#: mod/dfrn_request.php:339 src/Model/Contact.php:1577
+msgid "Disallowed profile URL."
+msgstr "不允许的简介地址."
+
+#: mod/dfrn_request.php:412 mod/contacts.php:235
+msgid "Failed to update contact record."
+msgstr "更新联系人记录失败。"
+
+#: mod/dfrn_request.php:432
+msgid "Your introduction has been sent."
+msgstr "您的介绍发布了。"
+
+#: mod/dfrn_request.php:470
 msgid ""
-"Server can't accept new file upload at this time, please contact your "
-"administrator"
-msgstr "服务器目前无法接受新的上传文件，请联系您的管理员"
+"Remote subscription can't be done for your network. Please subscribe "
+"directly on your system."
+msgstr "无法为您的网络完成远程订阅。请直接在您的系统上订阅。"
 
-#: mod/photos.php:791
-msgid "Image file is empty."
-msgstr "图片文件空的。"
+#: mod/dfrn_request.php:486
+msgid "Please login to confirm introduction."
+msgstr "请登录以确认介绍。"
 
-#: mod/photos.php:928
-msgid "No photos selected"
-msgstr "没有照片挑选了"
-
-#: mod/photos.php:1024 mod/videos.php:309
-msgid "Access to this item is restricted."
-msgstr "这个项目使用权限的。"
-
-#: mod/photos.php:1078
-msgid "Upload Photos"
-msgstr "上传照片"
-
-#: mod/photos.php:1082 mod/photos.php:1144
-msgid "New album name: "
-msgstr "新册名："
-
-#: mod/photos.php:1083
-msgid "or existing album name: "
-msgstr "或现有册名"
-
-#: mod/photos.php:1084
-msgid "Do not show a status post for this upload"
-msgstr "别显示现状报到关于这个上传"
-
-#: mod/photos.php:1094 mod/photos.php:1443 mod/settings.php:1218
-msgid "Show to Groups"
-msgstr "给组表示"
-
-#: mod/photos.php:1095 mod/photos.php:1444 mod/settings.php:1219
-msgid "Show to Contacts"
-msgstr "展示给联系人"
-
-#: mod/photos.php:1155
-msgid "Edit Album"
-msgstr "编照片册"
-
-#: mod/photos.php:1160
-msgid "Show Newest First"
-msgstr "先表示最新的"
-
-#: mod/photos.php:1162
-msgid "Show Oldest First"
-msgstr "先表示最老的"
-
-#: mod/photos.php:1183 mod/photos.php:1693
-msgid "View Photo"
-msgstr "看照片"
-
-#: mod/photos.php:1224
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "无权利。用这个项目可能受限制。"
-
-#: mod/photos.php:1226
-msgid "Photo not available"
-msgstr "不可获得的照片"
-
-#: mod/photos.php:1294
-msgid "View photo"
-msgstr "看照片"
-
-#: mod/photos.php:1294
-msgid "Edit photo"
-msgstr "编辑照片"
-
-#: mod/photos.php:1295
-msgid "Use as profile photo"
-msgstr "用为资料图"
-
-#: mod/photos.php:1301 src/Object/Post.php:149
-msgid "Private Message"
-msgstr "私人的新闻"
-
-#: mod/photos.php:1321
-msgid "View Full Size"
-msgstr "看全尺寸"
-
-#: mod/photos.php:1408
-msgid "Tags: "
-msgstr "标签："
-
-#: mod/photos.php:1411
-msgid "[Remove any tag]"
-msgstr "[删除任何标签]"
-
-#: mod/photos.php:1426
-msgid "New album name"
-msgstr "新册名"
-
-#: mod/photos.php:1427
-msgid "Caption"
-msgstr "字幕"
-
-#: mod/photos.php:1428
-msgid "Add a Tag"
-msgstr "加标签"
-
-#: mod/photos.php:1428
+#: mod/dfrn_request.php:494
 msgid ""
-"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-msgstr "例子：@zhang, @Zhang_San, @li@example.com, #Beijing, #ktv"
+"Incorrect identity currently logged in. Please login to "
+"<strong>this</strong> profile."
+msgstr "当前登录的身份不正确。请登录到<strong>这个</strong>用户。"
 
-#: mod/photos.php:1429
-msgid "Do not rotate"
-msgstr "不要旋转"
+#: mod/dfrn_request.php:508 mod/dfrn_request.php:525
+msgid "Confirm"
+msgstr "确认"
 
-#: mod/photos.php:1430
-msgid "Rotate CW (right)"
-msgstr "顺时针地转动（左）"
+#: mod/dfrn_request.php:520
+msgid "Hide this contact"
+msgstr "隐藏这个联系人"
 
-#: mod/photos.php:1431
-msgid "Rotate CCW (left)"
-msgstr "反顺时针地转动（右）"
+#: mod/dfrn_request.php:523
+#, php-format
+msgid "Welcome home %s."
+msgstr "欢迎%s。"
 
-#: mod/photos.php:1465 src/Object/Post.php:304
-msgid "I like this (toggle)"
-msgstr "我喜欢这(交替)"
+#: mod/dfrn_request.php:524
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
+msgstr "请确认您的介绍／联络要求给%s。"
 
-#: mod/photos.php:1466 src/Object/Post.php:305
-msgid "I don't like this (toggle)"
-msgstr "我不喜欢这(交替)"
+#: mod/dfrn_request.php:634
+msgid ""
+"Please enter your 'Identity Address' from one of the following supported "
+"communications networks:"
+msgstr "请从以下支持的通信网络之一输入你的 “身份地址”："
 
-#: mod/photos.php:1484 mod/photos.php:1523 mod/photos.php:1596
-#: src/Object/Post.php:407 src/Object/Post.php:803
-msgid "Comment"
-msgstr "评论"
+#: mod/dfrn_request.php:637
+#, 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 "如果您还不是自由社交网络用户中的一员，<a href=\"%s\"> 请通过此链接查找公共 Friendica 站点并在今天加入我们吧 </a>。"
 
-#: mod/photos.php:1628
-msgid "Map"
-msgstr "地图"
+#: mod/dfrn_request.php:642
+msgid "Friend/Connection Request"
+msgstr "朋友/连接请求"
 
-#: mod/photos.php:1699 mod/videos.php:387
-msgid "View Album"
-msgstr "看照片册"
+#: mod/dfrn_request.php:643
+msgid ""
+"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
+"testuser@gnusocial.de"
+msgstr "例如：jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de"
 
-#: mod/profile.php:37 src/Model/Profile.php:118
+#: mod/dfrn_request.php:644 mod/follow.php:149
+msgid "Please answer the following:"
+msgstr "请回答下述的："
+
+#: mod/dfrn_request.php:645 mod/follow.php:150
+#, php-format
+msgid "Does %s know you?"
+msgstr "%s是否认识你？"
+
+#: mod/dfrn_request.php:646 mod/follow.php:151
+msgid "Add a personal note:"
+msgstr "添加一个个人便条："
+
+#: mod/dfrn_request.php:648 src/Content/ContactSelector.php:78
+msgid "Friendica"
+msgstr "Friendica"
+
+#: mod/dfrn_request.php:649
+msgid "GNU Social (Pleroma, Mastodon)"
+msgstr "GNU Social (Pleroma, Mastodon)"
+
+#: mod/dfrn_request.php:650
+msgid "Diaspora (Socialhome, Hubzilla)"
+msgstr "Diaspora (Socialhome, Hubzilla)"
+
+#: mod/dfrn_request.php:651
+#, php-format
+msgid ""
+" - please do not use this form.  Instead, enter %s into your Diaspora search"
+" bar."
+msgstr " - 请别用这个表格。而是在你的 Diaspora 搜索栏输入 %s."
+
+#: mod/api.php:85 mod/api.php:107
+msgid "Authorize application connection"
+msgstr "授权应用连接"
+
+#: mod/api.php:86
+msgid "Return to your app and insert this Securty Code:"
+msgstr "回归您的应用和输入这个安全密码："
+
+#: mod/api.php:95
+msgid "Please login to continue."
+msgstr "请登录以继续。"
+
+#: mod/api.php:109
+msgid ""
+"Do you want to authorize this application to access your posts and contacts,"
+" and/or create new posts for you?"
+msgstr "你要授权这个应用访问你的文章和联系人，及/或为你创建新的文章吗？"
+
+#: mod/profile_photo.php:55
+msgid "Image uploaded but image cropping failed."
+msgstr "照片上传去了，但修剪失灵。"
+
+#: mod/profile_photo.php:87 mod/profile_photo.php:96 mod/profile_photo.php:105
+#: mod/profile_photo.php:313
+#, php-format
+msgid "Image size reduction [%s] failed."
+msgstr "照片减少[%s]失灵。"
+
+#: mod/profile_photo.php:124
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "万一新照片一会出现，换档重新加载或者成为空浏览器高速缓存。"
+
+#: mod/profile_photo.php:132
+msgid "Unable to process image"
+msgstr "不能处理照片"
+
+#: mod/profile_photo.php:244
+msgid "Upload File:"
+msgstr "上传文件："
+
+#: mod/profile_photo.php:245
+msgid "Select a profile:"
+msgstr "选择一个简介"
+
+#: mod/profile_photo.php:247 mod/fbrowser.php:106 mod/fbrowser.php:137
+msgid "Upload"
+msgstr "上传"
+
+#: mod/profile_photo.php:250
+msgid "or"
+msgstr "或者"
+
+#: mod/profile_photo.php:251
+msgid "skip this step"
+msgstr "略过这步"
+
+#: mod/profile_photo.php:251
+msgid "select a photo from your photo albums"
+msgstr "从您的照片册选择一片。"
+
+#: mod/profile_photo.php:264
+msgid "Crop Image"
+msgstr "修剪照片"
+
+#: mod/profile_photo.php:265
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "请调图片剪裁为最好看。"
+
+#: mod/profile_photo.php:267
+msgid "Done Editing"
+msgstr "编辑完成"
+
+#: mod/profile_photo.php:303
+msgid "Image uploaded successfully."
+msgstr "照片成功地上传了。"
+
+#: mod/wall_attach.php:107
+msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
+msgstr "不好意思，可能你上传的是PHP设置允许的大"
+
+#: mod/wall_attach.php:107
+msgid "Or - did you try to upload an empty file?"
+msgstr "或者，你是不是上传空的文件？"
+
+#: mod/wall_attach.php:118
+#, php-format
+msgid "File exceeds size limit of %s"
+msgstr "文件超过了 %s 的大小限制"
+
+#: mod/wall_attach.php:142 mod/wall_attach.php:158
+msgid "File upload failed."
+msgstr "文件上传失败。"
+
+#: mod/item.php:117
+msgid "Unable to locate original post."
+msgstr "找不到当初的新闻"
+
+#: mod/item.php:285
+msgid "Empty post discarded."
+msgstr "空帖子被丢弃了。"
+
+#: mod/item.php:809
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendica social "
+"network."
+msgstr "这个新闻是由%s，Friendica社会化网络成员之一，发给你。"
+
+#: mod/item.php:811
+#, php-format
+msgid "You may visit them online at %s"
+msgstr "你可以网上拜访他在%s"
+
+#: mod/item.php:812
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
+msgstr "你不想受到这些新闻的话，请回答这个新闻给发者联系。"
+
+#: mod/item.php:816
+#, php-format
+msgid "%s posted an update."
+msgstr "%s贴上一个新闻。"
+
+#: mod/help.php:49
+msgid "Help:"
+msgstr "帮助："
+
+#: mod/uimport.php:72
+msgid "Move account"
+msgstr "把账户搬出"
+
+#: mod/uimport.php:73
+msgid "You can import an account from another Friendica server."
+msgstr "您会从别的Friendica服务器进口账户"
+
+#: mod/uimport.php:74
+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:75
+msgid ""
+"This feature is experimental. We can't import contacts from the OStatus "
+"network (GNU Social/Statusnet) or from Diaspora"
+msgstr "这个特性是实验性的。我们不能从 OStatus 网络 (GNU Social/Statusnet) 或者 Diaspora 导入联系人"
+
+#: mod/uimport.php:76
+msgid "Account file"
+msgstr "账户文件"
+
+#: mod/uimport.php:76
+msgid ""
+"To export your account, go to \"Settings->Export your personal data\" and "
+"select \"Export account\""
+msgstr "为了导出你的账户，点击「设置→导出你的个人信息」和选择「导出账户」"
+
+#: mod/profperm.php:35 mod/profperm.php:68
+msgid "Invalid profile identifier."
+msgstr "无限的简介标识符。"
+
+#: mod/profperm.php:114
+msgid "Profile Visibility Editor"
+msgstr "简介能见度编辑器。"
+
+#: mod/profperm.php:127
+msgid "Visible To"
+msgstr "能见被"
+
+#: mod/profperm.php:143
+msgid "All Contacts (with secure profile access)"
+msgstr ""
+
+#: mod/cal.php:277 mod/events.php:391
+msgid "View"
+msgstr "查看"
+
+#: mod/cal.php:278 mod/events.php:393
+msgid "Previous"
+msgstr "上"
+
+#: mod/cal.php:282 mod/events.php:399 src/Model/Event.php:421
+msgid "today"
+msgstr "今天"
+
+#: mod/cal.php:283 mod/events.php:400 src/Util/Temporal.php:304
+#: src/Model/Event.php:422
+msgid "month"
+msgstr "月"
+
+#: mod/cal.php:284 mod/events.php:401 src/Util/Temporal.php:305
+#: src/Model/Event.php:423
+msgid "week"
+msgstr "星期"
+
+#: mod/cal.php:285 mod/events.php:402 src/Util/Temporal.php:306
+#: src/Model/Event.php:424
+msgid "day"
+msgstr "日"
+
+#: mod/cal.php:286 mod/events.php:403
+msgid "list"
+msgstr "列表"
+
+#: mod/cal.php:299 src/Core/Console/NewPassword.php:68 src/Model/User.php:221
+msgid "User not found"
+msgstr "找不到用户"
+
+#: mod/cal.php:315
+msgid "This calendar format is not supported"
+msgstr "这个日历格式不被支持"
+
+#: mod/cal.php:317
+msgid "No exportable data found"
+msgstr "找不到可导出的数据"
+
+#: mod/cal.php:334
+msgid "calendar"
+msgstr "日历"
+
+#: mod/regmod.php:70
+msgid "Account approved."
+msgstr "账户已被批准。"
+
+#: mod/regmod.php:95
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "撤销了 %s 的注册"
+
+#: mod/regmod.php:102
+msgid "Please login."
+msgstr "请登录。"
+
+#: mod/editpost.php:26 mod/editpost.php:36
+msgid "Item not found"
+msgstr "项目没找到"
+
+#: mod/editpost.php:43
+msgid "Edit post"
+msgstr "编辑文章"
+
+#: mod/editpost.php:125 src/Core/ACL.php:304
+msgid "CC: email addresses"
+msgstr "抄送: 电子邮件地址"
+
+#: mod/editpost.php:132 src/Core/ACL.php:305
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "比如: li@example.com, wang@example.com"
+
+#: mod/apps.php:19
+msgid "Applications"
+msgstr "应用"
+
+#: mod/apps.php:22
+msgid "No installed applications."
+msgstr "没有安装的应用"
+
+#: mod/feedtest.php:21
+msgid "You must be logged in to use this module"
+msgstr "您必须登录才能使用此模块"
+
+#: mod/feedtest.php:49
+msgid "Source URL"
+msgstr "源链接"
+
+#: mod/fsuggest.php:72
+msgid "Friend suggestion sent."
+msgstr "朋友建议发送了。"
+
+#: mod/fsuggest.php:101
+msgid "Suggest Friends"
+msgstr "推荐的朋友们"
+
+#: mod/fsuggest.php:103
+#, php-format
+msgid "Suggest a friend for %s"
+msgstr "给 %s 推荐朋友"
+
+#: mod/maintenance.php:24
+msgid "System down for maintenance"
+msgstr "系统关闭为了维持"
+
+#: mod/profile.php:38 src/Model/Profile.php:115
 msgid "Requested profile is not available."
 msgstr "要求的简介联系不上的。"
 
-#: mod/profile.php:78 mod/profile.php:81 src/Protocol/OStatus.php:1250
+#: mod/profile.php:79 mod/profile.php:82 src/Protocol/OStatus.php:1275
 #, php-format
 msgid "%s's timeline"
 msgstr "%s 的时间线"
 
-#: mod/profile.php:79 src/Protocol/OStatus.php:1251
+#: mod/profile.php:80 src/Protocol/OStatus.php:1276
 #, php-format
 msgid "%s's posts"
 msgstr "%s的帖子"
 
-#: mod/profile.php:80 src/Protocol/OStatus.php:1252
+#: mod/profile.php:81 src/Protocol/OStatus.php:1277
 #, php-format
 msgid "%s's comments"
 msgstr "%s 的评论"
 
-#: mod/profile.php:195
-msgid "Tips for New Members"
-msgstr "新人建议"
+#: mod/allfriends.php:53
+msgid "No friends to display."
+msgstr "没有朋友展示。"
 
-#: mod/profiles.php:58
+#: mod/contacts.php:162
+#, php-format
+msgid "%d contact edited."
+msgid_plural "%d contacts edited."
+msgstr[0] "%d 个联系人被编辑了。"
+
+#: mod/contacts.php:189 mod/contacts.php:395
+msgid "Could not access contact record."
+msgstr "无法访问联系人记录。"
+
+#: mod/contacts.php:199
+msgid "Could not locate selected profile."
+msgstr "找不到选择的简介。"
+
+#: mod/contacts.php:233
+msgid "Contact updated."
+msgstr "联系人更新了。"
+
+#: mod/contacts.php:416
+msgid "Contact has been blocked"
+msgstr "联系人已被屏蔽"
+
+#: mod/contacts.php:416
+msgid "Contact has been unblocked"
+msgstr "联系人已被解除屏蔽"
+
+#: mod/contacts.php:426
+msgid "Contact has been ignored"
+msgstr "联系人已被忽视"
+
+#: mod/contacts.php:426
+msgid "Contact has been unignored"
+msgstr "联系人已被解除忽视"
+
+#: mod/contacts.php:436
+msgid "Contact has been archived"
+msgstr "联系人已存档"
+
+#: mod/contacts.php:436
+msgid "Contact has been unarchived"
+msgstr "联系人已被解除存档"
+
+#: mod/contacts.php:460
+msgid "Drop contact"
+msgstr ""
+
+#: mod/contacts.php:463 mod/contacts.php:845
+msgid "Do you really want to delete this contact?"
+msgstr "您真的想删除这个联系人吗？"
+
+#: mod/contacts.php:481
+msgid "Contact has been removed."
+msgstr "联系人被删除了。"
+
+#: mod/contacts.php:518
+#, php-format
+msgid "You are mutual friends with %s"
+msgstr "您和 %s 互为朋友"
+
+#: mod/contacts.php:523
+#, php-format
+msgid "You are sharing with %s"
+msgstr "你正在和 %s 分享"
+
+#: mod/contacts.php:528
+#, php-format
+msgid "%s is sharing with you"
+msgstr "%s 正在和你分享"
+
+#: mod/contacts.php:552
+msgid "Private communications are not available for this contact."
+msgstr "私人交流对这个联系人不可用。"
+
+#: mod/contacts.php:554
+msgid "Never"
+msgstr "从未"
+
+#: mod/contacts.php:557
+msgid "(Update was successful)"
+msgstr "(更新成功)"
+
+#: mod/contacts.php:557
+msgid "(Update was not successful)"
+msgstr "(更新不成功)"
+
+#: mod/contacts.php:559 mod/contacts.php:1086
+msgid "Suggest friends"
+msgstr "建议朋友们"
+
+#: mod/contacts.php:563
+#, php-format
+msgid "Network type: %s"
+msgstr "网络种类: %s"
+
+#: mod/contacts.php:568
+msgid "Communications lost with this contact!"
+msgstr "和这个联系人的通信断开了！"
+
+#: mod/contacts.php:574
+msgid "Fetch further information for feeds"
+msgstr "拿文源别的消息"
+
+#: mod/contacts.php:576
+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 ""
+
+#: mod/contacts.php:578
+msgid "Fetch information"
+msgstr "取消息"
+
+#: mod/contacts.php:579
+msgid "Fetch keywords"
+msgstr "获取关键字"
+
+#: mod/contacts.php:580
+msgid "Fetch information and keywords"
+msgstr "取消息和关键词"
+
+#: mod/contacts.php:617
+msgid "Profile Visibility"
+msgstr "简历可见量"
+
+#: mod/contacts.php:618
+msgid "Contact Information / Notes"
+msgstr "联系人信息/便条"
+
+#: mod/contacts.php:619
+msgid "Contact Settings"
+msgstr "联系人设置"
+
+#: mod/contacts.php:628
+msgid "Contact"
+msgstr "联系人"
+
+#: mod/contacts.php:632
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "请选择简介您想给%s显示他安全地看您的简介的时候。"
+
+#: mod/contacts.php:634
+msgid "Their personal note"
+msgstr ""
+
+#: mod/contacts.php:636
+msgid "Edit contact notes"
+msgstr "编辑联系人便条"
+
+#: mod/contacts.php:640
+msgid "Block/Unblock contact"
+msgstr "屏蔽/解除屏蔽联系人"
+
+#: mod/contacts.php:641
+msgid "Ignore contact"
+msgstr "忽略联系人"
+
+#: mod/contacts.php:642
+msgid "Repair URL settings"
+msgstr "维修URL设置"
+
+#: mod/contacts.php:643
+msgid "View conversations"
+msgstr "看交流"
+
+#: mod/contacts.php:648
+msgid "Last update:"
+msgstr "上个更新："
+
+#: mod/contacts.php:650
+msgid "Update public posts"
+msgstr "更新公开文章"
+
+#: mod/contacts.php:652 mod/contacts.php:1096
+msgid "Update now"
+msgstr "现在更新"
+
+#: mod/contacts.php:658 mod/contacts.php:850 mod/contacts.php:1113
+msgid "Unignore"
+msgstr "取消忽视"
+
+#: mod/contacts.php:662
+msgid "Currently blocked"
+msgstr "现在被封禁的"
+
+#: mod/contacts.php:663
+msgid "Currently ignored"
+msgstr "现在不理的"
+
+#: mod/contacts.php:664
+msgid "Currently archived"
+msgstr "当前已存档"
+
+#: mod/contacts.php:665
+msgid "Awaiting connection acknowledge"
+msgstr "等待连接确认"
+
+#: mod/contacts.php:666
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
+msgstr "回答／喜欢关您公开文章<strong>会</strong>还可见的"
+
+#: mod/contacts.php:667
+msgid "Notification for new posts"
+msgstr "新消息提示"
+
+#: mod/contacts.php:667
+msgid "Send a notification of every new post of this contact"
+msgstr "发送这个联系人的每篇新文章的通知"
+
+#: mod/contacts.php:670
+msgid "Blacklisted keywords"
+msgstr "黑名单关键词"
+
+#: mod/contacts.php:670
+msgid ""
+"Comma separated list of keywords that should not be converted to hashtags, "
+"when \"Fetch information and keywords\" is selected"
+msgstr "逗号分的关键词不应该翻译成主题标签，如果“取消息和关键词”选择的。"
+
+#: mod/contacts.php:682 src/Model/Profile.php:424
+msgid "XMPP:"
+msgstr "XMPP："
+
+#: mod/contacts.php:687
+msgid "Actions"
+msgstr ""
+
+#: mod/contacts.php:731
+msgid "Suggestions"
+msgstr "建议"
+
+#: mod/contacts.php:734
+msgid "Suggest potential friends"
+msgstr "建议潜在朋友们"
+
+#: mod/contacts.php:742
+msgid "Show all contacts"
+msgstr "显示所有的联系人"
+
+#: mod/contacts.php:747
+msgid "Unblocked"
+msgstr "未屏蔽的"
+
+#: mod/contacts.php:750
+msgid "Only show unblocked contacts"
+msgstr "只显示没被屏蔽的联系人"
+
+#: mod/contacts.php:755
+msgid "Blocked"
+msgstr "被屏蔽的"
+
+#: mod/contacts.php:758
+msgid "Only show blocked contacts"
+msgstr "只显示被屏蔽的联系人"
+
+#: mod/contacts.php:763
+msgid "Ignored"
+msgstr "忽视的"
+
+#: mod/contacts.php:766
+msgid "Only show ignored contacts"
+msgstr "只显示忽略的联系人"
+
+#: mod/contacts.php:771
+msgid "Archived"
+msgstr "已存档"
+
+#: mod/contacts.php:774
+msgid "Only show archived contacts"
+msgstr "只显示已存档联系人"
+
+#: mod/contacts.php:779
+msgid "Hidden"
+msgstr "隐藏的"
+
+#: mod/contacts.php:782
+msgid "Only show hidden contacts"
+msgstr "只显示隐藏的联系人"
+
+#: mod/contacts.php:840
+msgid "Search your contacts"
+msgstr "搜索您的联系人"
+
+#: mod/contacts.php:851 mod/contacts.php:1122
+msgid "Archive"
+msgstr "存档"
+
+#: mod/contacts.php:851 mod/contacts.php:1122
+msgid "Unarchive"
+msgstr "从存档拿来"
+
+#: mod/contacts.php:854
+msgid "Batch Actions"
+msgstr "批量操作"
+
+#: mod/contacts.php:880
+msgid "Conversations started by this contact"
+msgstr ""
+
+#: mod/contacts.php:885
+msgid "Posts and Comments"
+msgstr ""
+
+#: mod/contacts.php:896 src/Model/Profile.php:886
+msgid "Profile Details"
+msgstr "简介内容"
+
+#: mod/contacts.php:908
+msgid "View all contacts"
+msgstr "查看所有联系人"
+
+#: mod/contacts.php:919
+msgid "View all common friends"
+msgstr "查看所有公共好友"
+
+#: mod/contacts.php:929
+msgid "Advanced Contact Settings"
+msgstr "高级联系人设置"
+
+#: mod/contacts.php:1019
+msgid "Mutual Friendship"
+msgstr "共同友谊"
+
+#: mod/contacts.php:1024
+msgid "is a fan of yours"
+msgstr "是你的粉丝"
+
+#: mod/contacts.php:1029
+msgid "you are a fan of"
+msgstr "您已关注"
+
+#: mod/contacts.php:1046 mod/photos.php:1494 mod/photos.php:1533
+#: mod/photos.php:1593 src/Object/Post.php:792
+msgid "This is you"
+msgstr "这是你"
+
+#: mod/contacts.php:1053
+msgid "Edit contact"
+msgstr "编辑联系人"
+
+#: mod/contacts.php:1107
+msgid "Toggle Blocked status"
+msgstr "切换屏蔽状态"
+
+#: mod/contacts.php:1115
+msgid "Toggle Ignored status"
+msgstr "交替忽视现状"
+
+#: mod/contacts.php:1124
+msgid "Toggle Archive status"
+msgstr "交替档案现状"
+
+#: mod/contacts.php:1132
+msgid "Delete contact"
+msgstr "删除联系人"
+
+#: mod/events.php:103 mod/events.php:105
+msgid "Event can not end before it has started."
+msgstr "事件不能在开始前结束。"
+
+#: mod/events.php:112 mod/events.php:114
+msgid "Event title and start time are required."
+msgstr "项目标题和开始时间是必须的。"
+
+#: mod/events.php:392
+msgid "Create New Event"
+msgstr "创建新的事件"
+
+#: mod/events.php:509
+msgid "Event details"
+msgstr "事件细节"
+
+#: mod/events.php:510
+msgid "Starting date and Title are required."
+msgstr "需要开始日期和标题。"
+
+#: mod/events.php:511 mod/events.php:512
+msgid "Event Starts:"
+msgstr "事件开始:"
+
+#: mod/events.php:511 mod/events.php:523 mod/profiles.php:607
+msgid "Required"
+msgstr "必须的"
+
+#: mod/events.php:513 mod/events.php:529
+msgid "Finish date/time is not known or not relevant"
+msgstr "结束日期/时间未知或无关"
+
+#: mod/events.php:515 mod/events.php:516
+msgid "Event Finishes:"
+msgstr "事件结束:"
+
+#: mod/events.php:517 mod/events.php:530
+msgid "Adjust for viewer timezone"
+msgstr "调整为浏览者的时区"
+
+#: mod/events.php:519
+msgid "Description:"
+msgstr "描述："
+
+#: mod/events.php:523 mod/events.php:525
+msgid "Title:"
+msgstr "标题："
+
+#: mod/events.php:526 mod/events.php:527
+msgid "Share this event"
+msgstr "分享这个事件"
+
+#: mod/events.php:534 src/Model/Profile.php:851
+msgid "Basic"
+msgstr "基本"
+
+#: mod/events.php:536 mod/photos.php:1112 mod/photos.php:1448
+#: src/Core/ACL.php:307
+msgid "Permissions"
+msgstr "权限"
+
+#: mod/events.php:555
+msgid "Failed to remove event"
+msgstr "删除事件失败"
+
+#: mod/events.php:557
+msgid "Event removed"
+msgstr "事件已删除"
+
+#: mod/follow.php:45
+msgid "The contact could not be added."
+msgstr "无法添加此联系人。"
+
+#: mod/follow.php:73
+msgid "You already added this contact."
+msgstr "您已添加此联系人。"
+
+#: mod/follow.php:83
+msgid "Diaspora support isn't enabled. Contact can't be added."
+msgstr "Diaspora 支持没被启用。无法添加联系人。"
+
+#: mod/follow.php:90
+msgid "OStatus support is disabled. Contact can't be added."
+msgstr "OStatus 支持没被启用。无法添加联系人。"
+
+#: mod/follow.php:97
+msgid "The network type couldn't be detected. Contact can't be added."
+msgstr "网络类型无法被检测。无法添加联系人。"
+
+#: mod/fbrowser.php:44 mod/fbrowser.php:69 mod/photos.php:198
+#: mod/photos.php:1076 mod/photos.php:1169 mod/photos.php:1186
+#: mod/photos.php:1652 mod/photos.php:1667 src/Model/Photo.php:243
+#: src/Model/Photo.php:252
+msgid "Contact Photos"
+msgstr "联系人照片"
+
+#: mod/fbrowser.php:132
+msgid "Files"
+msgstr "文件"
+
+#: mod/oexchange.php:30
+msgid "Post successful."
+msgstr "评论发表了。"
+
+#: mod/subthread.php:103
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s关注着%2$s的%3$s"
+
+#: 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 "Friendica 是一个社区项目，如果没有许多人的努力她将无法实现。这里列出了那些为代码作出贡献或者参与本地化翻译的人们。感谢大家的努力！"
+
+#: mod/attach.php:16
+msgid "Item not available."
+msgstr "项目不可用的"
+
+#: mod/attach.php:26
+msgid "Item was not found."
+msgstr "找不到项目。"
+
+#: mod/notify.php:77
+msgid "No more system notifications."
+msgstr "没别系统通知。"
+
+#: mod/community.php:71
+msgid "Community option not available."
+msgstr "社区选项不可用。"
+
+#: mod/community.php:88
+msgid "Not available."
+msgstr "不可用的"
+
+#: mod/community.php:101
+msgid "Local Community"
+msgstr "本地社区"
+
+#: mod/community.php:104
+msgid "Posts from local users on this server"
+msgstr ""
+
+#: mod/community.php:112
+msgid "Global Community"
+msgstr "全球社区"
+
+#: mod/community.php:115
+msgid "Posts from users of the whole federated network"
+msgstr ""
+
+#: mod/community.php:205
+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/localtime.php:19 src/Model/Event.php:34 src/Model/Event.php:829
+msgid "l F d, Y \\@ g:i A"
+msgstr "l F d, Y \\@ g:i A"
+
+#: 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."
+msgstr "Friendica提供这个服务目的是分享项目跟别的网络和朋友们在别的时区。"
+
+#: mod/localtime.php:39
+#, php-format
+msgid "UTC time: %s"
+msgstr "UTC时间: %s"
+
+#: mod/localtime.php:42
+#, php-format
+msgid "Current timezone: %s"
+msgstr "现在时区: %s"
+
+#: mod/localtime.php:46
+#, php-format
+msgid "Converted localtime: %s"
+msgstr "装换的当地时间：%s"
+
+#: mod/localtime.php:52
+msgid "Please select your timezone:"
+msgstr "请选择你的时区:"
+
+#: mod/poke.php:188
+msgid "Poke/Prod"
+msgstr "戳"
+
+#: mod/poke.php:189
+msgid "poke, prod or do other things to somebody"
+msgstr "把人家戳或别的行动"
+
+#: mod/poke.php:190
+msgid "Recipient"
+msgstr "接受者"
+
+#: mod/poke.php:191
+msgid "Choose what you wish to do to recipient"
+msgstr "选择您想把别人作"
+
+#: mod/poke.php:194
+msgid "Make this post private"
+msgstr "使这个文章私人"
+
+#: mod/invite.php:34
+msgid "Total invitation limit exceeded."
+msgstr "邀请限超过了。"
+
+#: mod/invite.php:56
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s : 不是效的电子邮件地址."
+
+#: mod/invite.php:88
+msgid "Please join us on Friendica"
+msgstr "请加入我们再Friendica"
+
+#: mod/invite.php:97
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "邀请限超过了。请联系您的网站管理员。"
+
+#: mod/invite.php:101
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s : 送消息失败了。"
+
+#: mod/invite.php:105
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d消息传送了。"
+
+#: mod/invite.php:123
+msgid "You have no more invitations available"
+msgstr "您没有别的邀请"
+
+#: mod/invite.php:131
+#, php-format
+msgid ""
+"Visit %s for a list of public sites that you can join. Friendica members on "
+"other sites can all connect with each other, as well as with members of many"
+" other social networks."
+msgstr "参观%s看一单公开网站您会加入。Friendica成员在别的网站都会互相连接，再跟很多别的社会网络。"
+
+#: mod/invite.php:133
+#, php-format
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
+msgstr "为接受这个邀请，请再%s或什么别的Friendica网站注册。"
+
+#: mod/invite.php:134
+#, php-format
+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. See %s for a list of alternate Friendica "
+"sites you can join."
+msgstr "Friendica 站点互相连接来创建一个增强隐私的由他们的成员拥有并控制的社交网络。它们也能跟多传统的社交网络连接。看 %s 来获取一份你可以选择加入的 Friendica 站点。"
+
+#: mod/invite.php:138
+msgid ""
+"Our apologies. This system is not currently configured to connect with other"
+" public sites or invite members."
+msgstr "不好意思。这个系统目前没设置跟别的公开网站连接或邀请成员。"
+
+#: mod/invite.php:142
+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 "各 Friendica 站点相互连接以创造出一个由其组成成员控制拥有的有强大隐私保护能力的大型社交网络。各站点同时也能够接入许多传统社交网络。"
+
+#: mod/invite.php:141
+#, php-format
+msgid "To accept this invitation, please visit and register at %s."
+msgstr "要接受这个邀请，请在 %s 访问并注册。"
+
+#: mod/invite.php:148
+msgid "Send invitations"
+msgstr "发请柬"
+
+#: mod/invite.php:149
+msgid "Enter email addresses, one per line:"
+msgstr "输入电子邮件地址，一行一个："
+
+#: mod/invite.php:150
+msgid ""
+"You are cordially invited to join me and other close friends on Friendica - "
+"and help us to create a better social web."
+msgstr "在 Friendica，你被诚挚地邀请来加入我和其他亲密的朋友－并帮助我们创建更好的社会网络。"
+
+#: mod/invite.php:152
+msgid "You will need to supply this invitation code: $invite_code"
+msgstr "您要输入这个邀请密码：$invite_code"
+
+#: mod/invite.php:152
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
+msgstr "您一注册，请页跟我连接，用我的简介在："
+
+#: mod/invite.php:154
+msgid ""
+"For more information about the Friendica project and why we feel it is "
+"important, please visit http://friendi.ca"
+msgstr "欲了解更多关于 Friendica 项目的信息以及为什么我们认为这很重要，请访问 http://friendi.ca"
+
+#: mod/notes.php:42 src/Model/Profile.php:933
+msgid "Personal Notes"
+msgstr "私人便条"
+
+#: mod/profiles.php:57
 msgid "Profile deleted."
 msgstr "简介删除了。"
 
-#: mod/profiles.php:74 mod/profiles.php:110
+#: mod/profiles.php:73 mod/profiles.php:109
 msgid "Profile-"
 msgstr "简介-"
 
-#: mod/profiles.php:93 mod/profiles.php:132
+#: mod/profiles.php:92 mod/profiles.php:131
 msgid "New profile created."
 msgstr "新的简介已创建。"
 
-#: mod/profiles.php:116
+#: mod/profiles.php:115
 msgid "Profile unavailable to clone."
 msgstr "简介不可用为复制。"
 
-#: mod/profiles.php:206
+#: mod/profiles.php:203
 msgid "Profile Name is required."
 msgstr "必要简介名"
 
-#: mod/profiles.php:347
+#: mod/profiles.php:344
 msgid "Marital Status"
 msgstr "婚姻状况 "
 
-#: mod/profiles.php:351
+#: mod/profiles.php:348
 msgid "Romantic Partner"
 msgstr "情人"
 
-#: mod/profiles.php:363
+#: mod/profiles.php:360
 msgid "Work/Employment"
 msgstr "工作"
 
-#: mod/profiles.php:366
+#: mod/profiles.php:363
 msgid "Religion"
 msgstr "宗教"
 
-#: mod/profiles.php:370
+#: mod/profiles.php:367
 msgid "Political Views"
 msgstr "政治观念"
 
-#: mod/profiles.php:374
+#: mod/profiles.php:371
 msgid "Gender"
 msgstr "性别"
 
-#: mod/profiles.php:378
+#: mod/profiles.php:375
 msgid "Sexual Preference"
 msgstr "性取向"
 
-#: mod/profiles.php:382
+#: mod/profiles.php:379
 msgid "XMPP"
 msgstr "XMPP"
 
-#: mod/profiles.php:386
+#: mod/profiles.php:383
 msgid "Homepage"
 msgstr "主页"
 
-#: mod/profiles.php:390 mod/profiles.php:593
+#: mod/profiles.php:387 mod/profiles.php:593
 msgid "Interests"
 msgstr "兴趣"
 
-#: mod/profiles.php:401 mod/profiles.php:589
+#: mod/profiles.php:398 mod/profiles.php:589
 msgid "Location"
 msgstr "位置"
 
-#: mod/profiles.php:483
+#: mod/profiles.php:481
 msgid "Profile updated."
 msgstr "简介更新了。"
 
-#: mod/profiles.php:540
+#: mod/profiles.php:538
 msgid "Hide contacts and friends:"
 msgstr "隐藏联系人和朋友："
 
-#: mod/profiles.php:545
+#: mod/profiles.php:543
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr "藏起来发现您的熟人／朋友单不让这个简介看着看？"
 
-#: mod/profiles.php:565
+#: mod/profiles.php:563
 msgid "Show more profile fields:"
 msgstr "显示更多简介内容："
 
-#: mod/profiles.php:577
+#: mod/profiles.php:575
 msgid "Profile Actions"
 msgstr ""
 
-#: mod/profiles.php:578
+#: mod/profiles.php:576
 msgid "Edit Profile Details"
 msgstr "剪辑简介消息"
 
-#: mod/profiles.php:580
+#: mod/profiles.php:578
 msgid "Change Profile Photo"
 msgstr "改变简介照片"
 
-#: mod/profiles.php:581
+#: mod/profiles.php:580
 msgid "View this profile"
 msgstr "看这个简介"
 
-#: mod/profiles.php:582 mod/profiles.php:677 src/Model/Profile.php:389
+#: mod/profiles.php:581
+msgid "View all profiles"
+msgstr ""
+
+#: mod/profiles.php:582 mod/profiles.php:677 src/Model/Profile.php:393
 msgid "Edit visibility"
 msgstr "修改能见度"
 
@@ -6175,7 +7361,7 @@ msgstr "你的性："
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr "<span class=\"heart\">&hearts;</span>婚姻状况："
 
-#: mod/profiles.php:601 src/Model/Profile.php:780
+#: mod/profiles.php:601 src/Model/Profile.php:769
 msgid "Sexual Preference:"
 msgstr "性取向："
 
@@ -6255,11 +7441,11 @@ msgstr "这个 XMPP 地址会被传播到你的联系人从而他们可以关注
 msgid "Homepage URL:"
 msgstr "主页URL："
 
-#: mod/profiles.php:628 src/Model/Profile.php:788
+#: mod/profiles.php:628 src/Model/Profile.php:777
 msgid "Hometown:"
 msgstr "故乡："
 
-#: mod/profiles.php:629 src/Model/Profile.php:796
+#: mod/profiles.php:629 src/Model/Profile.php:785
 msgid "Political Views:"
 msgstr "政治观念："
 
@@ -6283,11 +7469,11 @@ msgstr "私人关键字"
 msgid "(Used for searching profiles, never shown to others)"
 msgstr "(用于搜索简介，没有给别人看)"
 
-#: mod/profiles.php:633 src/Model/Profile.php:812
+#: mod/profiles.php:633 src/Model/Profile.php:801
 msgid "Likes:"
 msgstr "喜欢："
 
-#: mod/profiles.php:634 src/Model/Profile.php:816
+#: mod/profiles.php:634 src/Model/Profile.php:805
 msgid "Dislikes:"
 msgstr "不喜欢："
 
@@ -6327,11 +7513,11 @@ msgstr "学院／教育"
 msgid "Contact information and Social Networks"
 msgstr "熟人信息和社会化网络"
 
-#: mod/profiles.php:674 src/Model/Profile.php:385
+#: mod/profiles.php:674 src/Model/Profile.php:389
 msgid "Profile Image"
 msgstr "简介图像"
 
-#: mod/profiles.php:676 src/Model/Profile.php:388
+#: mod/profiles.php:676 src/Model/Profile.php:392
 msgid "visible to everybody"
 msgstr "给打假可见的"
 
@@ -6339,1423 +7525,267 @@ msgstr "给打假可见的"
 msgid "Edit/Manage Profiles"
 msgstr "编辑／管理简介"
 
-#: mod/profiles.php:684 src/Model/Profile.php:375 src/Model/Profile.php:397
+#: mod/profiles.php:684 src/Model/Profile.php:379 src/Model/Profile.php:401
 msgid "Change profile photo"
 msgstr "换简介照片"
 
-#: mod/profiles.php:685 src/Model/Profile.php:376
+#: mod/profiles.php:685 src/Model/Profile.php:380
 msgid "Create New Profile"
 msgstr "创建新的简介"
 
-#: mod/register.php:100
-msgid ""
-"Registration successful. Please check your email for further instructions."
-msgstr "注册成功了。请咨询说明再您的收件箱。"
+#: mod/photos.php:112 src/Model/Profile.php:894
+msgid "Photo Albums"
+msgstr "相册"
 
-#: mod/register.php:104
+#: mod/photos.php:113 mod/photos.php:1708
+msgid "Recent Photos"
+msgstr "最近的照片"
+
+#: mod/photos.php:116 mod/photos.php:1230 mod/photos.php:1710
+msgid "Upload New Photos"
+msgstr "上传新照片"
+
+#: mod/photos.php:190
+msgid "Contact information unavailable"
+msgstr "联系人信息不可用"
+
+#: mod/photos.php:209
+msgid "Album not found."
+msgstr "取回不了相册."
+
+#: mod/photos.php:239 mod/photos.php:252 mod/photos.php:1181
+msgid "Delete Album"
+msgstr "删除相册"
+
+#: mod/photos.php:250
+msgid "Do you really want to delete this photo album and all its photos?"
+msgstr "您真的想删除这个相册和所有里面的照相吗？"
+
+#: mod/photos.php:312 mod/photos.php:324 mod/photos.php:1453
+msgid "Delete Photo"
+msgstr "删除照片"
+
+#: mod/photos.php:322
+msgid "Do you really want to delete this photo?"
+msgstr "您真的想删除这个照相吗？"
+
+#: mod/photos.php:679
+msgid "a photo"
+msgstr "一张照片"
+
+#: mod/photos.php:679
+#, php-format
+msgid "%1$s was tagged in %2$s by %3$s"
+msgstr "%1$s被%3$s标签在%2$s"
+
+#: mod/photos.php:782
+msgid "Image upload didn't complete, please try again"
+msgstr "图片上传未完成，请重试"
+
+#: mod/photos.php:785
+msgid "Image file is missing"
+msgstr "缺少图片文件"
+
+#: mod/photos.php:790
+msgid ""
+"Server can't accept new file upload at this time, please contact your "
+"administrator"
+msgstr "服务器目前无法接受新的上传文件，请联系您的管理员"
+
+#: mod/photos.php:816
+msgid "Image file is empty."
+msgstr "图片文件空的。"
+
+#: mod/photos.php:953
+msgid "No photos selected"
+msgstr "没有照片挑选了"
+
+#: mod/photos.php:1104
+msgid "Upload Photos"
+msgstr "上传照片"
+
+#: mod/photos.php:1108 mod/photos.php:1176
+msgid "New album name: "
+msgstr "新册名："
+
+#: mod/photos.php:1109
+msgid "or select existing album:"
+msgstr ""
+
+#: mod/photos.php:1110
+msgid "Do not show a status post for this upload"
+msgstr "别显示现状报到关于这个上传"
+
+#: mod/photos.php:1187
+msgid "Edit Album"
+msgstr "编照片册"
+
+#: mod/photos.php:1192
+msgid "Show Newest First"
+msgstr "先表示最新的"
+
+#: mod/photos.php:1194
+msgid "Show Oldest First"
+msgstr "先表示最老的"
+
+#: mod/photos.php:1215 mod/photos.php:1693
+msgid "View Photo"
+msgstr "看照片"
+
+#: mod/photos.php:1256
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "无权利。用这个项目可能受限制。"
+
+#: mod/photos.php:1258
+msgid "Photo not available"
+msgstr "不可获得的照片"
+
+#: mod/photos.php:1333
+msgid "View photo"
+msgstr "看照片"
+
+#: mod/photos.php:1333
+msgid "Edit photo"
+msgstr "编辑照片"
+
+#: mod/photos.php:1334
+msgid "Use as profile photo"
+msgstr "用为资料图"
+
+#: mod/photos.php:1340 src/Object/Post.php:151
+msgid "Private Message"
+msgstr "私人的新闻"
+
+#: mod/photos.php:1360
+msgid "View Full Size"
+msgstr "看全尺寸"
+
+#: mod/photos.php:1421
+msgid "Tags: "
+msgstr "标签："
+
+#: mod/photos.php:1424
+msgid "[Remove any tag]"
+msgstr "[删除任何标签]"
+
+#: mod/photos.php:1439
+msgid "New album name"
+msgstr "新册名"
+
+#: mod/photos.php:1440
+msgid "Caption"
+msgstr "字幕"
+
+#: mod/photos.php:1441
+msgid "Add a Tag"
+msgstr "加标签"
+
+#: mod/photos.php:1441
+msgid ""
+"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr "例子：@zhang, @Zhang_San, @li@example.com, #Beijing, #ktv"
+
+#: mod/photos.php:1442
+msgid "Do not rotate"
+msgstr "不要旋转"
+
+#: mod/photos.php:1443
+msgid "Rotate CW (right)"
+msgstr "顺时针地转动（左）"
+
+#: mod/photos.php:1444
+msgid "Rotate CCW (left)"
+msgstr "反顺时针地转动（右）"
+
+#: mod/photos.php:1478 src/Object/Post.php:293
+msgid "I like this (toggle)"
+msgstr "我喜欢这(交替)"
+
+#: mod/photos.php:1479 src/Object/Post.php:294
+msgid "I don't like this (toggle)"
+msgstr "我不喜欢这(交替)"
+
+#: mod/photos.php:1496 mod/photos.php:1535 mod/photos.php:1595
+#: src/Object/Post.php:398 src/Object/Post.php:794
+msgid "Comment"
+msgstr "评论"
+
+#: mod/photos.php:1627
+msgid "Map"
+msgstr "地图"
+
+#: local/test.php:1840
 #, 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 "发送邮件失败。你的账户消息是：<br>用户名：%s<br> 密码: %s<br><br>。登录后能改密码。"
+"<span><a href=\"%s\" target=\"_blank\" class=\"shared-wall-item-"
+"name\">%s</a> wrote the following <a href=\"%s\" target=\"_blank\">post</a>"
+msgstr ""
 
-#: mod/register.php:111
-msgid "Registration successful."
-msgstr "注册成功。"
+#: local/testshare.php:158 src/Content/Text/BBCode.php:991
+#, php-format
+msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
+msgstr ""
 
-#: mod/register.php:116
-msgid "Your registration can not be processed."
-msgstr "处理不了您的注册。"
-
-#: mod/register.php:163
-msgid "Your registration is pending approval by the site owner."
-msgstr "您的注册等网页主的批准。"
-
-#: mod/register.php:221
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
-msgstr "您会(可选的)用OpenID填这个表格通过提供您的OpenID和点击「注册」。"
-
-#: mod/register.php:222
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
-msgstr "如果您没熟悉OpenID,请留空这个栏和填另些栏。"
-
-#: mod/register.php:223
-msgid "Your OpenID (optional): "
-msgstr "您的OpenID(可选的):"
-
-#: mod/register.php:235
-msgid "Include your profile in member directory?"
-msgstr "放您的简介再员目录？"
-
-#: mod/register.php:262
-msgid "Note for the admin"
-msgstr "给管理员的便条"
-
-#: mod/register.php:262
-msgid "Leave a message for the admin, why you want to join this node"
-msgstr "给管理员留条消息，为什么你想加入这个节点"
-
-#: mod/register.php:263
-msgid "Membership on this site is by invitation only."
-msgstr "会员身份在这个网站是光通过邀请。"
-
-#: mod/register.php:264
-msgid "Your invitation code: "
-msgstr "您的邀请码："
-
-#: mod/register.php:273
-msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
-msgstr "你的全名 (比如张三，真名或看起来是真名)："
-
-#: mod/register.php:274
-msgid ""
-"Your Email Address: (Initial information will be send there, so this has to "
-"be an existing address.)"
-msgstr "您的电子邮件地址：(初始信息将发送到这里，所以这必须是一个存在的地址。)"
-
-#: mod/register.php:276 mod/settings.php:1190
-msgid "New Password:"
-msgstr "新密码："
-
-#: mod/register.php:276
-msgid "Leave empty for an auto generated password."
-msgstr "留空以使用自动生成的密码。"
-
-#: mod/register.php:277 mod/settings.php:1191
-msgid "Confirm:"
-msgstr "确认："
-
-#: mod/register.php:278
+#: local/testshare.php:180
 #, 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>'."
+"<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a "
+"href=\"%s\" target=\"_blank\">post</a>"
 msgstr ""
 
-#: mod/register.php:279
-msgid "Choose a nickname: "
-msgstr "选择昵称："
-
-#: mod/register.php:282 src/Content/Nav.php:128 src/Module/Login.php:284
-msgid "Register"
-msgstr "注册"
-
-#: mod/register.php:289
-msgid "Import your profile to this friendica instance"
-msgstr "进口您的简介到这个friendica服务器"
-
-#: mod/removeme.php:45
-msgid "User deleted their account"
-msgstr ""
-
-#: mod/removeme.php:46
-msgid ""
-"On your Friendica node an user deleted their account. Please ensure that "
-"their data is removed from the backups."
-msgstr ""
-
-#: mod/removeme.php:47
+#: boot.php:653
 #, php-format
-msgid "The user id is %d"
-msgstr "用户 id 为 %d"
+msgid "Update %s failed. See error logs."
+msgstr "更新 %s 失败。查看错误日志。"
 
-#: mod/removeme.php:78 mod/removeme.php:81
-msgid "Remove My Account"
-msgstr "删除我的账户"
+#: src/Database/DBStructure.php:33
+msgid "There are no tables on MyISAM."
+msgstr "未在 MyISAM 中发现表。"
 
-#: mod/removeme.php:79
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
-msgstr "这要完全删除您的账户。这一做过，就不能恢复。"
-
-#: mod/removeme.php:80
-msgid "Please enter your password for verification:"
-msgstr "请输入密码为确认："
-
-#: mod/search.php:105
-msgid "Only logged in users are permitted to perform a search."
-msgstr "只有已登录的用户被允许进行搜索。"
-
-#: mod/search.php:129
-msgid "Too Many Requests"
-msgstr "过多请求"
-
-#: mod/search.php:130
-msgid "Only one search per minute is permitted for not logged in users."
-msgstr "对未登录的用户，每分钟只允许一条搜索。"
-
-#: mod/search.php:234
-#, php-format
-msgid "Items tagged with: %s"
-msgstr "项目标记为：%s"
-
-#: mod/settings.php:56
-msgid "Account"
-msgstr "帐户"
-
-#: mod/settings.php:73
-msgid "Display"
-msgstr "显示"
-
-#: mod/settings.php:80 mod/settings.php:834
-msgid "Social Networks"
-msgstr "社会化网络"
-
-#: mod/settings.php:94 src/Content/Nav.php:205
-msgid "Delegations"
-msgstr "代表"
-
-#: mod/settings.php:101
-msgid "Connected apps"
-msgstr "连接着应用"
-
-#: mod/settings.php:115
-msgid "Remove account"
-msgstr "删除账户"
-
-#: mod/settings.php:167
-msgid "Missing some important data!"
-msgstr "缺失一些重要数据！"
-
-#: mod/settings.php:278
-msgid "Failed to connect with email account using the settings provided."
-msgstr "不能连接电子邮件账户用输入的设置。"
-
-#: mod/settings.php:283
-msgid "Email settings updated."
-msgstr "电子邮件设置更新了"
-
-#: mod/settings.php:299
-msgid "Features updated"
-msgstr "特点更新了"
-
-#: mod/settings.php:372
-msgid "Relocate message has been send to your contacts"
-msgstr "调动消息已发送给您的联系人"
-
-#: mod/settings.php:384 src/Model/User.php:340
-msgid "Passwords do not match. Password unchanged."
-msgstr "密码不匹配。密码没改变。"
-
-#: mod/settings.php:389
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "空的密码禁止。密码没未改变的。"
-
-#: mod/settings.php:394 src/Core/Console/NewPassword.php:87
-msgid ""
-"The new password has been exposed in a public data dump, please choose "
-"another."
-msgstr "新密码已暴露在公共数据转储中，请务必另选密码。"
-
-#: mod/settings.php:400
-msgid "Wrong password."
-msgstr "密码不正确。"
-
-#: mod/settings.php:407 src/Core/Console/NewPassword.php:94
-msgid "Password changed."
-msgstr "密码变化了。"
-
-#: mod/settings.php:409 src/Core/Console/NewPassword.php:91
-msgid "Password update failed. Please try again."
-msgstr "密码更新失败了。请再试。"
-
-#: mod/settings.php:493
-msgid " Please use a shorter name."
-msgstr " 请用一个更短的名字。"
-
-#: mod/settings.php:496
-msgid " Name too short."
-msgstr " 名字过短。"
-
-#: mod/settings.php:504
-msgid "Wrong Password"
-msgstr "密码不正确"
-
-#: mod/settings.php:509
-msgid "Invalid email."
-msgstr "无效的邮箱。"
-
-#: mod/settings.php:516
-msgid "Cannot change to that email."
-msgstr "无法更改到此电子邮件地址。"
-
-#: mod/settings.php:566
-msgid "Private forum has no privacy permissions. Using default privacy group."
-msgstr "私人评坛没有隐私批准。默认隐私组用者。"
-
-#: mod/settings.php:569
-msgid "Private forum has no privacy permissions and no default privacy group."
-msgstr "私人评坛没有隐私批准或默认隐私组。"
-
-#: mod/settings.php:609
-msgid "Settings updated."
-msgstr "设置更新了。"
-
-#: mod/settings.php:668 mod/settings.php:694 mod/settings.php:728
-msgid "Add application"
-msgstr "加入应用"
-
-#: mod/settings.php:672 mod/settings.php:698
-msgid "Consumer Key"
-msgstr "钥匙(Consumer Key)"
-
-#: mod/settings.php:673 mod/settings.php:699
-msgid "Consumer Secret"
-msgstr "密码(Consumer Secret)"
-
-#: mod/settings.php:674 mod/settings.php:700
-msgid "Redirect"
-msgstr "重定向"
-
-#: mod/settings.php:675 mod/settings.php:701
-msgid "Icon url"
-msgstr "图符URL"
-
-#: mod/settings.php:686
-msgid "You can't edit this application."
-msgstr "您不能编辑这个应用。"
-
-#: mod/settings.php:727
-msgid "Connected Apps"
-msgstr "连接着应用"
-
-#: mod/settings.php:729 src/Object/Post.php:155 src/Object/Post.php:157
-msgid "Edit"
-msgstr "编辑"
-
-#: mod/settings.php:731
-msgid "Client key starts with"
-msgstr "客户钥匙头字是"
-
-#: mod/settings.php:732
-msgid "No name"
-msgstr "无名"
-
-#: mod/settings.php:733
-msgid "Remove authorization"
-msgstr "撤消权能"
-
-#: mod/settings.php:744
-msgid "No Addon settings configured"
-msgstr "无插件设置配置完成"
-
-#: mod/settings.php:753
-msgid "Addon Settings"
-msgstr "插件设置"
-
-#: mod/settings.php:774
-msgid "Additional Features"
-msgstr "附加特性"
-
-#: mod/settings.php:797 src/Content/ContactSelector.php:83
-msgid "Diaspora"
-msgstr "Diaspora"
-
-#: mod/settings.php:797 mod/settings.php:798
-msgid "enabled"
-msgstr "能够做的"
-
-#: mod/settings.php:797 mod/settings.php:798
-msgid "disabled"
-msgstr "已停用"
-
-#: mod/settings.php:797 mod/settings.php:798
-#, php-format
-msgid "Built-in support for %s connectivity is %s"
-msgstr "包括的支持为%s连通性是%s"
-
-#: mod/settings.php:798
-msgid "GNU Social (OStatus)"
-msgstr "GNU Social (OStatus)"
-
-#: mod/settings.php:829
-msgid "Email access is disabled on this site."
-msgstr "电子邮件访问在这个站上被禁用。"
-
-#: mod/settings.php:839
-msgid "General Social Media Settings"
-msgstr "通用社交媒体设置"
-
-#: mod/settings.php:840
-msgid "Disable Content Warning"
-msgstr "禁用内容警告"
-
-#: mod/settings.php:840
-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 "
-"collapsing and sets the content warning as the post title. Doesn't affect "
-"any other content filtering you eventually set up."
-msgstr ""
-
-#: mod/settings.php:841
-msgid "Disable intelligent shortening"
-msgstr ""
-
-#: mod/settings.php:841
-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:842
-msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
-msgstr "自动关注任何 GNU Social (OStatus) 关注者/提及者"
-
-#: mod/settings.php:842
-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:843
-msgid "Default group for OStatus contacts"
-msgstr "用于 OStatus 联系人的默认组"
-
-#: mod/settings.php:844
-msgid "Your legacy GNU Social account"
-msgstr "您遗留的 GNU Social 账户"
-
-#: mod/settings.php:844
-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 "如果您在这里输入您旧的 GNU Social/Statusnet 账号名 (格式示例 user@domain.tld) ，您的联系人列表将会被自动添加。完成后该字段将被清空。"
-
-#: mod/settings.php:847
-msgid "Repair OStatus subscriptions"
-msgstr "修复 OStatus 订阅"
-
-#: mod/settings.php:851
-msgid "Email/Mailbox Setup"
-msgstr "邮件收件箱设置"
-
-#: mod/settings.php:852
-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:853
-msgid "Last successful email check:"
-msgstr "上个成功收件箱检查："
-
-#: mod/settings.php:855
-msgid "IMAP server name:"
-msgstr "IMAP服务器名字："
-
-#: mod/settings.php:856
-msgid "IMAP port:"
-msgstr "IMAP服务器端口："
-
-#: mod/settings.php:857
-msgid "Security:"
-msgstr "安全："
-
-#: mod/settings.php:857 mod/settings.php:862
-msgid "None"
-msgstr "没有"
-
-#: mod/settings.php:858
-msgid "Email login name:"
-msgstr "邮件登录名："
-
-#: mod/settings.php:859
-msgid "Email password:"
-msgstr "邮件密码："
-
-#: mod/settings.php:860
-msgid "Reply-to address:"
-msgstr "回答地址："
-
-#: mod/settings.php:861
-msgid "Send public posts to all email contacts:"
-msgstr "发送公开文章给所有的邮件联系人："
-
-#: mod/settings.php:862
-msgid "Action after import:"
-msgstr "进口后行动："
-
-#: mod/settings.php:862 src/Content/Nav.php:193
-msgid "Mark as seen"
-msgstr "标注看过"
-
-#: mod/settings.php:862
-msgid "Move to folder"
-msgstr "搬到文件夹"
-
-#: mod/settings.php:863
-msgid "Move to folder:"
-msgstr "搬到文件夹："
-
-#: mod/settings.php:906
-#, php-format
-msgid "%s - (Unsupported)"
-msgstr "%s - (不支持的)"
-
-#: mod/settings.php:908
-#, php-format
-msgid "%s - (Experimental)"
-msgstr "%s - (实验性)"
-
-#: mod/settings.php:951
-msgid "Display Settings"
-msgstr "表示设置"
-
-#: mod/settings.php:957 mod/settings.php:981
-msgid "Display Theme:"
-msgstr "显示主题："
-
-#: mod/settings.php:958
-msgid "Mobile Theme:"
-msgstr "手机主题："
-
-#: mod/settings.php:959
-msgid "Suppress warning of insecure networks"
-msgstr ""
-
-#: mod/settings.php:959
-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:960
-msgid "Update browser every xx seconds"
-msgstr "更新游览器每XX秒"
-
-#: mod/settings.php:960
-msgid "Minimum of 10 seconds. Enter -1 to disable it."
-msgstr "至少 10 秒。输入 -1 禁用。"
-
-#: mod/settings.php:961
-msgid "Number of items to display per page:"
-msgstr "每页表示多少项目："
-
-#: mod/settings.php:961 mod/settings.php:962
-msgid "Maximum of 100 items"
-msgstr "最多100项目"
-
-#: mod/settings.php:962
-msgid "Number of items to display per page when viewed from mobile device:"
-msgstr "用手机看一页展示多少项目："
-
-#: mod/settings.php:963
-msgid "Don't show emoticons"
-msgstr "不显示表情符号"
-
-#: mod/settings.php:964
-msgid "Calendar"
-msgstr "日历"
-
-#: mod/settings.php:965
-msgid "Beginning of week:"
-msgstr "一周的开始："
-
-#: mod/settings.php:966
-msgid "Don't show notices"
-msgstr "不显示提示"
-
-#: mod/settings.php:967
-msgid "Infinite scroll"
-msgstr "无限的滚动"
-
-#: mod/settings.php:968
-msgid "Automatic updates only at the top of the network page"
-msgstr "仅在返回到网页头部时自动更新"
-
-#: mod/settings.php:968
-msgid ""
-"When disabled, the network page is updated all the time, which could be "
-"confusing while reading."
-msgstr "禁用后，网页将会一直更新，这可能会对阅读造成干扰。"
-
-#: mod/settings.php:969
-msgid "Bandwidth Saver Mode"
-msgstr ""
-
-#: mod/settings.php:969
-msgid ""
-"When enabled, embedded content is not displayed on automatic updates, they "
-"only show on page reload."
-msgstr "当启用时，嵌入的内容不会在自动更新时显示，它们只在页面重载时显示。"
-
-#: mod/settings.php:970
-msgid "Smart Threading"
-msgstr ""
-
-#: mod/settings.php:970
-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:972
-msgid "General Theme Settings"
-msgstr "通用主题设置"
-
-#: mod/settings.php:973
-msgid "Custom Theme Settings"
-msgstr "自定义主题设置"
-
-#: mod/settings.php:974
-msgid "Content Settings"
-msgstr "内容设置"
-
-#: mod/settings.php:975 view/theme/duepuntozero/config.php:73
-#: view/theme/frio/config.php:120 view/theme/quattro/config.php:75
-#: view/theme/vier/config.php:121
-msgid "Theme settings"
-msgstr "主题设置"
-
-#: mod/settings.php:994
-msgid "Unable to find your profile. Please contact your admin."
-msgstr "无法找到您的简介。请联系您的管理员。"
-
-#: mod/settings.php:1033
-msgid "Account Types"
-msgstr "账户类型"
-
-#: mod/settings.php:1034
-msgid "Personal Page Subtypes"
-msgstr ""
-
-#: mod/settings.php:1035
-msgid "Community Forum Subtypes"
-msgstr ""
-
-#: mod/settings.php:1043
-msgid "Account for a personal profile."
-msgstr ""
-
-#: mod/settings.php:1047
-msgid ""
-"Account for an organisation that automatically approves contact requests as "
-"\"Followers\"."
-msgstr ""
-
-#: mod/settings.php:1051
-msgid ""
-"Account for a news reflector that automatically approves contact requests as"
-" \"Followers\"."
-msgstr ""
-
-#: mod/settings.php:1055
-msgid "Account for community discussions."
-msgstr ""
-
-#: mod/settings.php:1059
-msgid ""
-"Account for a regular personal profile that requires manual approval of "
-"\"Friends\" and \"Followers\"."
-msgstr ""
-
-#: mod/settings.php:1063
-msgid ""
-"Account for a public profile that automatically approves contact requests as"
-" \"Followers\"."
-msgstr ""
-
-#: mod/settings.php:1067
-msgid "Automatically approves all contact requests."
-msgstr "自动批准所有联系人请求。"
-
-#: mod/settings.php:1071
-msgid ""
-"Account for a popular profile that automatically approves contact requests "
-"as \"Friends\"."
-msgstr ""
-
-#: mod/settings.php:1074
-msgid "Private Forum [Experimental]"
-msgstr "隐私评坛［实验性的 ］"
-
-#: mod/settings.php:1075
-msgid "Requires manual approval of contact requests."
-msgstr "需要人工批准联系人请求。"
-
-#: mod/settings.php:1086
-msgid "OpenID:"
-msgstr "OpenID:"
-
-#: mod/settings.php:1086
-msgid "(Optional) Allow this OpenID to login to this account."
-msgstr "(可选的) 允许这个 OpenID 登录这个账户。"
-
-#: mod/settings.php:1094
-msgid "Publish your default profile in your local site directory?"
-msgstr "出版您默认简介在您当地的网站目录？"
-
-#: mod/settings.php:1094
+#: src/Database/DBStructure.php:76
 #, php-format
 msgid ""
-"Your profile will be published in this node's <a href=\"%s\">local "
-"directory</a>. Your profile details may be publicly visible depending on the"
-" system settings."
+"\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 ""
 
-#: mod/settings.php:1100
-msgid "Publish your default profile in the global social directory?"
-msgstr "出版您默认简介在综合社会目录？"
-
-#: mod/settings.php:1100
+#: src/Database/DBStructure.php:81
 #, 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 ""
+"The error message is\n"
+"[pre]%s[/pre]"
+msgstr "错误消息是\n[pre]%s[/pre]"
 
-#: mod/settings.php:1107
-msgid "Hide your contact/friend list from viewers of your default profile?"
-msgstr "在您的默认简介中向访问者隐藏您的联系人/朋友列表？"
-
-#: mod/settings.php:1107
+#: src/Database/DBStructure.php:192
+#, php-format
 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 "您的联系人列表将不会在您的默认简介页面展示。您可以决定在您自建的各附加简介中分别展示您的联系人列表"
+"\n"
+"Error %d occurred during database update:\n"
+"%s\n"
+msgstr "\n在数据库更新的时候发生了错误 %d\n%s\n"
 
-#: mod/settings.php:1111
-msgid "Hide your profile details from anonymous viewers?"
-msgstr "对匿名访问者隐藏详细简介？"
+#: src/Database/DBStructure.php:195
+msgid "Errors encountered performing database changes: "
+msgstr "操作数据库更改的时候遇到了错误："
 
-#: mod/settings.php:1111
-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:1115
-msgid "Allow friends to post to your profile page?"
-msgstr "允许朋友们贴文章在您的简介页？"
-
-#: mod/settings.php:1115
-msgid ""
-"Your contacts may write posts on your profile wall. These posts will be "
-"distributed to your contacts"
-msgstr ""
-
-#: mod/settings.php:1119
-msgid "Allow friends to tag your posts?"
-msgstr "允许朋友们标签您的文章？"
-
-#: mod/settings.php:1119
-msgid "Your contacts can add additional tags to your posts."
-msgstr "您的联系人可以为您的帖子添加额外的标签。"
-
-#: mod/settings.php:1123
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr "允许我们建议您潜力朋友给新成员？"
-
-#: mod/settings.php:1123
-msgid ""
-"If you like, Friendica may suggest new members to add you as a contact."
-msgstr "如果您愿意，Friendica 可能会建议新成员将您添加为联系人。"
-
-#: mod/settings.php:1127
-msgid "Permit unknown people to send you private mail?"
-msgstr "允许生人寄给您私人邮件？"
-
-#: mod/settings.php:1127
-msgid ""
-"Friendica network users may send you private messages even if they are not "
-"in your contact list."
-msgstr "Friendica 网络用户可能会向您发送私人信息，即使他们不在您的联系人列表中。"
-
-#: mod/settings.php:1131
-msgid "Profile is <strong>not published</strong>."
-msgstr "简介<strong>未发布</strong>。"
-
-#: mod/settings.php:1137
+#: src/Database/DBStructure.php:211
 #, php-format
-msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
-msgstr "你的身份地址是 <strong>'%s'</strong> 或者 '%s'."
-
-#: mod/settings.php:1144
-msgid "Automatically expire posts after this many days:"
-msgstr "在这数天后自动使文章过期："
-
-#: mod/settings.php:1144
-msgid "If empty, posts will not expire. Expired posts will be deleted"
-msgstr "如果为空，文章不会过期。过期的文章将被删除"
-
-#: mod/settings.php:1145
-msgid "Advanced expiration settings"
-msgstr "高级过期设置"
-
-#: mod/settings.php:1146
-msgid "Advanced Expiration"
-msgstr "先进的过期"
-
-#: mod/settings.php:1147
-msgid "Expire posts:"
-msgstr "把文章过期："
-
-#: mod/settings.php:1148
-msgid "Expire personal notes:"
-msgstr "把私人便条过期："
-
-#: mod/settings.php:1149
-msgid "Expire starred posts:"
-msgstr "把星的文章过期："
-
-#: mod/settings.php:1150
-msgid "Expire photos:"
-msgstr "把照片过期："
-
-#: mod/settings.php:1151
-msgid "Only expire posts by others:"
-msgstr "只别人的文章过期："
-
-#: mod/settings.php:1181
-msgid "Account Settings"
-msgstr "帐户设置"
-
-#: mod/settings.php:1189
-msgid "Password Settings"
-msgstr "密码设置"
-
-#: mod/settings.php:1191
-msgid "Leave password fields blank unless changing"
-msgstr "留空密码字段，除非要修改"
-
-#: mod/settings.php:1192
-msgid "Current Password:"
-msgstr "当前密码："
-
-#: mod/settings.php:1192 mod/settings.php:1193
-msgid "Your current password to confirm the changes"
-msgstr "你的当前密码，来确认修改"
-
-#: mod/settings.php:1193
-msgid "Password:"
-msgstr "密码："
-
-#: mod/settings.php:1197
-msgid "Basic Settings"
-msgstr "基础设置"
-
-#: mod/settings.php:1198 src/Model/Profile.php:736
-msgid "Full Name:"
-msgstr "全名："
-
-#: mod/settings.php:1199
-msgid "Email Address:"
-msgstr "电子邮件地址:"
-
-#: mod/settings.php:1200
-msgid "Your Timezone:"
-msgstr "你的时区："
-
-#: mod/settings.php:1201
-msgid "Your Language:"
-msgstr "你的语言："
-
-#: mod/settings.php:1201
-msgid ""
-"Set the language we use to show you friendica interface and to send you "
-"emails"
+msgid "%s: Database update"
 msgstr ""
 
-#: mod/settings.php:1202
-msgid "Default Post Location:"
-msgstr "默认文章位置："
-
-#: mod/settings.php:1203
-msgid "Use Browser Location:"
-msgstr "使用浏览器位置："
-
-#: mod/settings.php:1206
-msgid "Security and Privacy Settings"
-msgstr "安全和隐私设置"
-
-#: mod/settings.php:1208
-msgid "Maximum Friend Requests/Day:"
-msgstr "每天最大朋友请求数："
-
-#: mod/settings.php:1208 mod/settings.php:1237
-msgid "(to prevent spam abuse)"
-msgstr "（用于防止垃圾信息滥用）"
-
-#: mod/settings.php:1209
-msgid "Default Post Permissions"
-msgstr "默认文章权限"
-
-#: mod/settings.php:1210
-msgid "(click to open/close)"
-msgstr "（点击来打开/关闭）"
-
-#: mod/settings.php:1220
-msgid "Default Private Post"
-msgstr "默认私人文章"
-
-#: mod/settings.php:1221
-msgid "Default Public Post"
-msgstr "默认公开文章"
-
-#: mod/settings.php:1225
-msgid "Default Permissions for New Posts"
-msgstr "新文章的默认权限"
-
-#: mod/settings.php:1237
-msgid "Maximum private messages per day from unknown people:"
-msgstr "每天来自未知的人的私信："
-
-#: mod/settings.php:1240
-msgid "Notification Settings"
-msgstr "通知设置"
-
-#: mod/settings.php:1241
-msgid "Send a notification email when:"
-msgstr "发一个消息要是："
-
-#: mod/settings.php:1242
-msgid "You receive an introduction"
-msgstr "你收到一份介绍"
-
-#: mod/settings.php:1243
-msgid "Your introductions are confirmed"
-msgstr "你的介绍被确认了"
-
-#: mod/settings.php:1244
-msgid "Someone writes on your profile wall"
-msgstr "某人写在你的简历墙"
-
-#: mod/settings.php:1245
-msgid "Someone writes a followup comment"
-msgstr "某人写一个后续的评论"
-
-#: mod/settings.php:1246
-msgid "You receive a private message"
-msgstr "你收到一封私信"
-
-#: mod/settings.php:1247
-msgid "You receive a friend suggestion"
-msgstr "你受到一个朋友建议"
-
-#: mod/settings.php:1248
-msgid "You are tagged in a post"
-msgstr "你被在新闻标签"
-
-#: mod/settings.php:1249
-msgid "You are poked/prodded/etc. in a post"
-msgstr "您在文章被戳"
-
-#: mod/settings.php:1251
-msgid "Activate desktop notifications"
-msgstr "启用桌面通知"
-
-#: mod/settings.php:1251
-msgid "Show desktop popup on new notifications"
-msgstr "在有新的提示时显示桌面弹出窗口"
-
-#: mod/settings.php:1253
-msgid "Text-only notification emails"
-msgstr "纯文本通知邮件"
-
-#: mod/settings.php:1255
-msgid "Send text only notification emails, without the html part"
-msgstr "发送纯文本通知邮件，无 html 部分"
-
-#: mod/settings.php:1257
-msgid "Show detailled notifications"
-msgstr "显示详细通知"
-
-#: mod/settings.php:1259
-msgid ""
-"Per default, notifications are condensed to a single notification per item. "
-"When enabled every notification is displayed."
-msgstr ""
-
-#: mod/settings.php:1261
-msgid "Advanced Account/Page Type Settings"
-msgstr "专家账户／页种设置"
-
-#: mod/settings.php:1262
-msgid "Change the behaviour of this account for special situations"
-msgstr "把这个账户特别情况的时候行动变化"
-
-#: mod/settings.php:1265
-msgid "Relocate"
-msgstr "调动"
-
-#: mod/settings.php:1266
-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:1267
-msgid "Resend relocate message to contacts"
-msgstr "把调动信息寄给熟人"
-
-#: mod/subthread.php:117
+#: src/Database/DBStructure.php:473
 #, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s关注着%2$s的%3$s"
+msgid "%s: updating %s table."
+msgstr "%s: 正在更新 %s 表。"
 
-#: mod/update_community.php:27 mod/update_display.php:27
-#: mod/update_network.php:33 mod/update_notes.php:40 mod/update_profile.php:39
-msgid "[Embedded content - reload page to view]"
-msgstr "[嵌入内容－重新加载页为看]"
-
-#: mod/videos.php:139
-msgid "Do you really want to delete this video?"
-msgstr "你真的想删除这个视频吗？"
-
-#: mod/videos.php:144
-msgid "Delete Video"
-msgstr "删除视频"
-
-#: mod/videos.php:207
-msgid "No videos selected"
-msgstr "没有视频被选择"
-
-#: mod/videos.php:396
-msgid "Recent Videos"
-msgstr "最近的视频"
-
-#: mod/videos.php:398
-msgid "Upload New Videos"
-msgstr "上传新视频"
-
-#: view/theme/duepuntozero/config.php:54 src/Model/User.php:504
-msgid "default"
-msgstr "默认"
-
-#: view/theme/duepuntozero/config.php:55
-msgid "greenzero"
-msgstr "greenzero"
-
-#: view/theme/duepuntozero/config.php:56
-msgid "purplezero"
-msgstr "purplezero"
-
-#: view/theme/duepuntozero/config.php:57
-msgid "easterbunny"
-msgstr "easterbunny"
-
-#: view/theme/duepuntozero/config.php:58
-msgid "darkzero"
-msgstr "darkzero"
-
-#: view/theme/duepuntozero/config.php:59
-msgid "comix"
-msgstr "comix"
-
-#: view/theme/duepuntozero/config.php:60
-msgid "slackr"
-msgstr "slackr"
-
-#: view/theme/duepuntozero/config.php:74
-msgid "Variations"
-msgstr "变化"
-
-#: view/theme/frio/php/Image.php:24
-msgid "Top Banner"
-msgstr ""
-
-#: view/theme/frio/php/Image.php:24
-msgid ""
-"Resize image to the width of the screen and show background color below on "
-"long pages."
-msgstr ""
-
-#: view/theme/frio/php/Image.php:25
-msgid "Full screen"
-msgstr ""
-
-#: view/theme/frio/php/Image.php:25
-msgid ""
-"Resize image to fill entire screen, clipping either the right or the bottom."
-msgstr ""
-
-#: view/theme/frio/php/Image.php:26
-msgid "Single row mosaic"
-msgstr ""
-
-#: view/theme/frio/php/Image.php:26
-msgid ""
-"Resize image to repeat it on a single row, either vertical or horizontal."
-msgstr ""
-
-#: view/theme/frio/php/Image.php:27
-msgid "Mosaic"
-msgstr ""
-
-#: view/theme/frio/php/Image.php:27
-msgid "Repeat image to fill the screen."
-msgstr ""
-
-#: view/theme/frio/config.php:102
-msgid "Custom"
-msgstr ""
-
-#: view/theme/frio/config.php:114
-msgid "Note"
-msgstr "便条"
-
-#: view/theme/frio/config.php:114
-msgid "Check image permissions if all users are allowed to see the image"
-msgstr ""
-
-#: view/theme/frio/config.php:121
-msgid "Select color scheme"
-msgstr ""
-
-#: view/theme/frio/config.php:122
-msgid "Navigation bar background color"
-msgstr ""
-
-#: view/theme/frio/config.php:123
-msgid "Navigation bar icon color "
-msgstr ""
-
-#: view/theme/frio/config.php:124
-msgid "Link color"
-msgstr "链接颜色"
-
-#: view/theme/frio/config.php:125
-msgid "Set the background color"
-msgstr "设置背景色"
-
-#: view/theme/frio/config.php:126
-msgid "Content background opacity"
-msgstr ""
-
-#: view/theme/frio/config.php:127
-msgid "Set the background image"
-msgstr "设置背景图片"
-
-#: view/theme/frio/config.php:128
-msgid "Background image style"
-msgstr ""
-
-#: view/theme/frio/config.php:133
-msgid "Login page background image"
-msgstr "登录页面背景图片"
-
-#: view/theme/frio/config.php:137
-msgid "Login page background color"
-msgstr "登录页面背景色"
-
-#: view/theme/frio/config.php:137
-msgid "Leave background image and color empty for theme defaults"
-msgstr ""
-
-#: view/theme/frio/theme.php:238
-msgid "Guest"
-msgstr ""
-
-#: view/theme/frio/theme.php:243
-msgid "Visitor"
-msgstr "访客"
-
-#: view/theme/frio/theme.php:256 src/Content/Nav.php:97
-#: src/Module/Login.php:312
-msgid "Logout"
-msgstr "注销"
-
-#: view/theme/frio/theme.php:256 src/Content/Nav.php:97
-msgid "End this session"
-msgstr "结束此次会话"
-
-#: view/theme/frio/theme.php:259 src/Content/Nav.php:100
-#: src/Content/Nav.php:186
-msgid "Your posts and conversations"
-msgstr "你的消息和交谈"
-
-#: view/theme/frio/theme.php:260 src/Content/Nav.php:101
-msgid "Your profile page"
-msgstr "你的简介页"
-
-#: view/theme/frio/theme.php:261 src/Content/Nav.php:102
-msgid "Your photos"
-msgstr "你的照片"
-
-#: view/theme/frio/theme.php:262 src/Content/Nav.php:103
-#: src/Model/Profile.php:910 src/Model/Profile.php:913
-msgid "Videos"
-msgstr "视频"
-
-#: view/theme/frio/theme.php:262 src/Content/Nav.php:103
-msgid "Your videos"
-msgstr "你的视频"
-
-#: view/theme/frio/theme.php:263 src/Content/Nav.php:104
-msgid "Your events"
-msgstr "你的项目"
-
-#: view/theme/frio/theme.php:266 src/Content/Nav.php:183
-msgid "Conversations from your friends"
-msgstr "来自你的朋友们的交谈"
-
-#: view/theme/frio/theme.php:267 src/Content/Nav.php:170
-#: src/Model/Profile.php:925 src/Model/Profile.php:936
-msgid "Events and Calendar"
-msgstr "事件和日历"
-
-#: view/theme/frio/theme.php:268 src/Content/Nav.php:196
-msgid "Private mail"
-msgstr "私人的邮件"
-
-#: view/theme/frio/theme.php:269 src/Content/Nav.php:207
-msgid "Account settings"
-msgstr "帐户设置"
-
-#: view/theme/frio/theme.php:270 src/Content/Nav.php:213
-msgid "Manage/edit friends and contacts"
-msgstr "管理/编辑朋友和联系人"
-
-#: view/theme/quattro/config.php:76
-msgid "Alignment"
-msgstr "对齐"
-
-#: view/theme/quattro/config.php:76
-msgid "Left"
-msgstr "左边"
-
-#: view/theme/quattro/config.php:76
-msgid "Center"
-msgstr "中间"
-
-#: view/theme/quattro/config.php:77
-msgid "Color scheme"
-msgstr "色彩方案"
-
-#: view/theme/quattro/config.php:78
-msgid "Posts font size"
-msgstr "文章"
-
-#: view/theme/quattro/config.php:79
-msgid "Textareas font size"
-msgstr "文本区字体大小"
-
-#: view/theme/vier/config.php:75
-msgid "Comma separated list of helper forums"
-msgstr ""
-
-#: view/theme/vier/config.php:115 src/Core/ACL.php:309
-msgid "don't show"
-msgstr "不要显示"
-
-#: view/theme/vier/config.php:115 src/Core/ACL.php:308
-msgid "show"
-msgstr "显示"
-
-#: view/theme/vier/config.php:122
-msgid "Set style"
-msgstr "设置风格"
-
-#: view/theme/vier/config.php:123
-msgid "Community Pages"
-msgstr "社会页"
-
-#: view/theme/vier/config.php:124 view/theme/vier/theme.php:150
-msgid "Community Profiles"
-msgstr "社会简介"
-
-#: view/theme/vier/config.php:125
-msgid "Help or @NewHere ?"
-msgstr "需要帮助或@第一次来这儿？"
-
-#: view/theme/vier/config.php:126 view/theme/vier/theme.php:388
-msgid "Connect Services"
-msgstr "连接服务"
-
-#: view/theme/vier/config.php:127
-msgid "Find Friends"
-msgstr "找朋友们"
-
-#: view/theme/vier/config.php:128 view/theme/vier/theme.php:181
-msgid "Last users"
-msgstr "上次用户"
-
-#: view/theme/vier/theme.php:199 src/Content/Widget.php:59
-msgid "Find People"
-msgstr "找人物"
-
-#: view/theme/vier/theme.php:200 src/Content/Widget.php:60
-msgid "Enter name or interest"
-msgstr "输入名字或兴趣"
-
-#: view/theme/vier/theme.php:202 src/Content/Widget.php:62
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "比如：李某，打鱼"
-
-#: view/theme/vier/theme.php:205 src/Content/Widget.php:65
-msgid "Similar Interests"
-msgstr "相似兴趣"
-
-#: view/theme/vier/theme.php:206 src/Content/Widget.php:66
-msgid "Random Profile"
-msgstr "随机简介"
-
-#: view/theme/vier/theme.php:207 src/Content/Widget.php:67
-msgid "Invite Friends"
-msgstr "邀请朋友们"
-
-#: view/theme/vier/theme.php:210 src/Content/Widget.php:70
-msgid "Local Directory"
-msgstr "本地目录"
-
-#: view/theme/vier/theme.php:255 src/Content/ForumManager.php:127
-msgid "External link to forum"
-msgstr "到论坛的外链"
-
-#: view/theme/vier/theme.php:291
-msgid "Quick Start"
-msgstr "快速入门"
-
-#: src/Core/UserImport.php:104
-msgid "Error decoding account file"
-msgstr "解码账户文件出错误"
-
-#: src/Core/UserImport.php:110
-msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr "错误！文件没有版本数！这不是Friendica账户文件吗？"
-
-#: src/Core/UserImport.php:118
-#, php-format
-msgid "User '%s' already exists on this server!"
-msgstr "用户「%s」已经存在这个服务器！"
-
-#: src/Core/UserImport.php:151
-msgid "User creation error"
-msgstr "用户创建错误"
-
-#: src/Core/UserImport.php:169
-msgid "User profile creation error"
-msgstr "用户简介创建错误"
-
-#: src/Core/UserImport.php:213
-#, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] "%d 个联系人没导入"
-
-#: src/Core/UserImport.php:278
-msgid "Done. You can now login with your username and password"
-msgstr "完成。你现在可以用你的用户名和密码登录"
-
-#: src/Core/ACL.php:295
-msgid "Post to Email"
-msgstr "电邮发布"
-
-#: src/Core/ACL.php:301
-msgid "Hide your profile details from unknown viewers?"
-msgstr "使简介信息给陌生的看着看不了？"
-
-#: src/Core/ACL.php:300
-#, php-format
-msgid "Connectors disabled, since \"%s\" is enabled."
-msgstr "连接器已停用，因为\"%s\"启用。"
-
-#: src/Core/ACL.php:307
-msgid "Visible to everybody"
-msgstr "任何人可见的"
-
-#: src/Core/ACL.php:319
-msgid "Close"
-msgstr "关闭"
-
-#: src/Core/Console/NewPassword.php:78
-msgid "Enter new password: "
-msgstr ""
-
-#: src/Core/Console/NewPassword.php:83 src/Model/User.php:262
-msgid "Password can't be empty"
-msgstr ""
-
-#: src/Core/Console/ArchiveContact.php:67
-#, php-format
-msgid "Could not find any unarchived contact entry for this URL (%s)"
-msgstr ""
-
-#: src/Core/Console/ArchiveContact.php:72
-msgid "The contact entries have been archived"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:171
-msgid "System"
-msgstr "系统"
-
-#: src/Core/NotificationsManager.php:192 src/Content/Nav.php:124
-#: src/Content/Nav.php:186
-msgid "Home"
-msgstr "主页"
-
-#: src/Core/NotificationsManager.php:199 src/Content/Nav.php:190
-msgid "Introductions"
-msgstr "介绍"
-
-#: src/Core/NotificationsManager.php:256 src/Core/NotificationsManager.php:268
-#, php-format
-msgid "%s commented on %s's post"
-msgstr "%s 在 %s 的文章发表了评论"
-
-#: src/Core/NotificationsManager.php:267
-#, php-format
-msgid "%s created a new post"
-msgstr "%s 创建了一个新文章"
-
-#: src/Core/NotificationsManager.php:281
-#, php-format
-msgid "%s liked %s's post"
-msgstr "%s喜欢了%s的消息"
-
-#: src/Core/NotificationsManager.php:294
-#, php-format
-msgid "%s disliked %s's post"
-msgstr "%s不喜欢了%s的消息"
-
-#: src/Core/NotificationsManager.php:307
-#, php-format
-msgid "%s is attending %s's event"
-msgstr "%s 正在参加 %s 的事件"
-
-#: src/Core/NotificationsManager.php:320
-#, php-format
-msgid "%s is not attending %s's event"
-msgstr "%s 不在参加 %s 的事件"
-
-#: src/Core/NotificationsManager.php:333
-#, php-format
-msgid "%s may attend %s's event"
-msgstr "%s 可以参加 %s 的事件"
-
-#: src/Core/NotificationsManager.php:350
-#, php-format
-msgid "%s is now friends with %s"
-msgstr "%s成为%s的朋友"
-
-#: src/Core/NotificationsManager.php:825
-msgid "Friend Suggestion"
-msgstr "朋友建议"
-
-#: src/Core/NotificationsManager.php:851
-msgid "Friend/Connect Request"
-msgstr "友谊／联络要求"
-
-#: src/Core/NotificationsManager.php:851
-msgid "New Follower"
-msgstr "新关注者"
-
-#: src/Core/Install.php:157
+#: src/Core/Install.php:138
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "没找到命令行PHP在网服务器PATH。"
 
-#: src/Core/Install.php:158
+#: src/Core/Install.php:139
 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 "
@@ -7763,223 +7793,632 @@ msgid ""
 "up-the-worker'>'Setup the worker'</a>"
 msgstr ""
 
-#: src/Core/Install.php:162
+#: src/Core/Install.php:143
 msgid "PHP executable path"
 msgstr "PHP可执行路径"
 
-#: src/Core/Install.php:162
+#: src/Core/Install.php:143
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr "输入全路线到php执行程序。您会留空白为继续安装。"
 
-#: src/Core/Install.php:167
+#: src/Core/Install.php:148
 msgid "Command line PHP"
 msgstr "命令行PHP"
 
-#: src/Core/Install.php:176
+#: src/Core/Install.php:157
 msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
 msgstr "PHP执行程序不是命令行PHP執行檔（有可能是cgi-fgci版本）"
 
-#: src/Core/Install.php:177
+#: src/Core/Install.php:158
 msgid "Found PHP version: "
 msgstr "找到 PHP 版本："
 
-#: src/Core/Install.php:179
+#: src/Core/Install.php:160
 msgid "PHP cli binary"
 msgstr "命令行PHP執行檔"
 
-#: src/Core/Install.php:189
+#: src/Core/Install.php:170
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "您系统的命令行PHP没有能够「register_argc_argv」。"
 
-#: src/Core/Install.php:190
+#: src/Core/Install.php:171
 msgid "This is required for message delivery to work."
 msgstr "这必要为通信发布成功。"
 
-#: src/Core/Install.php:192
+#: src/Core/Install.php:173
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: src/Core/Install.php:220
+#: src/Core/Install.php:201
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "错误：这系统的「register_argc_argv」子程序不能产生加密钥匙"
 
-#: src/Core/Install.php:221
+#: src/Core/Install.php:202
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "如果您用Windows，请看「http://www.php.net/manual/en/openssl.installation.php」。"
 
-#: src/Core/Install.php:223
+#: src/Core/Install.php:204
 msgid "Generate encryption keys"
 msgstr "产生加密钥匙"
 
-#: src/Core/Install.php:244
+#: src/Core/Install.php:225
 msgid "libCurl PHP module"
 msgstr "libCurl PHP模块"
 
-#: src/Core/Install.php:245
+#: src/Core/Install.php:226
 msgid "GD graphics PHP module"
 msgstr "GD显示PHP模块"
 
-#: src/Core/Install.php:246
+#: src/Core/Install.php:227
 msgid "OpenSSL PHP module"
 msgstr "OpenSSL PHP模块"
 
-#: src/Core/Install.php:247
+#: src/Core/Install.php:228
 msgid "PDO or MySQLi PHP module"
 msgstr "PDO 或者 MySQLi PHP 模块"
 
-#: src/Core/Install.php:248
+#: src/Core/Install.php:229
 msgid "mb_string PHP module"
 msgstr "mb_string PHP模块"
 
-#: src/Core/Install.php:249
+#: src/Core/Install.php:230
 msgid "XML PHP module"
 msgstr "XML PHP 模块"
 
-#: src/Core/Install.php:250
+#: src/Core/Install.php:231
 msgid "iconv PHP module"
 msgstr "iconv PHP 模块"
 
-#: src/Core/Install.php:251
+#: src/Core/Install.php:232
 msgid "POSIX PHP module"
 msgstr "POSIX PHP 模块"
 
-#: src/Core/Install.php:255 src/Core/Install.php:257
+#: src/Core/Install.php:236 src/Core/Install.php:238
 msgid "Apache mod_rewrite module"
 msgstr "Apache mod_rewrite部件"
 
-#: src/Core/Install.php:255
+#: src/Core/Install.php:236
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "错误：Apache服务器的mod-rewrite模块是必要的可却不安装的。"
 
-#: src/Core/Install.php:263
+#: src/Core/Install.php:244
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "错误：libCurl PHP模块是必要的可却不安装的。"
 
-#: src/Core/Install.php:267
+#: src/Core/Install.php:248
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "错误：GD显示PHP模块跟JPEG支持是必要的可却安装的。"
 
-#: src/Core/Install.php:271
+#: src/Core/Install.php:252
 msgid "Error: openssl PHP module required but not installed."
 msgstr "错误：openssl PHP模块是必要的可却不安装的。"
 
-#: src/Core/Install.php:275
+#: src/Core/Install.php:256
 msgid "Error: PDO or MySQLi PHP module required but not installed."
 msgstr ""
 
-#: src/Core/Install.php:279
+#: src/Core/Install.php:260
 msgid "Error: The MySQL driver for PDO is not installed."
 msgstr "错误：MySQL 的 PHP 数据对象 (PDO) 扩展驱动未安装。"
 
-#: src/Core/Install.php:283
+#: src/Core/Install.php:264
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "错误：mbstring PHP模块必要可没安装的。"
 
-#: src/Core/Install.php:287
+#: src/Core/Install.php:268
 msgid "Error: iconv PHP module required but not installed."
 msgstr "错误：需要 iconv PHP 模块但它并没有被安装。"
 
-#: src/Core/Install.php:291
+#: src/Core/Install.php:272
 msgid "Error: POSIX PHP module required but not installed."
 msgstr ""
 
-#: src/Core/Install.php:301
+#: src/Core/Install.php:282
 msgid "Error, XML PHP module required but not installed."
 msgstr "部件错误，需要 XML PHP 模块但它并没有被安装。"
 
-#: src/Core/Install.php:320
+#: src/Core/Install.php:301
 msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\""
-" in the top folder of your web server and it is unable to do so."
-msgstr "网页安装器要创建一个叫 \".htconfig.php\" 的文件在你的 web 服务器的顶层目录下，但无法这么做。"
+"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/Install.php:321
+#: src/Core/Install.php:302
 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/Install.php:322
+#: src/Core/Install.php:303
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Friendica top folder."
-msgstr "这个步骤头，我们给您正文要保存在叫.htconfig.php的文件在您Friendica主文件夹。"
+"named local.ini.php in your Friendica \"config\" folder."
+msgstr ""
 
-#: src/Core/Install.php:323
+#: src/Core/Install.php:304
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation."
 " Please see the file \"INSTALL.txt\" for instructions."
 msgstr "或者您会这个步骤不做还是实行手动的安装。请看INSTALL.txt文件为说明。"
 
-#: src/Core/Install.php:326
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php是可写的"
+#: src/Core/Install.php:307
+msgid "config/local.ini.php is writable"
+msgstr ""
 
-#: src/Core/Install.php:344
+#: src/Core/Install.php:325
 msgid ""
 "Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
 "compiles templates to PHP to speed up rendering."
 msgstr "Friendica用Smarty3模板机车为建筑网页。Smarty3把模板编译成PHP为催建筑网页。"
 
-#: src/Core/Install.php:345
+#: src/Core/Install.php:326
 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 "为了保存这些模板，网服务器要写权利于view/smarty3/目录在Friendica主目录下。"
 
-#: src/Core/Install.php:346
+#: src/Core/Install.php:327
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
 msgstr "请保险您网服务器用户（比如www-data）有这个目录的写权利。"
 
-#: src/Core/Install.php:347
+#: src/Core/Install.php:328
 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 "注意：为了安全，您应该只给网服务器写权利于view/smarty3/－没有模板文件（.tpl）之下。"
 
-#: src/Core/Install.php:350
+#: src/Core/Install.php:331
 msgid "view/smarty3 is writable"
 msgstr "能写view/smarty3"
 
-#: src/Core/Install.php:375
+#: src/Core/Install.php:356
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 msgstr "在 .htaccess 中的 URL 重写不工作。请检查你的服务器配置。"
 
-#: src/Core/Install.php:377
+#: src/Core/Install.php:358
 msgid "Error message from Curl when fetching"
 msgstr ""
 
-#: src/Core/Install.php:381
+#: src/Core/Install.php:362
 msgid "Url rewrite is working"
 msgstr "URL改写发挥机能"
 
-#: src/Core/Install.php:408
+#: src/Core/Install.php:389
 msgid "ImageMagick PHP extension is not installed"
 msgstr "ImageMagick PHP 扩展没有安装"
 
-#: src/Core/Install.php:410
+#: src/Core/Install.php:391
 msgid "ImageMagick PHP extension is installed"
 msgstr "ImageMagick PHP 扩展已安装"
 
-#: src/Core/Install.php:412
+#: src/Core/Install.php:393
 msgid "ImageMagick supports GIF"
 msgstr "ImageMagick 支持 GIF"
 
-#: src/Util/Temporal.php:147 src/Model/Profile.php:756
+#: src/Core/ACL.php:284
+msgid "Post to Email"
+msgstr "电邮发布"
+
+#: src/Core/ACL.php:290
+msgid "Hide your profile details from unknown viewers?"
+msgstr "使简介信息给陌生的看着看不了？"
+
+#: src/Core/ACL.php:289
+#, php-format
+msgid "Connectors disabled, since \"%s\" is enabled."
+msgstr "连接器已停用，因为\"%s\"启用。"
+
+#: src/Core/ACL.php:296
+msgid "Visible to everybody"
+msgstr "任何人可见的"
+
+#: src/Core/ACL.php:308
+msgid "Close"
+msgstr "关闭"
+
+#: src/Core/Console/ArchiveContact.php:65
+#, php-format
+msgid "Could not find any unarchived contact entry for this URL (%s)"
+msgstr ""
+
+#: src/Core/Console/ArchiveContact.php:70
+msgid "The contact entries have been archived"
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:32
+msgid "Execute pending post updates."
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:38
+msgid "All pending post updates are done."
+msgstr ""
+
+#: src/Core/Console/NewPassword.php:73
+msgid "Enter new password: "
+msgstr ""
+
+#: src/Core/Console/NewPassword.php:78 src/Model/User.php:269
+msgid "Password can't be empty"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:172
+msgid "System"
+msgstr "系统"
+
+#: src/Core/NotificationsManager.php:193 src/Content/Nav.php:124
+#: src/Content/Nav.php:186
+msgid "Home"
+msgstr "主页"
+
+#: src/Core/NotificationsManager.php:200 src/Content/Nav.php:190
+msgid "Introductions"
+msgstr "介绍"
+
+#: src/Core/NotificationsManager.php:262 src/Core/NotificationsManager.php:274
+#, php-format
+msgid "%s commented on %s's post"
+msgstr "%s 在 %s 的文章发表了评论"
+
+#: src/Core/NotificationsManager.php:273
+#, php-format
+msgid "%s created a new post"
+msgstr "%s 创建了一个新文章"
+
+#: src/Core/NotificationsManager.php:287
+#, php-format
+msgid "%s liked %s's post"
+msgstr "%s喜欢了%s的消息"
+
+#: src/Core/NotificationsManager.php:300
+#, php-format
+msgid "%s disliked %s's post"
+msgstr "%s不喜欢了%s的消息"
+
+#: src/Core/NotificationsManager.php:313
+#, php-format
+msgid "%s is attending %s's event"
+msgstr "%s 正在参加 %s 的事件"
+
+#: src/Core/NotificationsManager.php:326
+#, php-format
+msgid "%s is not attending %s's event"
+msgstr "%s 不在参加 %s 的事件"
+
+#: src/Core/NotificationsManager.php:339
+#, php-format
+msgid "%s may attend %s's event"
+msgstr "%s 可以参加 %s 的事件"
+
+#: src/Core/NotificationsManager.php:360
+#, php-format
+msgid "%s is now friends with %s"
+msgstr "%s成为%s的朋友"
+
+#: src/Core/NotificationsManager.php:626
+msgid "Friend Suggestion"
+msgstr "朋友建议"
+
+#: src/Core/NotificationsManager.php:656
+msgid "Friend/Connect Request"
+msgstr "友谊／联络要求"
+
+#: src/Core/NotificationsManager.php:656
+msgid "New Follower"
+msgstr "新关注者"
+
+#: src/Core/UserImport.php:100
+msgid "Error decoding account file"
+msgstr "解码账户文件出错误"
+
+#: src/Core/UserImport.php:106
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr "错误！文件没有版本数！这不是Friendica账户文件吗？"
+
+#: src/Core/UserImport.php:114
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr "用户「%s」已经存在这个服务器！"
+
+#: src/Core/UserImport.php:147
+msgid "User creation error"
+msgstr "用户创建错误"
+
+#: src/Core/UserImport.php:165
+msgid "User profile creation error"
+msgstr "用户简介创建错误"
+
+#: src/Core/UserImport.php:209
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] "%d 个联系人没导入"
+
+#: src/Core/UserImport.php:274
+msgid "Done. You can now login with your username and password"
+msgstr "完成。你现在可以用你的用户名和密码登录"
+
+#: src/Worker/Delivery.php:423
+msgid "(no subject)"
+msgstr "（无主题）"
+
+#: src/Object/Post.php:130
+msgid "This entry was edited"
+msgstr "这个条目被编辑了"
+
+#: src/Object/Post.php:190
+msgid "Delete globally"
+msgstr ""
+
+#: src/Object/Post.php:190
+msgid "Remove locally"
+msgstr ""
+
+#: src/Object/Post.php:203
+msgid "save to folder"
+msgstr "保存在文件夹"
+
+#: src/Object/Post.php:232
+msgid "I will attend"
+msgstr "我将会参加"
+
+#: src/Object/Post.php:232
+msgid "I will not attend"
+msgstr "我将不会参加"
+
+#: src/Object/Post.php:232
+msgid "I might attend"
+msgstr "我可能会参加"
+
+#: src/Object/Post.php:259
+msgid "ignore thread"
+msgstr "忽视主题"
+
+#: src/Object/Post.php:260
+msgid "unignore thread"
+msgstr "取消忽视主题"
+
+#: src/Object/Post.php:261
+msgid "toggle ignore status"
+msgstr "切换忽视状态"
+
+#: src/Object/Post.php:272
+msgid "add star"
+msgstr "加星"
+
+#: src/Object/Post.php:273
+msgid "remove star"
+msgstr "消星"
+
+#: src/Object/Post.php:274
+msgid "toggle star status"
+msgstr "转变星现状"
+
+#: src/Object/Post.php:277
+msgid "starred"
+msgstr "已标星"
+
+#: src/Object/Post.php:282
+msgid "add tag"
+msgstr "加标签"
+
+#: src/Object/Post.php:293
+msgid "like"
+msgstr "喜欢"
+
+#: src/Object/Post.php:294
+msgid "dislike"
+msgstr "不喜欢"
+
+#: src/Object/Post.php:297
+msgid "Share this"
+msgstr "分享这个"
+
+#: src/Object/Post.php:297
+msgid "share"
+msgstr "分享"
+
+#: src/Object/Post.php:364
+msgid "to"
+msgstr "至"
+
+#: src/Object/Post.php:365
+msgid "via"
+msgstr "经过"
+
+#: src/Object/Post.php:366
+msgid "Wall-to-Wall"
+msgstr "从墙到墙"
+
+#: src/Object/Post.php:367
+msgid "via Wall-To-Wall:"
+msgstr "通过从墙到墙"
+
+#: src/Object/Post.php:426
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d 条评论"
+
+#: src/Object/Post.php:796
+msgid "Bold"
+msgstr "粗体"
+
+#: src/Object/Post.php:797
+msgid "Italic"
+msgstr "斜体"
+
+#: src/Object/Post.php:798
+msgid "Underline"
+msgstr "下划线"
+
+#: src/Object/Post.php:799
+msgid "Quote"
+msgstr "引语"
+
+#: src/Object/Post.php:800
+msgid "Code"
+msgstr "源代码"
+
+#: src/Object/Post.php:801
+msgid "Image"
+msgstr "图片"
+
+#: src/Object/Post.php:802
+msgid "Link"
+msgstr "链接"
+
+#: src/Object/Post.php:803
+msgid "Video"
+msgstr "录像"
+
+#: src/App.php:785
+msgid "Delete this item?"
+msgstr "删除这个项目？"
+
+#: src/App.php:787
+msgid "show fewer"
+msgstr "显示更小"
+
+#: src/App.php:1385
+msgid "No system theme config value set."
+msgstr ""
+
+#: src/Module/Logout.php:28
+msgid "Logged out."
+msgstr "已注销。"
+
+#: src/Module/Login.php:100 src/Model/User.php:408
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "我们用您输入的OpenID登录的时候碰到问题。请核实拼法是对的。"
+
+#: src/Module/Login.php:100 src/Model/User.php:408
+msgid "The error message was:"
+msgstr "错误通知是："
+
+#: src/Module/Login.php:280
+msgid "Create a New Account"
+msgstr "创建新的账户"
+
+#: src/Module/Login.php:313
+msgid "Password: "
+msgstr "密码："
+
+#: src/Module/Login.php:314
+msgid "Remember me"
+msgstr "记住我"
+
+#: src/Module/Login.php:317
+msgid "Or login using OpenID: "
+msgstr "或者使用 OpenID 登录: "
+
+#: src/Module/Login.php:323
+msgid "Forgot your password?"
+msgstr "忘记你的密码吗？"
+
+#: src/Module/Login.php:326
+msgid "Website Terms of Service"
+msgstr "网站服务条款"
+
+#: src/Module/Login.php:327
+msgid "terms of service"
+msgstr "服务条款"
+
+#: src/Module/Login.php:329
+msgid "Website Privacy Policy"
+msgstr "网站隐私政策"
+
+#: src/Module/Login.php:330
+msgid "privacy policy"
+msgstr "隐私政策"
+
+#: src/Module/Tos.php:34 src/Module/Tos.php:74
+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"
+" name), an username (nickname) and a working email address. The names will "
+"be accessible on the profile page of the account by any visitor of the page,"
+" even if other profile details are not displayed. The email address will "
+"only be used to send the user notifications about interactions, but wont be "
+"visibly displayed. The listing of an account in the node's user directory or"
+" the global user directory is optional and can be controlled in the user "
+"settings, it is not necessary for communication."
+msgstr ""
+
+#: src/Module/Tos.php:35 src/Module/Tos.php:75
+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
+#, php-format
+msgid ""
+"At any point in time a logged in user can export their account data from the"
+" <a href=\"%1$s/settings/uexport\">account settings</a>. If the user wants "
+"to delete their account they can do so at <a "
+"href=\"%1$s/removeme\">%1$s/removeme</a>. The deletion of the account will "
+"be permanent. Deletion of the data will also be requested from the nodes of "
+"the communication partners."
+msgstr ""
+
+#: src/Module/Tos.php:39 src/Module/Tos.php:73
+msgid "Privacy Statement"
+msgstr "隐私声明"
+
+#: src/Protocol/OStatus.php:1813
+#, php-format
+msgid "%s is now following %s."
+msgstr "%s 正在关注 %s."
+
+#: src/Protocol/OStatus.php:1814
+msgid "following"
+msgstr "关注"
+
+#: src/Protocol/OStatus.php:1817
+#, php-format
+msgid "%s stopped following %s."
+msgstr "%s 停止关注了 %s."
+
+#: src/Protocol/OStatus.php:1818
+msgid "stopped following"
+msgstr "取消关注"
+
+#: src/Protocol/DFRN.php:1525 src/Model/Contact.php:1956
+#, php-format
+msgid "%s's birthday"
+msgstr "%s的生日"
+
+#: src/Protocol/DFRN.php:1526 src/Model/Contact.php:1957
+#, php-format
+msgid "Happy Birthday %s"
+msgstr "生日快乐%s"
+
+#: src/Protocol/Diaspora.php:2417
+msgid "Sharing notification from Diaspora network"
+msgstr "分享通知从Diaspora网络"
+
+#: src/Protocol/Diaspora.php:3514
+msgid "Attachments:"
+msgstr "附件："
+
+#: src/Util/Temporal.php:147 src/Model/Profile.php:745
 msgid "Birthday:"
 msgstr "生日："
 
@@ -8044,363 +8483,438 @@ msgstr "秒"
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s以前"
 
-#: src/Content/Text/BBCode.php:426
-msgid "view full size"
-msgstr "看全尺寸"
+#: src/Model/Mail.php:39 src/Model/Mail.php:171
+msgid "[no subject]"
+msgstr "[无题目]"
 
-#: src/Content/Text/BBCode.php:852 src/Content/Text/BBCode.php:1621
-#: src/Content/Text/BBCode.php:1622
-msgid "Image/photo"
-msgstr "图像／照片"
+#: src/Model/Contact.php:942
+msgid "Drop Contact"
+msgstr "删除联系人"
 
-#: src/Content/Text/BBCode.php:990
-#, php-format
-msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
+#: src/Model/Contact.php:1399
+msgid "Organisation"
+msgstr "组织"
+
+#: src/Model/Contact.php:1403
+msgid "News"
+msgstr "新闻"
+
+#: src/Model/Contact.php:1407
+msgid "Forum"
+msgstr "论坛"
+
+#: src/Model/Contact.php:1587
+msgid "Connect URL missing."
+msgstr "连接URL失踪的。"
+
+#: src/Model/Contact.php:1596
+msgid ""
+"The contact could not be added. Please check the relevant network "
+"credentials in your Settings -> Social Networks page."
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1548 src/Content/Text/BBCode.php:1570
-msgid "$1 wrote:"
-msgstr "$1写："
+#: src/Model/Contact.php:1635
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr "这网站没配置允许跟别的网络交流."
 
-#: src/Content/Text/BBCode.php:1630 src/Content/Text/BBCode.php:1631
-msgid "Encrypted content"
-msgstr "加密的内容"
+#: src/Model/Contact.php:1636 src/Model/Contact.php:1650
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr "没有兼容协议或者摘要找到了."
 
-#: src/Content/Text/BBCode.php:1750
-msgid "Invalid source protocol"
-msgstr "无效的源协议"
+#: src/Model/Contact.php:1648
+msgid "The profile address specified does not provide adequate information."
+msgstr "输入的简介地址没有够消息。"
 
-#: src/Content/Text/BBCode.php:1761
-msgid "Invalid link protocol"
-msgstr "无效的连接协议"
+#: src/Model/Contact.php:1653
+msgid "An author or name was not found."
+msgstr "找不到作者或名。"
 
-#: src/Content/OEmbed.php:253
-msgid "Embedding disabled"
-msgstr "嵌入已停用"
+#: src/Model/Contact.php:1656
+msgid "No browser URL could be matched to this address."
+msgstr "这个地址没有符合什么游览器URL。"
 
-#: src/Content/OEmbed.php:373
-msgid "Embedded content"
-msgstr "嵌入内容"
+#: src/Model/Contact.php:1659
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
+msgstr "无法匹配一个@-风格的身份地址和一个已知的协议或电子邮件联系人。"
 
-#: src/Content/Widget/CalendarExport.php:61
-msgid "Export"
-msgstr "导出"
+#: src/Model/Contact.php:1660
+msgid "Use mailto: in front of address to force email check."
+msgstr "输入mailto:地址前为要求电子邮件检查。"
 
-#: src/Content/Widget/CalendarExport.php:62
-msgid "Export calendar as ical"
-msgstr "导出日历为 ical"
+#: src/Model/Contact.php:1666
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr "输入的简介地址属在这个网站使不可用的网络。"
 
-#: src/Content/Widget/CalendarExport.php:63
-msgid "Export calendar as csv"
-msgstr "导出日历为 csv"
+#: src/Model/Contact.php:1671
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr "有限的简介。这人不会接受直达／私人通信从您。"
 
-#: src/Content/ContactSelector.php:55
-msgid "Frequently"
+#: src/Model/Contact.php:1722
+msgid "Unable to retrieve contact information."
+msgstr "无法检索联系人信息。"
+
+#: src/Model/Event.php:59 src/Model/Event.php:76 src/Model/Event.php:428
+#: src/Model/Event.php:897
+msgid "Starts:"
+msgstr "开始："
+
+#: src/Model/Event.php:62 src/Model/Event.php:82 src/Model/Event.php:429
+#: src/Model/Event.php:901
+msgid "Finishes:"
+msgstr "结束："
+
+#: src/Model/Event.php:377
+msgid "all-day"
+msgstr "全天"
+
+#: src/Model/Event.php:400
+msgid "Jun"
+msgstr "六月"
+
+#: src/Model/Event.php:403
+msgid "Sept"
+msgstr "九月"
+
+#: src/Model/Event.php:426
+msgid "No events to display"
+msgstr "没有可显示的事件"
+
+#: src/Model/Event.php:550
+msgid "l, F j"
+msgstr "l, F j"
+
+#: src/Model/Event.php:581
+msgid "Edit event"
+msgstr "编辑事件"
+
+#: src/Model/Event.php:582
+msgid "Duplicate event"
 msgstr ""
 
-#: src/Content/ContactSelector.php:56
-msgid "Hourly"
-msgstr "每小时"
+#: src/Model/Event.php:583
+msgid "Delete event"
+msgstr "删除事件"
 
-#: src/Content/ContactSelector.php:57
-msgid "Twice daily"
-msgstr "每天两次"
-
-#: src/Content/ContactSelector.php:58
-msgid "Daily"
-msgstr "每天"
-
-#: src/Content/ContactSelector.php:59
-msgid "Weekly"
-msgstr "每周"
-
-#: src/Content/ContactSelector.php:60
-msgid "Monthly"
-msgstr "每月"
-
-#: src/Content/ContactSelector.php:80
-msgid "OStatus"
-msgstr "OStatus"
-
-#: src/Content/ContactSelector.php:81
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
-
-#: src/Content/ContactSelector.php:84
-msgid "Facebook"
-msgstr "Facebook"
-
-#: src/Content/ContactSelector.php:85
-msgid "Zot!"
-msgstr "Zot!"
-
-#: src/Content/ContactSelector.php:86
-msgid "LinkedIn"
-msgstr "LinkedIn"
-
-#: src/Content/ContactSelector.php:87
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
-
-#: src/Content/ContactSelector.php:88
-msgid "MySpace"
-msgstr "MySpace"
-
-#: src/Content/ContactSelector.php:89
-msgid "Google+"
-msgstr "Google+"
-
-#: src/Content/ContactSelector.php:90
-msgid "pump.io"
-msgstr "pump.io"
-
-#: src/Content/ContactSelector.php:91
-msgid "Twitter"
-msgstr "推特"
-
-#: src/Content/ContactSelector.php:92
-msgid "Diaspora Connector"
+#: src/Model/Event.php:830
+msgid "D g:i A"
 msgstr ""
 
-#: src/Content/ContactSelector.php:93
-msgid "GNU Social Connector"
-msgstr "GNU Social 连接器"
-
-#: src/Content/ContactSelector.php:94
-msgid "pnut"
+#: src/Model/Event.php:831
+msgid "g:i A"
 msgstr ""
 
-#: src/Content/ContactSelector.php:95
-msgid "App.net"
+#: src/Model/Event.php:916 src/Model/Event.php:918
+msgid "Show map"
+msgstr "显示地图"
+
+#: src/Model/Event.php:917
+msgid "Hide map"
+msgstr "隐藏地图"
+
+#: src/Model/User.php:168
+msgid "Login failed"
+msgstr "登录失败"
+
+#: src/Model/User.php:199
+msgid "Not enough information to authenticate"
+msgstr "没有足够信息以认证"
+
+#: src/Model/User.php:384
+msgid "An invitation is required."
+msgstr "需要邀请。"
+
+#: src/Model/User.php:388
+msgid "Invitation could not be verified."
+msgstr "不能验证邀请。"
+
+#: src/Model/User.php:395
+msgid "Invalid OpenID url"
+msgstr "无效的OpenID url"
+
+#: src/Model/User.php:414
+msgid "Please enter the required information."
+msgstr "请输入必要的信息。"
+
+#: src/Model/User.php:427
+msgid "Please use a shorter name."
+msgstr "请用一个短一点的名字。"
+
+#: src/Model/User.php:430
+msgid "Name too short."
+msgstr "名字太短。"
+
+#: src/Model/User.php:438
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr "这看上去不是您的全姓名。"
+
+#: src/Model/User.php:443
+msgid "Your email domain is not among those allowed on this site."
+msgstr "这网站允许的域名中没有您的"
+
+#: src/Model/User.php:447
+msgid "Not a valid email address."
+msgstr "无效的邮件地址。"
+
+#: src/Model/User.php:450
+msgid "The nickname was blocked from registration by the nodes admin."
 msgstr ""
 
-#: src/Content/ContactSelector.php:125
-msgid "Male"
-msgstr "男"
+#: src/Model/User.php:454 src/Model/User.php:462
+msgid "Cannot use that email."
+msgstr "无法使用此邮件地址。"
 
-#: src/Content/ContactSelector.php:125
-msgid "Female"
-msgstr "女"
+#: src/Model/User.php:469
+msgid "Your nickname can only contain a-z, 0-9 and _."
+msgstr "您的昵称只能由字母、数字和下划线组成。"
 
-#: src/Content/ContactSelector.php:125
-msgid "Currently Male"
-msgstr "目前为男"
+#: src/Model/User.php:476 src/Model/User.php:533
+msgid "Nickname is already registered. Please choose another."
+msgstr "此昵称已被注册。请选择新的昵称。"
 
-#: src/Content/ContactSelector.php:125
-msgid "Currently Female"
-msgstr "目前为女"
+#: src/Model/User.php:486
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr "严重错误：安全密钥生成失败。"
 
-#: src/Content/ContactSelector.php:125
-msgid "Mostly Male"
-msgstr "更多为男"
+#: src/Model/User.php:520 src/Model/User.php:524
+msgid "An error occurred during registration. Please try again."
+msgstr "注册出现问题。请再次尝试。"
 
-#: src/Content/ContactSelector.php:125
-msgid "Mostly Female"
-msgstr "更多为女"
+#: src/Model/User.php:549
+msgid "An error occurred creating your default profile. Please try again."
+msgstr "创建你的默认简介的时候出现了一个错误。请再试。"
 
-#: src/Content/ContactSelector.php:125
-msgid "Transgender"
-msgstr "跨性别"
+#: src/Model/User.php:556
+msgid "An error occurred creating your self contact. Please try again."
+msgstr ""
 
-#: src/Content/ContactSelector.php:125
-msgid "Intersex"
-msgstr "双性人"
-
-#: src/Content/ContactSelector.php:125
-msgid "Transsexual"
-msgstr "换性者"
-
-#: src/Content/ContactSelector.php:125
-msgid "Hermaphrodite"
-msgstr "雌雄间性"
-
-#: src/Content/ContactSelector.php:125
-msgid "Neuter"
-msgstr "中性"
-
-#: src/Content/ContactSelector.php:125
-msgid "Non-specific"
-msgstr "不明确的"
-
-#: src/Content/ContactSelector.php:125
-msgid "Other"
-msgstr "别的"
-
-#: src/Content/ContactSelector.php:147
-msgid "Males"
-msgstr "男人"
-
-#: src/Content/ContactSelector.php:147
-msgid "Females"
-msgstr "女人"
-
-#: src/Content/ContactSelector.php:147
-msgid "Gay"
-msgstr "男同性恋的"
-
-#: src/Content/ContactSelector.php:147
-msgid "Lesbian"
-msgstr "女同性恋的"
-
-#: src/Content/ContactSelector.php:147
-msgid "No Preference"
-msgstr "无偏爱"
-
-#: src/Content/ContactSelector.php:147
-msgid "Bisexual"
-msgstr "双性恋的"
-
-#: src/Content/ContactSelector.php:147
-msgid "Autosexual"
-msgstr "自性的"
-
-#: src/Content/ContactSelector.php:147
-msgid "Abstinent"
-msgstr "有节制的"
-
-#: src/Content/ContactSelector.php:147
-msgid "Virgin"
-msgstr "原始的"
-
-#: src/Content/ContactSelector.php:147
-msgid "Deviant"
-msgstr "变态"
-
-#: src/Content/ContactSelector.php:147
-msgid "Fetish"
-msgstr "恋物对象"
-
-#: src/Content/ContactSelector.php:147
-msgid "Oodles"
-msgstr "多多"
-
-#: src/Content/ContactSelector.php:147
-msgid "Nonsexual"
-msgstr "无性"
-
-#: src/Content/ContactSelector.php:169
-msgid "Single"
-msgstr "单身"
-
-#: src/Content/ContactSelector.php:169
-msgid "Lonely"
-msgstr "寂寞"
-
-#: src/Content/ContactSelector.php:169
-msgid "Available"
-msgstr "单身的"
-
-#: src/Content/ContactSelector.php:169
-msgid "Unavailable"
-msgstr "不可获得的"
-
-#: src/Content/ContactSelector.php:169
-msgid "Has crush"
-msgstr "迷恋"
-
-#: src/Content/ContactSelector.php:169
-msgid "Infatuated"
-msgstr "痴迷"
-
-#: src/Content/ContactSelector.php:169
-msgid "Dating"
-msgstr "约会"
-
-#: src/Content/ContactSelector.php:169
-msgid "Unfaithful"
-msgstr "外遇"
-
-#: src/Content/ContactSelector.php:169
-msgid "Sex Addict"
-msgstr "性交因成瘾者"
-
-#: src/Content/ContactSelector.php:169 src/Model/User.php:521
+#: src/Model/User.php:561 src/Content/ContactSelector.php:166
 msgid "Friends"
 msgstr "朋友"
 
-#: src/Content/ContactSelector.php:169
-msgid "Friends/Benefits"
-msgstr "朋友/益"
+#: src/Model/User.php:565
+msgid ""
+"An error occurred creating your default contact group. Please try again."
+msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Casual"
-msgstr "休闲"
+#: src/Model/User.php:639
+#, php-format
+msgid ""
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tThank you for registering at %2$s. Your account is pending for approval by the administrator.\n"
+"\t\t"
+msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Engaged"
-msgstr "已订婚的"
+#: src/Model/User.php:649
+#, php-format
+msgid "Registration at %s"
+msgstr "在 %s 的注册"
 
-#: src/Content/ContactSelector.php:169
-msgid "Married"
-msgstr "结婚"
+#: src/Model/User.php:667
+#, php-format
+msgid ""
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tThank you for registering at %2$s. Your account has been created.\n"
+"\t\t"
+msgstr "\n\t\t\t亲爱的 %1$s，\n\t\t\t\t感谢您在 %2$s 注册。您的账户已被创建。\n\t\t"
 
-#: src/Content/ContactSelector.php:169
-msgid "Imaginarily married"
-msgstr "想像结婚"
+#: src/Model/User.php:671
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe login details are as follows:\n"
+"\n"
+"\t\t\tSite Location:\t%3$s\n"
+"\t\t\tLogin Name:\t\t%1$s\n"
+"\t\t\tPassword:\t\t%5$s\n"
+"\n"
+"\t\t\tYou may change your password from your account \"Settings\" page after logging\n"
+"\t\t\tin.\n"
+"\n"
+"\t\t\tPlease take a few moments to review the other account settings on that page.\n"
+"\n"
+"\t\t\tYou may also wish to add some basic information to your default profile\n"
+"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
+"\n"
+"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
+"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
+"\t\t\tperhaps what country you live in; if you do not wish to be more specific\n"
+"\t\t\tthan that.\n"
+"\n"
+"\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
+"\t\t\tIf you are new and do not know anybody here, they may help\n"
+"\t\t\tyou to make some new and interesting friends.\n"
+"\n"
+"\t\t\tIf you ever want to delete your account, you can do so at %3$s/removeme\n"
+"\n"
+"\t\t\tThank you and welcome to %2$s."
+msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Partners"
-msgstr "伴侣"
+#: src/Model/Group.php:43
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr "一个用这个名字的被删掉的组复活了。现有项目的权限<strong>可能</strong>对这个组和任何未来的成员有效。如果这不是你想要的，请用一个不同的名字创建另一个组。"
 
-#: src/Content/ContactSelector.php:169
-msgid "Cohabiting"
-msgstr "同居"
+#: src/Model/Group.php:329
+msgid "Default privacy group for new contacts"
+msgstr "对新联系人的默认隐私组"
 
-#: src/Content/ContactSelector.php:169
-msgid "Common law"
-msgstr "普通法结婚"
+#: src/Model/Group.php:362
+msgid "Everybody"
+msgstr "每人"
 
-#: src/Content/ContactSelector.php:169
-msgid "Happy"
-msgstr "幸福"
+#: src/Model/Group.php:382
+msgid "edit"
+msgstr "编辑"
 
-#: src/Content/ContactSelector.php:169
-msgid "Not looking"
-msgstr "没找"
+#: src/Model/Group.php:406
+msgid "Edit group"
+msgstr "编辑组"
 
-#: src/Content/ContactSelector.php:169
-msgid "Swinger"
-msgstr "交换性伴侣的"
+#: src/Model/Group.php:409
+msgid "Create a new group"
+msgstr "创建新组"
 
-#: src/Content/ContactSelector.php:169
-msgid "Betrayed"
-msgstr "被背叛"
+#: src/Model/Group.php:411
+msgid "Edit groups"
+msgstr "编辑组"
 
-#: src/Content/ContactSelector.php:169
-msgid "Separated"
-msgstr "分手"
+#: src/Model/Profile.php:97
+msgid "Requested account is not available."
+msgstr "要求的账户不可用。"
 
-#: src/Content/ContactSelector.php:169
-msgid "Unstable"
-msgstr "不稳"
+#: src/Model/Profile.php:163 src/Model/Profile.php:399
+#: src/Model/Profile.php:846
+msgid "Edit profile"
+msgstr "修改简介"
 
-#: src/Content/ContactSelector.php:169
-msgid "Divorced"
-msgstr "离婚"
+#: src/Model/Profile.php:333
+msgid "Atom feed"
+msgstr "Atom 源"
 
-#: src/Content/ContactSelector.php:169
-msgid "Imaginarily divorced"
-msgstr "想像离婚"
+#: src/Model/Profile.php:372
+msgid "Manage/edit profiles"
+msgstr "管理/修改简介"
 
-#: src/Content/ContactSelector.php:169
-msgid "Widowed"
-msgstr "寡妇"
+#: src/Model/Profile.php:550 src/Model/Profile.php:639
+msgid "g A l F d"
+msgstr "g A l d F"
 
-#: src/Content/ContactSelector.php:169
-msgid "Uncertain"
-msgstr "不确定"
+#: src/Model/Profile.php:551
+msgid "F d"
+msgstr "F d"
 
-#: src/Content/ContactSelector.php:169
-msgid "It's complicated"
-msgstr "是复杂"
+#: src/Model/Profile.php:604 src/Model/Profile.php:690
+msgid "[today]"
+msgstr "[今天]"
 
-#: src/Content/ContactSelector.php:169
-msgid "Don't care"
-msgstr "无所谓"
+#: src/Model/Profile.php:615
+msgid "Birthday Reminders"
+msgstr "提醒生日"
 
-#: src/Content/ContactSelector.php:169
-msgid "Ask me"
-msgstr "问我"
+#: src/Model/Profile.php:616
+msgid "Birthdays this week:"
+msgstr "这周的生日:"
+
+#: src/Model/Profile.php:677
+msgid "[No description]"
+msgstr "[无描述]"
+
+#: src/Model/Profile.php:704
+msgid "Event Reminders"
+msgstr "事件提醒"
+
+#: src/Model/Profile.php:705
+msgid "Upcoming events the next 7 days:"
+msgstr ""
+
+#: src/Model/Profile.php:728
+msgid "Member since:"
+msgstr ""
+
+#: src/Model/Profile.php:736
+msgid "j F, Y"
+msgstr "j F, Y"
+
+#: src/Model/Profile.php:737
+msgid "j F"
+msgstr "j F"
+
+#: src/Model/Profile.php:752
+msgid "Age:"
+msgstr "年龄："
+
+#: src/Model/Profile.php:765
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "为%1$d %2$s"
+
+#: src/Model/Profile.php:789
+msgid "Religion:"
+msgstr "宗教："
+
+#: src/Model/Profile.php:797
+msgid "Hobbies/Interests:"
+msgstr "爱好／兴趣"
+
+#: src/Model/Profile.php:809
+msgid "Contact information and Social Networks:"
+msgstr "联系人消息和社交网络："
+
+#: src/Model/Profile.php:813
+msgid "Musical interests:"
+msgstr "音乐兴趣："
+
+#: src/Model/Profile.php:817
+msgid "Books, literature:"
+msgstr "书，文学"
+
+#: src/Model/Profile.php:821
+msgid "Television:"
+msgstr "电视："
+
+#: src/Model/Profile.php:825
+msgid "Film/dance/culture/entertainment:"
+msgstr "电影/跳舞/文化/娱乐："
+
+#: src/Model/Profile.php:829
+msgid "Love/Romance:"
+msgstr "爱情／浪漫"
+
+#: src/Model/Profile.php:833
+msgid "Work/employment:"
+msgstr "工作"
+
+#: src/Model/Profile.php:837
+msgid "School/education:"
+msgstr "学院／教育"
+
+#: src/Model/Profile.php:842
+msgid "Forums:"
+msgstr ""
+
+#: src/Model/Profile.php:936
+msgid "Only You Can See This"
+msgstr "只有你可以看这个"
+
+#: src/Model/Profile.php:944 src/Model/Profile.php:947
+msgid "Tips for New Members"
+msgstr "新人建议"
+
+#: src/Model/Profile.php:1106
+#, php-format
+msgid "OpenWebAuth: %1$s welcomes %2$s"
+msgstr ""
 
 #: src/Content/Widget.php:33
 msgid "Add New Contact"
@@ -8420,32 +8934,328 @@ msgid "%d invitation available"
 msgid_plural "%d invitations available"
 msgstr[0] "%d邀请可用的"
 
-#: src/Content/Widget.php:164
+#: src/Content/Widget.php:157
 msgid "Networks"
 msgstr "网络"
 
-#: src/Content/Widget.php:167
+#: src/Content/Widget.php:160
 msgid "All Networks"
 msgstr "所有网络"
 
-#: src/Content/Widget.php:205 src/Content/Feature.php:118
+#: src/Content/Widget.php:198 src/Content/Feature.php:118
 msgid "Saved Folders"
 msgstr "保存的文件夹"
 
-#: src/Content/Widget.php:208 src/Content/Widget.php:248
+#: src/Content/Widget.php:201 src/Content/Widget.php:241
 msgid "Everything"
 msgstr "一切"
 
-#: src/Content/Widget.php:245
+#: src/Content/Widget.php:238
 msgid "Categories"
 msgstr "种类"
 
-#: src/Content/Widget.php:312
+#: src/Content/Widget.php:305
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] "%d 个共同的联系人"
 
+#: src/Content/ContactSelector.php:54
+msgid "Frequently"
+msgstr ""
+
+#: src/Content/ContactSelector.php:55
+msgid "Hourly"
+msgstr "每小时"
+
+#: src/Content/ContactSelector.php:56
+msgid "Twice daily"
+msgstr "每天两次"
+
+#: src/Content/ContactSelector.php:57
+msgid "Daily"
+msgstr "每天"
+
+#: src/Content/ContactSelector.php:58
+msgid "Weekly"
+msgstr "每周"
+
+#: src/Content/ContactSelector.php:59
+msgid "Monthly"
+msgstr "每月"
+
+#: src/Content/ContactSelector.php:79
+msgid "OStatus"
+msgstr "OStatus"
+
+#: src/Content/ContactSelector.php:80
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: src/Content/ContactSelector.php:83
+msgid "Zot!"
+msgstr "Zot!"
+
+#: src/Content/ContactSelector.php:84
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: src/Content/ContactSelector.php:85
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
+
+#: src/Content/ContactSelector.php:86
+msgid "MySpace"
+msgstr "MySpace"
+
+#: src/Content/ContactSelector.php:87
+msgid "Google+"
+msgstr "Google+"
+
+#: src/Content/ContactSelector.php:88
+msgid "pump.io"
+msgstr "pump.io"
+
+#: src/Content/ContactSelector.php:89
+msgid "Twitter"
+msgstr "推特"
+
+#: src/Content/ContactSelector.php:90
+msgid "Diaspora Connector"
+msgstr ""
+
+#: src/Content/ContactSelector.php:91
+msgid "GNU Social Connector"
+msgstr "GNU Social 连接器"
+
+#: src/Content/ContactSelector.php:92
+msgid "pnut"
+msgstr ""
+
+#: src/Content/ContactSelector.php:122
+msgid "Male"
+msgstr "男"
+
+#: src/Content/ContactSelector.php:122
+msgid "Female"
+msgstr "女"
+
+#: src/Content/ContactSelector.php:122
+msgid "Currently Male"
+msgstr "目前为男"
+
+#: src/Content/ContactSelector.php:122
+msgid "Currently Female"
+msgstr "目前为女"
+
+#: src/Content/ContactSelector.php:122
+msgid "Mostly Male"
+msgstr "更多为男"
+
+#: src/Content/ContactSelector.php:122
+msgid "Mostly Female"
+msgstr "更多为女"
+
+#: src/Content/ContactSelector.php:122
+msgid "Transgender"
+msgstr "跨性别"
+
+#: src/Content/ContactSelector.php:122
+msgid "Intersex"
+msgstr "双性人"
+
+#: src/Content/ContactSelector.php:122
+msgid "Transsexual"
+msgstr "换性者"
+
+#: src/Content/ContactSelector.php:122
+msgid "Hermaphrodite"
+msgstr "雌雄间性"
+
+#: src/Content/ContactSelector.php:122
+msgid "Neuter"
+msgstr "中性"
+
+#: src/Content/ContactSelector.php:122
+msgid "Non-specific"
+msgstr "不明确的"
+
+#: src/Content/ContactSelector.php:122
+msgid "Other"
+msgstr "别的"
+
+#: src/Content/ContactSelector.php:144
+msgid "Males"
+msgstr "男人"
+
+#: src/Content/ContactSelector.php:144
+msgid "Females"
+msgstr "女人"
+
+#: src/Content/ContactSelector.php:144
+msgid "Gay"
+msgstr "男同性恋的"
+
+#: src/Content/ContactSelector.php:144
+msgid "Lesbian"
+msgstr "女同性恋的"
+
+#: src/Content/ContactSelector.php:144
+msgid "No Preference"
+msgstr "无偏爱"
+
+#: src/Content/ContactSelector.php:144
+msgid "Bisexual"
+msgstr "双性恋的"
+
+#: src/Content/ContactSelector.php:144
+msgid "Autosexual"
+msgstr "自性的"
+
+#: src/Content/ContactSelector.php:144
+msgid "Abstinent"
+msgstr "有节制的"
+
+#: src/Content/ContactSelector.php:144
+msgid "Virgin"
+msgstr "原始的"
+
+#: src/Content/ContactSelector.php:144
+msgid "Deviant"
+msgstr "变态"
+
+#: src/Content/ContactSelector.php:144
+msgid "Fetish"
+msgstr "恋物对象"
+
+#: src/Content/ContactSelector.php:144
+msgid "Oodles"
+msgstr "多多"
+
+#: src/Content/ContactSelector.php:144
+msgid "Nonsexual"
+msgstr "无性"
+
+#: src/Content/ContactSelector.php:166
+msgid "Single"
+msgstr "单身"
+
+#: src/Content/ContactSelector.php:166
+msgid "Lonely"
+msgstr "寂寞"
+
+#: src/Content/ContactSelector.php:166
+msgid "Available"
+msgstr "单身的"
+
+#: src/Content/ContactSelector.php:166
+msgid "Unavailable"
+msgstr "不可获得的"
+
+#: src/Content/ContactSelector.php:166
+msgid "Has crush"
+msgstr "迷恋"
+
+#: src/Content/ContactSelector.php:166
+msgid "Infatuated"
+msgstr "痴迷"
+
+#: src/Content/ContactSelector.php:166
+msgid "Dating"
+msgstr "约会"
+
+#: src/Content/ContactSelector.php:166
+msgid "Unfaithful"
+msgstr "外遇"
+
+#: src/Content/ContactSelector.php:166
+msgid "Sex Addict"
+msgstr "性交因成瘾者"
+
+#: src/Content/ContactSelector.php:166
+msgid "Friends/Benefits"
+msgstr "朋友/益"
+
+#: src/Content/ContactSelector.php:166
+msgid "Casual"
+msgstr "休闲"
+
+#: src/Content/ContactSelector.php:166
+msgid "Engaged"
+msgstr "已订婚的"
+
+#: src/Content/ContactSelector.php:166
+msgid "Married"
+msgstr "结婚"
+
+#: src/Content/ContactSelector.php:166
+msgid "Imaginarily married"
+msgstr "想像结婚"
+
+#: src/Content/ContactSelector.php:166
+msgid "Partners"
+msgstr "伴侣"
+
+#: src/Content/ContactSelector.php:166
+msgid "Cohabiting"
+msgstr "同居"
+
+#: src/Content/ContactSelector.php:166
+msgid "Common law"
+msgstr "普通法结婚"
+
+#: src/Content/ContactSelector.php:166
+msgid "Happy"
+msgstr "幸福"
+
+#: src/Content/ContactSelector.php:166
+msgid "Not looking"
+msgstr "没找"
+
+#: src/Content/ContactSelector.php:166
+msgid "Swinger"
+msgstr "交换性伴侣的"
+
+#: src/Content/ContactSelector.php:166
+msgid "Betrayed"
+msgstr "被背叛"
+
+#: src/Content/ContactSelector.php:166
+msgid "Separated"
+msgstr "分手"
+
+#: src/Content/ContactSelector.php:166
+msgid "Unstable"
+msgstr "不稳"
+
+#: src/Content/ContactSelector.php:166
+msgid "Divorced"
+msgstr "离婚"
+
+#: src/Content/ContactSelector.php:166
+msgid "Imaginarily divorced"
+msgstr "想像离婚"
+
+#: src/Content/ContactSelector.php:166
+msgid "Widowed"
+msgstr "寡妇"
+
+#: src/Content/ContactSelector.php:166
+msgid "Uncertain"
+msgstr "不确定"
+
+#: src/Content/ContactSelector.php:166
+msgid "It's complicated"
+msgstr "是复杂"
+
+#: src/Content/ContactSelector.php:166
+msgid "Don't care"
+msgstr "无所谓"
+
+#: src/Content/ContactSelector.php:166
+msgid "Ask me"
+msgstr "问我"
+
 #: src/Content/Feature.php:79
 msgid "General Features"
 msgstr "通用特性"
@@ -8753,10 +9563,6 @@ msgstr "管理"
 msgid "Manage other pages"
 msgstr "管理别的页"
 
-#: src/Content/Nav.php:210 src/Model/Profile.php:368
-msgid "Profiles"
-msgstr "简介"
-
 #: src/Content/Nav.php:210
 msgid "Manage/Edit Profiles"
 msgstr "管理／编辑简介"
@@ -8773,761 +9579,47 @@ msgstr "导航"
 msgid "Site map"
 msgstr "网站地图"
 
-#: src/Database/DBStructure.php:32
-msgid "There are no tables on MyISAM."
-msgstr "未在 MyISAM 中发现表。"
-
-#: src/Database/DBStructure.php:75
-#, 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:80
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
-msgstr "错误消息是\n[pre]%s[/pre]"
-
-#: src/Database/DBStructure.php:191
-#, php-format
-msgid ""
-"\n"
-"Error %d occurred during database update:\n"
-"%s\n"
-msgstr "\n在数据库更新的时候发生了错误 %d\n%s\n"
-
-#: src/Database/DBStructure.php:194
-msgid "Errors encountered performing database changes: "
-msgstr "操作数据库更改的时候遇到了错误："
-
-#: src/Database/DBStructure.php:210
-#, php-format
-msgid "%s: Database update"
-msgstr ""
-
-#: src/Database/DBStructure.php:460
-#, php-format
-msgid "%s: updating %s table."
-msgstr "%s: 正在更新 %s 表。"
-
-#: src/Model/Mail.php:40 src/Model/Mail.php:174
-msgid "[no subject]"
-msgstr "[无题目]"
-
-#: src/Model/Group.php:44
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr "一个用这个名字的被删掉的组复活了。现有项目的权限<strong>可能</strong>对这个组和任何未来的成员有效。如果这不是你想要的，请用一个不同的名字创建另一个组。"
-
-#: src/Model/Group.php:341
-msgid "Default privacy group for new contacts"
-msgstr "对新联系人的默认隐私组"
-
-#: src/Model/Group.php:374
-msgid "Everybody"
-msgstr "每人"
-
-#: src/Model/Group.php:394
-msgid "edit"
-msgstr "编辑"
-
-#: src/Model/Group.php:418
-msgid "Edit group"
-msgstr "编辑组"
-
-#: src/Model/Group.php:419
-msgid "Contacts not in any group"
-msgstr "不在任何组的联系人"
-
-#: src/Model/Group.php:420
-msgid "Create a new group"
-msgstr "创建新组"
-
-#: src/Model/Group.php:422
-msgid "Edit groups"
-msgstr "编辑组"
-
-#: src/Model/Contact.php:667
-msgid "Drop Contact"
-msgstr "删除联系人"
-
-#: src/Model/Contact.php:1101
-msgid "Organisation"
-msgstr "组织"
-
-#: src/Model/Contact.php:1104
-msgid "News"
-msgstr "新闻"
-
-#: src/Model/Contact.php:1107
-msgid "Forum"
-msgstr "论坛"
-
-#: src/Model/Contact.php:1286
-msgid "Connect URL missing."
-msgstr "连接URL失踪的。"
-
-#: src/Model/Contact.php:1295
-msgid ""
-"The contact could not be added. Please check the relevant network "
-"credentials in your Settings -> Social Networks page."
-msgstr ""
-
-#: src/Model/Contact.php:1342
-msgid ""
-"This site is not configured to allow communications with other networks."
-msgstr "这网站没配置允许跟别的网络交流."
-
-#: src/Model/Contact.php:1343 src/Model/Contact.php:1357
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr "没有兼容协议或者摘要找到了."
-
-#: src/Model/Contact.php:1355
-msgid "The profile address specified does not provide adequate information."
-msgstr "输入的简介地址没有够消息。"
-
-#: src/Model/Contact.php:1360
-msgid "An author or name was not found."
-msgstr "找不到作者或名。"
-
-#: src/Model/Contact.php:1363
-msgid "No browser URL could be matched to this address."
-msgstr "这个地址没有符合什么游览器URL。"
-
-#: src/Model/Contact.php:1366
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
-msgstr "无法匹配一个@-风格的身份地址和一个已知的协议或电子邮件联系人。"
-
-#: src/Model/Contact.php:1367
-msgid "Use mailto: in front of address to force email check."
-msgstr "输入mailto:地址前为要求电子邮件检查。"
-
-#: src/Model/Contact.php:1373
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
-msgstr "输入的简介地址属在这个网站使不可用的网络。"
-
-#: src/Model/Contact.php:1378
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr "有限的简介。这人不会接受直达／私人通信从您。"
-
-#: src/Model/Contact.php:1429
-msgid "Unable to retrieve contact information."
-msgstr "无法检索联系人信息。"
-
-#: src/Model/Contact.php:1646 src/Protocol/DFRN.php:1515
-#, php-format
-msgid "%s's birthday"
-msgstr "%s的生日"
-
-#: src/Model/Contact.php:1647 src/Protocol/DFRN.php:1516
-#, php-format
-msgid "Happy Birthday %s"
-msgstr "生日快乐%s"
-
-#: src/Model/Event.php:53 src/Model/Event.php:70 src/Model/Event.php:419
-#: src/Model/Event.php:882
-msgid "Starts:"
-msgstr "开始："
-
-#: src/Model/Event.php:56 src/Model/Event.php:76 src/Model/Event.php:420
-#: src/Model/Event.php:886
-msgid "Finishes:"
-msgstr "结束："
-
-#: src/Model/Event.php:368
-msgid "all-day"
-msgstr "全天"
-
-#: src/Model/Event.php:391
-msgid "Jun"
-msgstr "六月"
-
-#: src/Model/Event.php:394
-msgid "Sept"
-msgstr "九月"
-
-#: src/Model/Event.php:417
-msgid "No events to display"
-msgstr "没有可显示的事件"
-
-#: src/Model/Event.php:543
-msgid "l, F j"
-msgstr "l, F j"
-
-#: src/Model/Event.php:566
-msgid "Edit event"
-msgstr "编辑事件"
-
-#: src/Model/Event.php:567
-msgid "Duplicate event"
-msgstr ""
-
-#: src/Model/Event.php:568
-msgid "Delete event"
-msgstr "删除事件"
-
-#: src/Model/Event.php:815
-msgid "D g:i A"
-msgstr ""
-
-#: src/Model/Event.php:816
-msgid "g:i A"
-msgstr ""
-
-#: src/Model/Event.php:901 src/Model/Event.php:903
-msgid "Show map"
-msgstr "显示地图"
-
-#: src/Model/Event.php:902
-msgid "Hide map"
-msgstr "隐藏地图"
-
-#: src/Model/Item.php:1883
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
-msgstr "%1$s 正在参加 %2$s 的 %3$s"
-
-#: src/Model/Item.php:1888
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
-msgstr "%1$s 不在参加 %2$s 的 %3$s"
-
-#: src/Model/Item.php:1893
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
-msgstr "%1$s 可以参加 %2$s 的 %3$s"
-
-#: src/Model/Profile.php:97
-msgid "Requested account is not available."
-msgstr "要求的账户不可用。"
-
-#: src/Model/Profile.php:164 src/Model/Profile.php:395
-#: src/Model/Profile.php:857
-msgid "Edit profile"
-msgstr "修改简介"
-
-#: src/Model/Profile.php:332
-msgid "Atom feed"
-msgstr "Atom 源"
-
-#: src/Model/Profile.php:368
-msgid "Manage/edit profiles"
-msgstr "管理/修改简介"
-
-#: src/Model/Profile.php:546 src/Model/Profile.php:639
-msgid "g A l F d"
-msgstr "g A l d F"
-
-#: src/Model/Profile.php:547
-msgid "F d"
-msgstr "F d"
-
-#: src/Model/Profile.php:604 src/Model/Profile.php:701
-msgid "[today]"
-msgstr "[今天]"
-
-#: src/Model/Profile.php:615
-msgid "Birthday Reminders"
-msgstr "提醒生日"
-
-#: src/Model/Profile.php:616
-msgid "Birthdays this week:"
-msgstr "这周的生日:"
-
-#: src/Model/Profile.php:688
-msgid "[No description]"
-msgstr "[无描述]"
-
-#: src/Model/Profile.php:715
-msgid "Event Reminders"
-msgstr "事件提醒"
-
-#: src/Model/Profile.php:716
-msgid "Events this week:"
-msgstr "这周的事件:"
-
-#: src/Model/Profile.php:739
-msgid "Member since:"
-msgstr ""
-
-#: src/Model/Profile.php:747
-msgid "j F, Y"
-msgstr "j F, Y"
-
-#: src/Model/Profile.php:748
-msgid "j F"
-msgstr "j F"
-
-#: src/Model/Profile.php:763
-msgid "Age:"
-msgstr "年龄："
-
-#: src/Model/Profile.php:776
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "为%1$d %2$s"
-
-#: src/Model/Profile.php:800
-msgid "Religion:"
-msgstr "宗教："
-
-#: src/Model/Profile.php:808
-msgid "Hobbies/Interests:"
-msgstr "爱好／兴趣"
-
-#: src/Model/Profile.php:820
-msgid "Contact information and Social Networks:"
-msgstr "联系人消息和社交网络："
-
-#: src/Model/Profile.php:824
-msgid "Musical interests:"
-msgstr "音乐兴趣："
-
-#: src/Model/Profile.php:828
-msgid "Books, literature:"
-msgstr "书，文学"
-
-#: src/Model/Profile.php:832
-msgid "Television:"
-msgstr "电视："
-
-#: src/Model/Profile.php:836
-msgid "Film/dance/culture/entertainment:"
-msgstr "电影/跳舞/文化/娱乐："
-
-#: src/Model/Profile.php:840
-msgid "Love/Romance:"
-msgstr "爱情／浪漫"
-
-#: src/Model/Profile.php:844
-msgid "Work/employment:"
-msgstr "工作"
-
-#: src/Model/Profile.php:848
-msgid "School/education:"
-msgstr "学院／教育"
-
-#: src/Model/Profile.php:853
-msgid "Forums:"
-msgstr ""
-
-#: src/Model/Profile.php:947
-msgid "Only You Can See This"
-msgstr "只有你可以看这个"
-
-#: src/Model/User.php:154
-msgid "Login failed"
-msgstr "登录失败"
-
-#: src/Model/User.php:185
-msgid "Not enough information to authenticate"
-msgstr "没有足够信息以认证"
-
-#: src/Model/User.php:347
-msgid "An invitation is required."
-msgstr "需要邀请。"
-
-#: src/Model/User.php:351
-msgid "Invitation could not be verified."
-msgstr "不能验证邀请。"
-
-#: src/Model/User.php:358
-msgid "Invalid OpenID url"
-msgstr "无效的OpenID url"
-
-#: src/Model/User.php:371 src/Module/Login.php:101
-msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr "我们用您输入的OpenID登录的时候碰到问题。请核实拼法是对的。"
-
-#: src/Model/User.php:371 src/Module/Login.php:101
-msgid "The error message was:"
-msgstr "错误通知是："
-
-#: src/Model/User.php:377
-msgid "Please enter the required information."
-msgstr "请输入必要的信息。"
-
-#: src/Model/User.php:390
-msgid "Please use a shorter name."
-msgstr "请用一个短一点的名字。"
-
-#: src/Model/User.php:393
-msgid "Name too short."
-msgstr "名字太短。"
-
-#: src/Model/User.php:401
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr "这看上去不是您的全姓名。"
-
-#: src/Model/User.php:406
-msgid "Your email domain is not among those allowed on this site."
-msgstr "这网站允许的域名中没有您的"
-
-#: src/Model/User.php:410
-msgid "Not a valid email address."
-msgstr "无效的邮件地址。"
-
-#: src/Model/User.php:414 src/Model/User.php:422
-msgid "Cannot use that email."
-msgstr "无法使用此邮件地址。"
-
-#: src/Model/User.php:429
-msgid "Your nickname can only contain a-z, 0-9 and _."
-msgstr "您的昵称只能由字母、数字和下划线组成。"
-
-#: src/Model/User.php:436 src/Model/User.php:493
-msgid "Nickname is already registered. Please choose another."
-msgstr "此昵称已被注册。请选择新的昵称。"
-
-#: src/Model/User.php:446
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr "严重错误：安全密钥生成失败。"
-
-#: src/Model/User.php:480 src/Model/User.php:484
-msgid "An error occurred during registration. Please try again."
-msgstr "注册出现问题。请再次尝试。"
-
-#: src/Model/User.php:509
-msgid "An error occurred creating your default profile. Please try again."
-msgstr "创建你的默认简介的时候出现了一个错误。请再试。"
-
-#: src/Model/User.php:516
-msgid "An error occurred creating your self contact. Please try again."
-msgstr ""
-
-#: src/Model/User.php:525
-msgid ""
-"An error occurred creating your default contact group. Please try again."
-msgstr ""
-
-#: src/Model/User.php:599
-#, php-format
-msgid ""
-"\n"
-"\t\t\tDear %1$s,\n"
-"\t\t\t\tThank you for registering at %2$s. Your account is pending for approval by the administrator.\n"
-"\t\t"
-msgstr ""
-
-#: src/Model/User.php:609
-#, php-format
-msgid "Registration at %s"
-msgstr "在 %s 的注册"
-
-#: src/Model/User.php:627
-#, php-format
-msgid ""
-"\n"
-"\t\t\tDear %1$s,\n"
-"\t\t\t\tThank you for registering at %2$s. Your account has been created.\n"
-"\t\t"
-msgstr "\n\t\t\t亲爱的 %1$s，\n\t\t\t\t感谢您在 %2$s 注册。您的账户已被创建。\n\t\t"
-
-#: src/Model/User.php:631
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe login details are as follows:\n"
-"\n"
-"\t\t\tSite Location:\t%3$s\n"
-"\t\t\tLogin Name:\t\t%1$s\n"
-"\t\t\tPassword:\t\t%5$s\n"
-"\n"
-"\t\t\tYou may change your password from your account \"Settings\" page after logging\n"
-"\t\t\tin.\n"
-"\n"
-"\t\t\tPlease take a few moments to review the other account settings on that page.\n"
-"\n"
-"\t\t\tYou may also wish to add some basic information to your default profile\n"
-"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
-"\n"
-"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
-"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
-"\t\t\tperhaps what country you live in; if you do not wish to be more specific\n"
-"\t\t\tthan that.\n"
-"\n"
-"\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
-"\t\t\tIf you are new and do not know anybody here, they may help\n"
-"\t\t\tyou to make some new and interesting friends.\n"
-"\n"
-"\t\t\tIf you ever want to delete your account, you can do so at %3$s/removeme\n"
-"\n"
-"\t\t\tThank you and welcome to %2$s."
-msgstr ""
-
-#: src/Protocol/Diaspora.php:2521
-msgid "Sharing notification from Diaspora network"
-msgstr "分享通知从Diaspora网络"
-
-#: src/Protocol/Diaspora.php:3609
-msgid "Attachments:"
-msgstr "附件："
-
-#: src/Protocol/OStatus.php:1798
-#, php-format
-msgid "%s is now following %s."
-msgstr "%s 正在关注 %s."
-
-#: src/Protocol/OStatus.php:1799
-msgid "following"
-msgstr "关注"
-
-#: src/Protocol/OStatus.php:1802
-#, php-format
-msgid "%s stopped following %s."
-msgstr "%s 停止关注了 %s."
-
-#: src/Protocol/OStatus.php:1803
-msgid "stopped following"
-msgstr "取消关注"
-
-#: src/Worker/Delivery.php:415
-msgid "(no subject)"
-msgstr "（无主题）"
-
-#: src/Module/Logout.php:28
-msgid "Logged out."
-msgstr "已注销。"
-
-#: src/Module/Login.php:283
-msgid "Create a New Account"
-msgstr "创建新的账户"
-
-#: src/Module/Login.php:316
-msgid "Password: "
-msgstr "密码："
-
-#: src/Module/Login.php:317
-msgid "Remember me"
-msgstr "记住我"
-
-#: src/Module/Login.php:320
-msgid "Or login using OpenID: "
-msgstr "或者使用 OpenID 登录: "
-
-#: src/Module/Login.php:326
-msgid "Forgot your password?"
-msgstr "忘记你的密码吗？"
-
-#: src/Module/Login.php:329
-msgid "Website Terms of Service"
-msgstr "网站服务条款"
-
-#: src/Module/Login.php:330
-msgid "terms of service"
-msgstr "服务条款"
-
-#: src/Module/Login.php:332
-msgid "Website Privacy Policy"
-msgstr "网站隐私政策"
-
-#: src/Module/Login.php:333
-msgid "privacy policy"
-msgstr "隐私政策"
-
-#: src/Module/Tos.php:34 src/Module/Tos.php:74
-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"
-" name), an username (nickname) and a working email address. The names will "
-"be accessible on the profile page of the account by any visitor of the page,"
-" even if other profile details are not displayed. The email address will "
-"only be used to send the user notifications about interactions, but wont be "
-"visibly displayed. The listing of an account in the node's user directory or"
-" the global user directory is optional and can be controlled in the user "
-"settings, it is not necessary for communication."
-msgstr ""
-
-#: src/Module/Tos.php:35 src/Module/Tos.php:75
-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
-#, php-format
-msgid ""
-"At any point in time a logged in user can export their account data from the"
-" <a href=\"%1$s/settings/uexport\">account settings</a>. If the user wants "
-"to delete their account they can do so at <a "
-"href=\"%1$s/removeme\">%1$s/removeme</a>. The deletion of the account will "
-"be permanent. Deletion of the data will also be requested from the nodes of "
-"the communication partners."
-msgstr ""
-
-#: src/Module/Tos.php:39 src/Module/Tos.php:73
-msgid "Privacy Statement"
-msgstr "隐私声明"
-
-#: src/Object/Post.php:128
-msgid "This entry was edited"
-msgstr "这个条目被编辑了"
-
-#: src/Object/Post.php:187
-msgid "Delete globally"
-msgstr ""
-
-#: src/Object/Post.php:187
-msgid "Remove locally"
-msgstr ""
-
-#: src/Object/Post.php:200
-msgid "save to folder"
-msgstr "保存在文件夹"
-
-#: src/Object/Post.php:243
-msgid "I will attend"
-msgstr "我将会参加"
-
-#: src/Object/Post.php:243
-msgid "I will not attend"
-msgstr "我将不会参加"
-
-#: src/Object/Post.php:243
-msgid "I might attend"
-msgstr "我可能会参加"
-
-#: src/Object/Post.php:271
-msgid "add star"
-msgstr "加星"
-
-#: src/Object/Post.php:272
-msgid "remove star"
-msgstr "消星"
-
-#: src/Object/Post.php:273
-msgid "toggle star status"
-msgstr "转变星现状"
-
-#: src/Object/Post.php:276
-msgid "starred"
-msgstr "已标星"
-
-#: src/Object/Post.php:282
-msgid "ignore thread"
-msgstr "忽视主题"
-
-#: src/Object/Post.php:283
-msgid "unignore thread"
-msgstr "取消忽视主题"
-
-#: src/Object/Post.php:284
-msgid "toggle ignore status"
-msgstr "切换忽视状态"
-
-#: src/Object/Post.php:293
-msgid "add tag"
-msgstr "加标签"
-
-#: src/Object/Post.php:304
-msgid "like"
-msgstr "喜欢"
-
-#: src/Object/Post.php:305
-msgid "dislike"
-msgstr "不喜欢"
-
-#: src/Object/Post.php:308
-msgid "Share this"
-msgstr "分享这个"
-
-#: src/Object/Post.php:308
-msgid "share"
-msgstr "分享"
-
-#: src/Object/Post.php:373
-msgid "to"
-msgstr "至"
-
-#: src/Object/Post.php:374
-msgid "via"
-msgstr "经过"
-
-#: src/Object/Post.php:375
-msgid "Wall-to-Wall"
-msgstr "从墙到墙"
-
-#: src/Object/Post.php:376
-msgid "via Wall-To-Wall:"
-msgstr "通过从墙到墙"
-
-#: src/Object/Post.php:435
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d 条评论"
-
-#: src/Object/Post.php:805
-msgid "Bold"
-msgstr "粗体"
-
-#: src/Object/Post.php:806
-msgid "Italic"
-msgstr "斜体"
-
-#: src/Object/Post.php:807
-msgid "Underline"
-msgstr "下划线"
-
-#: src/Object/Post.php:808
-msgid "Quote"
-msgstr "引语"
-
-#: src/Object/Post.php:809
-msgid "Code"
-msgstr "源代码"
-
-#: src/Object/Post.php:810
-msgid "Image"
-msgstr "图片"
-
-#: src/Object/Post.php:811
-msgid "Link"
-msgstr "链接"
-
-#: src/Object/Post.php:812
-msgid "Video"
-msgstr "录像"
-
-#: src/App.php:526
-msgid "Delete this item?"
-msgstr "删除这个项目？"
-
-#: src/App.php:528
-msgid "show fewer"
-msgstr "显示更小"
-
-#: src/App.php:1117
-msgid "No system theme config value set."
-msgstr ""
-
-#: index.php:464
-msgid "toggle mobile"
-msgstr "切换移动设备"
-
-#: boot.php:796
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr "更新 %s 失败。查看错误日志。"
-
-#: update.php:193
-#, php-format
-msgid "%s: Updating author-id and owner-id in item and thread table. "
-msgstr ""
+#: src/Content/Widget/CalendarExport.php:65
+msgid "Export"
+msgstr "导出"
+
+#: src/Content/Widget/CalendarExport.php:66
+msgid "Export calendar as ical"
+msgstr "导出日历为 ical"
+
+#: src/Content/Widget/CalendarExport.php:67
+msgid "Export calendar as csv"
+msgstr "导出日历为 csv"
+
+#: src/Content/OEmbed.php:256
+msgid "Embedding disabled"
+msgstr "嵌入已停用"
+
+#: src/Content/OEmbed.php:376
+msgid "Embedded content"
+msgstr "嵌入内容"
+
+#: src/Content/Text/BBCode.php:423
+msgid "view full size"
+msgstr "看全尺寸"
+
+#: src/Content/Text/BBCode.php:853 src/Content/Text/BBCode.php:1626
+#: src/Content/Text/BBCode.php:1627
+msgid "Image/photo"
+msgstr "图像／照片"
+
+#: src/Content/Text/BBCode.php:1553 src/Content/Text/BBCode.php:1575
+msgid "$1 wrote:"
+msgstr "$1写："
+
+#: src/Content/Text/BBCode.php:1635 src/Content/Text/BBCode.php:1636
+msgid "Encrypted content"
+msgstr "加密的内容"
+
+#: src/Content/Text/BBCode.php:1755
+msgid "Invalid source protocol"
+msgstr "无效的源协议"
+
+#: src/Content/Text/BBCode.php:1766
+msgid "Invalid link protocol"
+msgstr "无效的连接协议"
diff --git a/view/lang/zh-cn/strings.php b/view/lang/zh-cn/strings.php
index b9818f406f..c54845b8ff 100644
--- a/view/lang/zh-cn/strings.php
+++ b/view/lang/zh-cn/strings.php
@@ -6,10 +6,217 @@ function string_plural_select_zh_cn($n){
 	return 0;;
 }}
 ;
+$a->strings["You must be logged in to use addons. "] = "您用插件前要登录";
+$a->strings["Not Found"] = "未发现";
+$a->strings["Page not found."] = "页发现。";
+$a->strings["Permission denied"] = "权限不够";
+$a->strings["Permission denied."] = "权限不够。";
+$a->strings["toggle mobile"] = "切换移动设备";
+$a->strings["default"] = "默认";
+$a->strings["greenzero"] = "greenzero";
+$a->strings["purplezero"] = "purplezero";
+$a->strings["easterbunny"] = "easterbunny";
+$a->strings["darkzero"] = "darkzero";
+$a->strings["comix"] = "comix";
+$a->strings["slackr"] = "slackr";
+$a->strings["Submit"] = "提交";
+$a->strings["Theme settings"] = "主题设置";
+$a->strings["Variations"] = "变化";
+$a->strings["Alignment"] = "对齐";
+$a->strings["Left"] = "左边";
+$a->strings["Center"] = "中间";
+$a->strings["Color scheme"] = "色彩方案";
+$a->strings["Posts font size"] = "文章";
+$a->strings["Textareas font size"] = "文本区字体大小";
+$a->strings["Comma separated list of helper forums"] = "";
+$a->strings["don't show"] = "不要显示";
+$a->strings["show"] = "显示";
+$a->strings["Set style"] = "设置风格";
+$a->strings["Community Pages"] = "社会页";
+$a->strings["Community Profiles"] = "社会简介";
+$a->strings["Help or @NewHere ?"] = "需要帮助或@第一次来这儿？";
+$a->strings["Connect Services"] = "连接服务";
+$a->strings["Find Friends"] = "找朋友们";
+$a->strings["Last users"] = "上次用户";
+$a->strings["Find People"] = "找人物";
+$a->strings["Enter name or interest"] = "输入名字或兴趣";
+$a->strings["Connect/Follow"] = "连接/关注";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "比如：罗伯特·摩根斯坦，钓鱼";
+$a->strings["Find"] = "搜索";
+$a->strings["Friend Suggestions"] = "朋友推荐";
+$a->strings["Similar Interests"] = "相似兴趣";
+$a->strings["Random Profile"] = "随机简介";
+$a->strings["Invite Friends"] = "邀请朋友们";
+$a->strings["Global Directory"] = "综合目录";
+$a->strings["Local Directory"] = "本地目录";
+$a->strings["Forums"] = "论坛";
+$a->strings["External link to forum"] = "到论坛的外链";
+$a->strings["show more"] = "显示更多";
+$a->strings["Quick Start"] = "快速入门";
+$a->strings["Help"] = "帮助";
+$a->strings["Custom"] = "";
+$a->strings["Note"] = "便条";
+$a->strings["Check image permissions if all users are allowed to see the image"] = "";
+$a->strings["Select color scheme"] = "";
+$a->strings["Navigation bar background color"] = "";
+$a->strings["Navigation bar icon color "] = "";
+$a->strings["Link color"] = "链接颜色";
+$a->strings["Set the background color"] = "设置背景色";
+$a->strings["Content background opacity"] = "";
+$a->strings["Set the background image"] = "设置背景图片";
+$a->strings["Background image style"] = "";
+$a->strings["Login page background image"] = "登录页面背景图片";
+$a->strings["Login page background color"] = "登录页面背景色";
+$a->strings["Leave background image and color empty for theme defaults"] = "";
+$a->strings["Guest"] = "";
+$a->strings["Visitor"] = "访客";
+$a->strings["Logout"] = "注销";
+$a->strings["End this session"] = "结束此次会话";
+$a->strings["Status"] = "状态";
+$a->strings["Your posts and conversations"] = "你的消息和交谈";
+$a->strings["Profile"] = "简介";
+$a->strings["Your profile page"] = "你的简介页";
+$a->strings["Photos"] = "照片";
+$a->strings["Your photos"] = "你的照片";
+$a->strings["Videos"] = "视频";
+$a->strings["Your videos"] = "你的视频";
+$a->strings["Events"] = "事件";
+$a->strings["Your events"] = "你的项目";
+$a->strings["Network"] = "网络";
+$a->strings["Conversations from your friends"] = "来自你的朋友们的交谈";
+$a->strings["Events and Calendar"] = "事件和日历";
+$a->strings["Messages"] = "消息";
+$a->strings["Private mail"] = "私人的邮件";
+$a->strings["Settings"] = "设置";
+$a->strings["Account settings"] = "帐户设置";
+$a->strings["Contacts"] = "联系人";
+$a->strings["Manage/edit friends and contacts"] = "管理/编辑朋友和联系人";
+$a->strings["Follow Thread"] = "";
+$a->strings["Top Banner"] = "";
+$a->strings["Resize image to the width of the screen and show background color below on long pages."] = "";
+$a->strings["Full screen"] = "";
+$a->strings["Resize image to fill entire screen, clipping either the right or the bottom."] = "";
+$a->strings["Single row mosaic"] = "";
+$a->strings["Resize image to repeat it on a single row, either vertical or horizontal."] = "";
+$a->strings["Mosaic"] = "";
+$a->strings["Repeat image to fill the screen."] = "";
+$a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "";
+$a->strings["%s: Updating post-type."] = "";
+$a->strings["Item not found."] = "项目找不到。";
+$a->strings["Do you really want to delete this item?"] = "您真的想删除这个项目吗？";
+$a->strings["Yes"] = "是";
+$a->strings["Cancel"] = "取消";
+$a->strings["Archives"] = "档案";
+$a->strings["event"] = "事件";
+$a->strings["status"] = "现状";
+$a->strings["photo"] = "照片";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s 喜欢 %2\$s 的 %3\$s";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s 不喜欢 %2\$s 的 %3\$s";
+$a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$s 参加了 %2\$s 的 %3\$s";
+$a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s 没有参加 %2\$s 的 %3\$s";
+$a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "";
+$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s是成为%2\$s的朋友";
+$a->strings["%1\$s poked %2\$s"] = "%1\$s把%2\$s戳";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s把%4\$s标签%2\$s的%3\$s";
+$a->strings["post/item"] = "文章／项目";
+$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s标注%2\$s的%3\$s为偏爱";
+$a->strings["Likes"] = "喜欢";
+$a->strings["Dislikes"] = "不喜欢";
+$a->strings["Attending"] = [
+	0 => "正在参加",
+];
+$a->strings["Not attending"] = "不在参加";
+$a->strings["Might attend"] = "可以参加";
+$a->strings["Select"] = "选择";
+$a->strings["Delete"] = "删除";
+$a->strings["View %s's profile @ %s"] = "看%s的简介@ %s";
+$a->strings["Categories:"] = "种类：";
+$a->strings["Filed under:"] = "归档在：";
+$a->strings["%s from %s"] = "%s从%s";
+$a->strings["View in context"] = "看在上下文";
+$a->strings["Please wait"] = "请等一下";
+$a->strings["remove"] = "删除";
+$a->strings["Delete Selected Items"] = "删除选的项目";
+$a->strings["View Status"] = "看现状";
+$a->strings["View Profile"] = "看简介";
+$a->strings["View Photos"] = "看照片";
+$a->strings["Network Posts"] = "网络文章";
+$a->strings["View Contact"] = "查看联系人";
+$a->strings["Send PM"] = "发送私信";
+$a->strings["Poke"] = "戳";
+$a->strings["%s likes this."] = "%s喜欢这个.";
+$a->strings["%s doesn't like this."] = "%s没有喜欢这个.";
+$a->strings["%s attends."] = "%s 参加。";
+$a->strings["%s doesn't attend."] = "%s 不参加。";
+$a->strings["%s attends maybe."] = "";
+$a->strings["and"] = "和";
+$a->strings["and %d other people"] = "和 %d 个其他人";
+$a->strings["<span  %1\$s>%2\$d people</span> like this"] = "<span  %1\$s>%2\$d个人</span>喜欢";
+$a->strings["%s like this."] = "%s 赞了这个。";
+$a->strings["<span  %1\$s>%2\$d people</span> don't like this"] = "<span  %1\$s>%2\$d个人</span>不喜欢";
+$a->strings["%s don't like this."] = "%s 踩了这个。";
+$a->strings["<span  %1\$s>%2\$d people</span> attend"] = "<span  %1\$s>%2\$d 人</span>参加";
+$a->strings["%s attend."] = "%s 参加。";
+$a->strings["<span  %1\$s>%2\$d people</span> don't attend"] = "<span  %1\$s>%2\$d 人</span>不参加";
+$a->strings["%s don't attend."] = "%s 不参加。";
+$a->strings["<span  %1\$s>%2\$d people</span> attend maybe"] = "<span  %1\$s>%2\$d人</span>可能参加";
+$a->strings["%s attend maybe."] = "";
+$a->strings["Visible to <strong>everybody</strong>"] = "<strong>大家</strong>可见的";
+$a->strings["Please enter a link URL:"] = "请输入一个链接 URL：";
+$a->strings["Please enter a video link/URL:"] = "请输入视频连接／URL：";
+$a->strings["Please enter an audio link/URL:"] = "请输入音响连接／URL：";
+$a->strings["Tag term:"] = "标签:";
+$a->strings["Save to Folder:"] = "保存再文件夹：";
+$a->strings["Where are you right now?"] = "你在哪里?";
+$a->strings["Delete item(s)?"] = "把项目删除吗？";
+$a->strings["New Post"] = "";
+$a->strings["Share"] = "分享";
+$a->strings["Upload photo"] = "上传照片";
+$a->strings["upload photo"] = "上传照片";
+$a->strings["Attach file"] = "附上文件";
+$a->strings["attach file"] = "附上文件";
+$a->strings["Insert web link"] = "插入网页链接";
+$a->strings["web link"] = "网页链接";
+$a->strings["Insert video link"] = "插入视频链接";
+$a->strings["video link"] = "视频链接";
+$a->strings["Insert audio link"] = "插入音频链接";
+$a->strings["audio link"] = "音频链接";
+$a->strings["Set your location"] = "设定您的位置";
+$a->strings["set location"] = "指定位置";
+$a->strings["Clear browser location"] = "清空浏览器位置";
+$a->strings["clear location"] = "清除位置";
+$a->strings["Set title"] = "指定标题";
+$a->strings["Categories (comma-separated list)"] = "种类（逗号分隔单）";
+$a->strings["Permission settings"] = "权设置";
+$a->strings["permissions"] = "权利";
+$a->strings["Public post"] = "公开的消息";
+$a->strings["Preview"] = "预览";
+$a->strings["Post to Groups"] = "发到组";
+$a->strings["Post to Contacts"] = "发给联系人";
+$a->strings["Private post"] = "私人文章";
+$a->strings["Message"] = "通知";
+$a->strings["Browser"] = "浏览器";
+$a->strings["View all"] = "查看全部";
+$a->strings["Like"] = [
+	0 => "喜欢",
+];
+$a->strings["Dislike"] = [
+	0 => "不喜欢",
+];
+$a->strings["Not Attending"] = [
+	0 => "不在参加",
+];
+$a->strings["Undecided"] = [
+	0 => "未决定的",
+];
+$a->strings["Welcome "] = "欢迎";
+$a->strings["Please upload a profile photo."] = "请上传一张简介照片";
+$a->strings["Welcome back "] = "欢迎回来";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "表格安全令牌不对。最可能因为表格开着太久（三个小时以上）提交前。";
 $a->strings["Friendica Notification"] = "Friendica 通知";
 $a->strings["Thank You,"] = "谢谢，";
-$a->strings["%s Administrator"] = "%s管理员";
 $a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, %2\$s 的管理员";
+$a->strings["%s Administrator"] = "%s管理员";
 $a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica:Notify]收到新邮件在%s";
 $a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s发给您新私人通知在%2\$s.";
 $a->strings["a private message"] = "一条私人信息";
@@ -63,131 +270,8 @@ $a->strings["[Friendica System Notify]"] = "";
 $a->strings["registration request"] = "注册请求";
 $a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "";
 $a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "";
-$a->strings["Full Name:\t%1\$s\\nSite Location:\t%2\$s\\nLogin Name:\t%3\$s (%4\$s)"] = "";
+$a->strings["Full Name:\t%s\nSite Location:\t%s\nLogin Name:\t%s (%s)"] = "";
 $a->strings["Please visit %s to approve or reject the request."] = "请访问%s来批准或拒绝这个请求。";
-$a->strings["Daily posting limit of %d post reached. The post was rejected."] = [
-	0 => "达到每日 %d 发文限制。此文被拒绝发出。",
-];
-$a->strings["Weekly posting limit of %d post reached. The post was rejected."] = [
-	0 => "达到每周 %d 发文限制。此文被拒绝发出。",
-];
-$a->strings["Monthly posting limit of %d post reached. The post was rejected."] = "达到每月 %d 发文限制。此文被拒绝发出。";
-$a->strings["Profile Photos"] = "简介照片";
-$a->strings["event"] = "事件";
-$a->strings["status"] = "现状";
-$a->strings["photo"] = "照片";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s 喜欢 %2\$s 的 %3\$s";
-$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s 不喜欢 %2\$s 的 %3\$s";
-$a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$s 参加了 %2\$s 的 %3\$s";
-$a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s 没有参加 %2\$s 的 %3\$s";
-$a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "";
-$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s是成为%2\$s的朋友";
-$a->strings["%1\$s poked %2\$s"] = "%1\$s把%2\$s戳";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s把%4\$s标签%2\$s的%3\$s";
-$a->strings["post/item"] = "文章／项目";
-$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s标注%2\$s的%3\$s为偏爱";
-$a->strings["Likes"] = "喜欢";
-$a->strings["Dislikes"] = "不喜欢";
-$a->strings["Attending"] = [
-	0 => "正在参加",
-];
-$a->strings["Not attending"] = "不在参加";
-$a->strings["Might attend"] = "可以参加";
-$a->strings["Select"] = "选择";
-$a->strings["Delete"] = "删除";
-$a->strings["View %s's profile @ %s"] = "看%s的简介@ %s";
-$a->strings["Categories:"] = "种类：";
-$a->strings["Filed under:"] = "归档在：";
-$a->strings["%s from %s"] = "%s从%s";
-$a->strings["View in context"] = "看在上下文";
-$a->strings["Please wait"] = "请等一下";
-$a->strings["remove"] = "删除";
-$a->strings["Delete Selected Items"] = "删除选的项目";
-$a->strings["Follow Thread"] = "";
-$a->strings["View Status"] = "看现状";
-$a->strings["View Profile"] = "看简介";
-$a->strings["View Photos"] = "看照片";
-$a->strings["Network Posts"] = "网络文章";
-$a->strings["View Contact"] = "查看联系人";
-$a->strings["Send PM"] = "发送私信";
-$a->strings["Poke"] = "戳";
-$a->strings["Connect/Follow"] = "连接/关注";
-$a->strings["%s likes this."] = "%s喜欢这个.";
-$a->strings["%s doesn't like this."] = "%s没有喜欢这个.";
-$a->strings["%s attends."] = "%s 参加。";
-$a->strings["%s doesn't attend."] = "%s 不参加。";
-$a->strings["%s attends maybe."] = "";
-$a->strings["and"] = "和";
-$a->strings["and %d other people"] = "和 %d 个其他人";
-$a->strings["<span  %1\$s>%2\$d people</span> like this"] = "<span  %1\$s>%2\$d个人</span>喜欢";
-$a->strings["%s like this."] = "%s 赞了这个。";
-$a->strings["<span  %1\$s>%2\$d people</span> don't like this"] = "<span  %1\$s>%2\$d个人</span>不喜欢";
-$a->strings["%s don't like this."] = "%s 踩了这个。";
-$a->strings["<span  %1\$s>%2\$d people</span> attend"] = "<span  %1\$s>%2\$d 人</span>参加";
-$a->strings["%s attend."] = "%s 参加。";
-$a->strings["<span  %1\$s>%2\$d people</span> don't attend"] = "<span  %1\$s>%2\$d 人</span>不参加";
-$a->strings["%s don't attend."] = "%s 不参加。";
-$a->strings["<span  %1\$s>%2\$d people</span> attend maybe"] = "<span  %1\$s>%2\$d人</span>可能参加";
-$a->strings["%s attend maybe."] = "";
-$a->strings["Visible to <strong>everybody</strong>"] = "<strong>大家</strong>可见的";
-$a->strings["Please enter a link URL:"] = "请输入一个链接 URL：";
-$a->strings["Please enter a video link/URL:"] = "请输入视频连接／URL：";
-$a->strings["Please enter an audio link/URL:"] = "请输入音响连接／URL：";
-$a->strings["Tag term:"] = "标签:";
-$a->strings["Save to Folder:"] = "保存再文件夹：";
-$a->strings["Where are you right now?"] = "你在哪里?";
-$a->strings["Delete item(s)?"] = "把项目删除吗？";
-$a->strings["New Post"] = "";
-$a->strings["Share"] = "分享";
-$a->strings["Upload photo"] = "上传照片";
-$a->strings["upload photo"] = "上传照片";
-$a->strings["Attach file"] = "附上文件";
-$a->strings["attach file"] = "附上文件";
-$a->strings["Insert web link"] = "插入网页链接";
-$a->strings["web link"] = "网页链接";
-$a->strings["Insert video link"] = "插入视频链接";
-$a->strings["video link"] = "视频链接";
-$a->strings["Insert audio link"] = "插入音频链接";
-$a->strings["audio link"] = "音频链接";
-$a->strings["Set your location"] = "设定您的位置";
-$a->strings["set location"] = "指定位置";
-$a->strings["Clear browser location"] = "清空浏览器位置";
-$a->strings["clear location"] = "清除位置";
-$a->strings["Set title"] = "指定标题";
-$a->strings["Categories (comma-separated list)"] = "种类（逗号分隔单）";
-$a->strings["Permission settings"] = "权设置";
-$a->strings["permissions"] = "权利";
-$a->strings["Public post"] = "公开的消息";
-$a->strings["Preview"] = "预览";
-$a->strings["Cancel"] = "取消";
-$a->strings["Post to Groups"] = "发到组";
-$a->strings["Post to Contacts"] = "发给联系人";
-$a->strings["Private post"] = "私人文章";
-$a->strings["Message"] = "通知";
-$a->strings["Browser"] = "浏览器";
-$a->strings["View all"] = "查看全部";
-$a->strings["Like"] = [
-	0 => "喜欢",
-];
-$a->strings["Dislike"] = [
-	0 => "不喜欢",
-];
-$a->strings["Not Attending"] = [
-	0 => "不在参加",
-];
-$a->strings["Undecided"] = [
-	0 => "未决定的",
-];
-$a->strings["Item not found."] = "项目找不到。";
-$a->strings["Do you really want to delete this item?"] = "您真的想删除这个项目吗？";
-$a->strings["Yes"] = "是";
-$a->strings["Permission denied."] = "权限不够。";
-$a->strings["Archives"] = "档案";
-$a->strings["show more"] = "显示更多";
-$a->strings["Welcome "] = "欢迎";
-$a->strings["Please upload a profile photo."] = "请上传一张简介照片";
-$a->strings["Welcome back "] = "欢迎回来";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "表格安全令牌不对。最可能因为表格开着太久（三个小时以上）提交前。";
 $a->strings["newer"] = "更新";
 $a->strings["older"] = "更旧";
 $a->strings["first"] = "首先";
@@ -207,8 +291,6 @@ $a->strings["Search"] = "搜索";
 $a->strings["@name, !forum, #tags, content"] = "";
 $a->strings["Full Text"] = "全文";
 $a->strings["Tags"] = "标签：";
-$a->strings["Contacts"] = "联系人";
-$a->strings["Forums"] = "论坛";
 $a->strings["poke"] = "戳";
 $a->strings["poked"] = "戳了";
 $a->strings["ping"] = "砰";
@@ -270,43 +352,544 @@ $a->strings["comment"] = [
 ];
 $a->strings["post"] = "文章";
 $a->strings["Item filed"] = "把项目归档了";
-$a->strings["No friends to display."] = "没有朋友展示。";
-$a->strings["Connect"] = "连接";
-$a->strings["Authorize application connection"] = "授权应用连接";
-$a->strings["Return to your app and insert this Securty Code:"] = "回归您的应用和输入这个安全密码：";
-$a->strings["Please login to continue."] = "请登录以继续。";
-$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "你要授权这个应用访问你的文章和联系人，及/或为你创建新的文章吗？";
-$a->strings["No"] = "否";
-$a->strings["You must be logged in to use addons. "] = "您用插件前要登录";
-$a->strings["Applications"] = "应用";
-$a->strings["No installed applications."] = "没有安装的应用";
-$a->strings["Item not available."] = "项目不可用的";
-$a->strings["Item was not found."] = "找不到项目。";
-$a->strings["No contacts in common."] = "没有共同的联系人。";
-$a->strings["Common Friends"] = "普通朋友们";
-$a->strings["Credits"] = "贡献";
-$a->strings["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!"] = "Friendica 是一个社区项目，如果没有许多人的努力她将无法实现。这里列出了那些为代码作出贡献或者参与本地化翻译的人们。感谢大家的努力！";
-$a->strings["Photos"] = "照片";
-$a->strings["Contact Photos"] = "联系人照片";
-$a->strings["Upload"] = "上传";
-$a->strings["Files"] = "文件";
-$a->strings["Not Found"] = "未发现";
-$a->strings["No profile"] = "无简介";
-$a->strings["Welcome to %s"] = "%s欢迎你";
+$a->strings["Daily posting limit of %d post reached. The post was rejected."] = [
+	0 => "达到每日 %d 发文限制。此文被拒绝发出。",
+];
+$a->strings["Weekly posting limit of %d post reached. The post was rejected."] = [
+	0 => "达到每周 %d 发文限制。此文被拒绝发出。",
+];
+$a->strings["Monthly posting limit of %d post reached. The post was rejected."] = "达到每月 %d 发文限制。此文被拒绝发出。";
+$a->strings["Profile Photos"] = "简介照片";
+$a->strings["Contact settings applied."] = "联系人设置已应用。";
+$a->strings["Contact update failed."] = "联系人更新失败。";
+$a->strings["Contact not found."] = "没有找到联系人。";
+$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>警告：此为进阶</strong>，如果您输入不正确的信息，您也许无法与这位联系人的正常通讯。";
+$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "请<strong>立即</strong>用后退按钮如果您不确定怎么用这页";
+$a->strings["No mirroring"] = "没有复制";
+$a->strings["Mirror as forwarded posting"] = "复制为传达文章";
+$a->strings["Mirror as my own posting"] = "复制为我自己的文章";
+$a->strings["Return to contact editor"] = "返回到联系人编辑器";
+$a->strings["Refetch contact data"] = "重新获取联系人数据";
+$a->strings["Remote Self"] = "遥远的自身";
+$a->strings["Mirror postings from this contact"] = "把这个熟人的文章复制。";
+$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "表明这个熟人当遥远的自身。Friendica要把这个熟人的新的文章复制。";
+$a->strings["Name"] = "名字";
+$a->strings["Account Nickname"] = "帐户昵称";
+$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname越过名／昵称";
+$a->strings["Account URL"] = "帐户URL";
+$a->strings["Friend Request URL"] = "朋友请求URL";
+$a->strings["Friend Confirm URL"] = "朋友确认URL";
+$a->strings["Notification Endpoint URL"] = "通知端URL";
+$a->strings["Poll/Feed URL"] = "喂URL";
+$a->strings["New photo from this URL"] = "新照片从这个URL";
+$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "一天最多墙通知给%s超过了。通知没有通过 。";
+$a->strings["No recipient selected."] = "没有选择的接受者。";
+$a->strings["Unable to check your home location."] = "核对不了您的主页。";
+$a->strings["Message could not be sent."] = "消息发不了。";
+$a->strings["Message collection failure."] = "通信受到错误。";
+$a->strings["Message sent."] = "消息发了";
+$a->strings["No recipient."] = "没有接受者。";
+$a->strings["Send Private Message"] = "发私人的通信";
+$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "如果您想%s回答，请核对您网站的隐私设置允许生发送人的私人邮件。";
+$a->strings["To:"] = "到：";
+$a->strings["Subject:"] = "题目：";
+$a->strings["Your message:"] = "你的消息：";
 $a->strings["Remote privacy information not available."] = "摇隐私信息无效";
 $a->strings["Visible to:"] = "可见给：";
-$a->strings["System down for maintenance"] = "系统关闭为了维持";
+$a->strings["Friendica Communications Server - Setup"] = "Friendica沟通服务器－安装";
+$a->strings["Could not connect to database."] = "解不了数据库。";
+$a->strings["Could not create table."] = "无法创建表格。";
+$a->strings["Your Friendica site database has been installed."] = "您Friendica网站数据库被安装了。";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "您可能要手工地进口文件「database.sql」用phpmyadmin或mysql。";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "请看文件「INSTALL.txt」";
+$a->strings["Database already in use."] = "数据库已经被使用。";
+$a->strings["System check"] = "系统检测";
+$a->strings["Next"] = "下";
+$a->strings["Check again"] = "再检测";
+$a->strings["Database connection"] = "数据库接通";
+$a->strings["In order to install Friendica we need to know how to connect to your database."] = "为安装Friendica我们要知道怎么连接您的数据库。";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "你有关于这些设置有问题的话，请给互联网托管服务或者网页管理联系。";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "您下边指定的数据库应该已经存在。如果还没有，请创建后继续。";
+$a->strings["Database Server Name"] = "数据库服务器名";
+$a->strings["Database Login Name"] = "数据库登录名";
+$a->strings["Database Login Password"] = "数据库登录密码";
+$a->strings["For security reasons the password must not be empty"] = "由于安全的原因，密码不能为空";
+$a->strings["Database Name"] = "数据库名字";
+$a->strings["Site administrator email address"] = "网站行政人员邮件地址";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "您账户邮件地址必要符合这个为用网站处理仪表板";
+$a->strings["Please select a default timezone for your website"] = "请选择您网站的默认时区";
+$a->strings["Site settings"] = "网站设置";
+$a->strings["System Language:"] = "系统语言：";
+$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "为 Friendica 安装界面及邮件发送设置默认语言。";
+$a->strings["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."] = "";
+$a->strings["<h1>What next</h1>"] = "<h1>下步是什么</h1>";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the worker."] = "";
+$a->strings["Go to your new Friendica node <a href=\"%s/register\">registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel."] = "";
+$a->strings["Profile not found."] = "找不到简介。";
+$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "这会偶尔地发生熟人双方都要求和已经批准的时候。";
+$a->strings["Response from remote site was not understood."] = "遥网站的回答明白不了。";
+$a->strings["Unexpected response from remote site: "] = "居然回答从遥网站：";
+$a->strings["Confirmation completed successfully."] = "确认成功完成。";
+$a->strings["Temporary failure. Please wait and try again."] = "临时失败。请等一会，再试。";
+$a->strings["Introduction failed or was revoked."] = "介绍失败或被吊销。";
+$a->strings["Remote site reported: "] = "远程站点报告：";
+$a->strings["Unable to set contact photo."] = "无法设置联系人照片。";
+$a->strings["No user record found for '%s' "] = "找不到「%s」的用户记录";
+$a->strings["Our site encryption key is apparently messed up."] = "看起来我们的加密钥匙失灵了。";
+$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "空的URL供应，或URL解不了码。";
+$a->strings["Contact record was not found for you on our site."] = "无法在本站点为您找到联系人记录。";
+$a->strings["Site public key not available in contact record for URL %s."] = "没有网站公开钥匙在熟人记录在URL%s。";
+$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "身份证明由您的系统是在我们的重做。你再试应该运行。";
+$a->strings["Unable to set your contact credentials on our system."] = "不能创作您的熟人证件在我们的系统。";
+$a->strings["Unable to update your contact profile details on our system"] = "不能更新您的熟人简介消息在我们的系统";
+$a->strings["[Name Withheld]"] = "[名字拒给]";
+$a->strings["People Search - %s"] = "搜索人 - %s";
+$a->strings["Forum Search - %s"] = "搜索论坛 - %s";
+$a->strings["Connect"] = "连接";
+$a->strings["No matches"] = "没有结果";
+$a->strings["Manage Identities and/or Pages"] = "管理身份或页";
+$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "交替不同同一人或社会／组页合用您的账户或给您「管理」批准";
+$a->strings["Select an identity to manage: "] = "选择同一个人管理：";
+$a->strings["Do you really want to delete this video?"] = "你真的想删除这个视频吗？";
+$a->strings["Delete Video"] = "删除视频";
+$a->strings["Public access denied."] = "拒绝公开访问";
+$a->strings["No videos selected"] = "没有视频被选择";
+$a->strings["Access to this item is restricted."] = "这个项目使用权限的。";
+$a->strings["View Album"] = "看照片册";
+$a->strings["Recent Videos"] = "最近的视频";
+$a->strings["Upload New Videos"] = "上传新视频";
+$a->strings["Only logged in users are permitted to perform a probing."] = "只有已登录用户才被允许进行探测。";
+$a->strings["Location:"] = "位置:";
+$a->strings["Gender:"] = "性别:";
+$a->strings["Status:"] = "现状:";
+$a->strings["Homepage:"] = "主页:";
+$a->strings["About:"] = "关于：";
+$a->strings["Find on this site"] = "找在这网站";
+$a->strings["Results for:"] = "结果：";
+$a->strings["Site Directory"] = "网站目录";
+$a->strings["No entries (some entries may be hidden)."] = "没有文章(有的文章会被隐藏)。";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "没有符合的关键字。请在您的默认简介加关键字。";
+$a->strings["is interested in:"] = "感兴趣对：";
+$a->strings["Profile Match"] = "简介符合";
+$a->strings["everybody"] = "每人";
+$a->strings["Account"] = "帐户";
+$a->strings["Profiles"] = "简介";
+$a->strings["Additional features"] = "附加的特点";
+$a->strings["Display"] = "显示";
+$a->strings["Social Networks"] = "社会化网络";
+$a->strings["Addons"] = "插件";
+$a->strings["Delegations"] = "代表";
+$a->strings["Connected apps"] = "连接着应用";
+$a->strings["Export personal data"] = "导出个人信息";
+$a->strings["Remove account"] = "删除账户";
+$a->strings["Missing some important data!"] = "缺失一些重要数据！";
+$a->strings["Update"] = "更新";
+$a->strings["Failed to connect with email account using the settings provided."] = "不能连接电子邮件账户用输入的设置。";
+$a->strings["Email settings updated."] = "电子邮件设置更新了";
+$a->strings["Features updated"] = "特点更新了";
+$a->strings["Relocate message has been send to your contacts"] = "调动消息已发送给您的联系人";
+$a->strings["Passwords do not match. Password unchanged."] = "密码不匹配。密码没改变。";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "空的密码禁止。密码没未改变的。";
+$a->strings["The new password has been exposed in a public data dump, please choose another."] = "新密码已暴露在公共数据转储中，请务必另选密码。";
+$a->strings["Wrong password."] = "密码不正确。";
+$a->strings["Password changed."] = "密码变化了。";
+$a->strings["Password update failed. Please try again."] = "密码更新失败了。请再试。";
+$a->strings[" Please use a shorter name."] = " 请用一个更短的名字。";
+$a->strings[" Name too short."] = " 名字过短。";
+$a->strings["Wrong Password"] = "密码不正确";
+$a->strings["Invalid email."] = "无效的邮箱。";
+$a->strings["Cannot change to that email."] = "无法更改到此电子邮件地址。";
+$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "私人评坛没有隐私批准。默认隐私组用者。";
+$a->strings["Private forum has no privacy permissions and no default privacy group."] = "私人评坛没有隐私批准或默认隐私组。";
+$a->strings["Settings updated."] = "设置更新了。";
+$a->strings["Add application"] = "加入应用";
+$a->strings["Save Settings"] = "保存设置";
+$a->strings["Consumer Key"] = "钥匙(Consumer Key)";
+$a->strings["Consumer Secret"] = "密码(Consumer Secret)";
+$a->strings["Redirect"] = "重定向";
+$a->strings["Icon url"] = "图符URL";
+$a->strings["You can't edit this application."] = "您不能编辑这个应用。";
+$a->strings["Connected Apps"] = "连接着应用";
+$a->strings["Edit"] = "编辑";
+$a->strings["Client key starts with"] = "客户钥匙头字是";
+$a->strings["No name"] = "无名";
+$a->strings["Remove authorization"] = "撤消权能";
+$a->strings["No Addon settings configured"] = "无插件设置配置完成";
+$a->strings["Addon Settings"] = "插件设置";
+$a->strings["Off"] = "关";
+$a->strings["On"] = "开";
+$a->strings["Additional Features"] = "附加特性";
+$a->strings["Diaspora"] = "Diaspora";
+$a->strings["enabled"] = "能够做的";
+$a->strings["disabled"] = "已停用";
+$a->strings["Built-in support for %s connectivity is %s"] = "包括的支持为%s连通性是%s";
+$a->strings["GNU Social (OStatus)"] = "GNU Social (OStatus)";
+$a->strings["Email access is disabled on this site."] = "电子邮件访问在这个站上被禁用。";
+$a->strings["General Social Media Settings"] = "通用社交媒体设置";
+$a->strings["Disable Content Warning"] = "禁用内容警告";
+$a->strings["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 collapsing and sets the content warning as the post title. Doesn't affect any other content filtering you eventually set up."] = "";
+$a->strings["Disable intelligent shortening"] = "";
+$a->strings["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."] = "";
+$a->strings["Automatically follow any GNU Social (OStatus) followers/mentioners"] = "自动关注任何 GNU Social (OStatus) 关注者/提及者";
+$a->strings["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."] = "";
+$a->strings["Default group for OStatus contacts"] = "用于 OStatus 联系人的默认组";
+$a->strings["Your legacy GNU Social account"] = "您遗留的 GNU Social 账户";
+$a->strings["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."] = "如果您在这里输入您旧的 GNU Social/Statusnet 账号名 (格式示例 user@domain.tld) ，您的联系人列表将会被自动添加。完成后该字段将被清空。";
+$a->strings["Repair OStatus subscriptions"] = "修复 OStatus 订阅";
+$a->strings["Email/Mailbox Setup"] = "邮件收件箱设置";
+$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "如果您想用这股服务(可选的)跟邮件熟人交流，请指定怎么连通您的收件箱。";
+$a->strings["Last successful email check:"] = "上个成功收件箱检查：";
+$a->strings["IMAP server name:"] = "IMAP服务器名字：";
+$a->strings["IMAP port:"] = "IMAP服务器端口：";
+$a->strings["Security:"] = "安全：";
+$a->strings["None"] = "没有";
+$a->strings["Email login name:"] = "邮件登录名：";
+$a->strings["Email password:"] = "邮件密码：";
+$a->strings["Reply-to address:"] = "回答地址：";
+$a->strings["Send public posts to all email contacts:"] = "发送公开文章给所有的邮件联系人：";
+$a->strings["Action after import:"] = "进口后行动：";
+$a->strings["Mark as seen"] = "标注看过";
+$a->strings["Move to folder"] = "搬到文件夹";
+$a->strings["Move to folder:"] = "搬到文件夹：";
+$a->strings["No special theme for mobile devices"] = "没专门适合手机的主题";
+$a->strings["%s - (Unsupported)"] = "%s - (不支持的)";
+$a->strings["%s - (Experimental)"] = "%s - (实验性)";
+$a->strings["Display Settings"] = "表示设置";
+$a->strings["Display Theme:"] = "显示主题：";
+$a->strings["Mobile Theme:"] = "手机主题：";
+$a->strings["Suppress warning of insecure networks"] = "";
+$a->strings["Should the system suppress the warning that the current group contains members of networks that can't receive non public postings."] = "";
+$a->strings["Update browser every xx seconds"] = "更新游览器每XX秒";
+$a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "至少 10 秒。输入 -1 禁用。";
+$a->strings["Number of items to display per page:"] = "每页表示多少项目：";
+$a->strings["Maximum of 100 items"] = "最多100项目";
+$a->strings["Number of items to display per page when viewed from mobile device:"] = "用手机看一页展示多少项目：";
+$a->strings["Don't show emoticons"] = "不显示表情符号";
+$a->strings["Calendar"] = "日历";
+$a->strings["Beginning of week:"] = "一周的开始：";
+$a->strings["Don't show notices"] = "不显示提示";
+$a->strings["Infinite scroll"] = "无限的滚动";
+$a->strings["Automatic updates only at the top of the network page"] = "仅在返回到网页头部时自动更新";
+$a->strings["When disabled, the network page is updated all the time, which could be confusing while reading."] = "禁用后，网页将会一直更新，这可能会对阅读造成干扰。";
+$a->strings["Bandwidth Saver Mode"] = "";
+$a->strings["When enabled, embedded content is not displayed on automatic updates, they only show on page reload."] = "当启用时，嵌入的内容不会在自动更新时显示，它们只在页面重载时显示。";
+$a->strings["Smart Threading"] = "";
+$a->strings["When enabled, suppress extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled."] = "";
+$a->strings["General Theme Settings"] = "通用主题设置";
+$a->strings["Custom Theme Settings"] = "自定义主题设置";
+$a->strings["Content Settings"] = "内容设置";
+$a->strings["Unable to find your profile. Please contact your admin."] = "无法找到您的简介。请联系您的管理员。";
+$a->strings["Account Types"] = "账户类型";
+$a->strings["Personal Page Subtypes"] = "";
+$a->strings["Community Forum Subtypes"] = "";
+$a->strings["Personal Page"] = "个人页面";
+$a->strings["Account for a personal profile."] = "";
+$a->strings["Organisation Page"] = "组织页面";
+$a->strings["Account for an organisation that automatically approves contact requests as \"Followers\"."] = "";
+$a->strings["News Page"] = "新闻页面";
+$a->strings["Account for a news reflector that automatically approves contact requests as \"Followers\"."] = "";
+$a->strings["Community Forum"] = "社区论坛";
+$a->strings["Account for community discussions."] = "";
+$a->strings["Normal Account Page"] = "标准账户页面";
+$a->strings["Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."] = "";
+$a->strings["Soapbox Page"] = "演讲台页";
+$a->strings["Account for a public profile that automatically approves contact requests as \"Followers\"."] = "";
+$a->strings["Public Forum"] = "公共论坛";
+$a->strings["Automatically approves all contact requests."] = "自动批准所有联系人请求。";
+$a->strings["Automatic Friend Page"] = "自动朋友页";
+$a->strings["Account for a popular profile that automatically approves contact requests as \"Friends\"."] = "";
+$a->strings["Private Forum [Experimental]"] = "隐私评坛［实验性的 ］";
+$a->strings["Requires manual approval of contact requests."] = "需要人工批准联系人请求。";
+$a->strings["OpenID:"] = "OpenID:";
+$a->strings["(Optional) Allow this OpenID to login to this account."] = "(可选的) 允许这个 OpenID 登录这个账户。";
+$a->strings["Publish your default profile in your local site directory?"] = "出版您默认简介在您当地的网站目录？";
+$a->strings["Your profile will be published in this node's <a href=\"%s\">local directory</a>. Your profile details may be publicly visible depending on the system settings."] = "";
+$a->strings["No"] = "否";
+$a->strings["Publish your default profile in the global social directory?"] = "出版您默认简介在综合社会目录？";
+$a->strings["Your profile will be published in the global friendica directories (e.g. <a href=\"%s\">%s</a>). Your profile will be visible in public."] = "";
+$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "在您的默认简介中向访问者隐藏您的联系人/朋友列表？";
+$a->strings["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"] = "您的联系人列表将不会在您的默认简介页面展示。您可以决定在您自建的各附加简介中分别展示您的联系人列表";
+$a->strings["Hide your profile details from anonymous viewers?"] = "对匿名访问者隐藏详细简介？";
+$a->strings["Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means."] = "";
+$a->strings["Allow friends to post to your profile page?"] = "允许朋友们贴文章在您的简介页？";
+$a->strings["Your contacts may write posts on your profile wall. These posts will be distributed to your contacts"] = "";
+$a->strings["Allow friends to tag your posts?"] = "允许朋友们标签您的文章？";
+$a->strings["Your contacts can add additional tags to your posts."] = "您的联系人可以为您的帖子添加额外的标签。";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "允许我们建议您潜力朋友给新成员？";
+$a->strings["If you like, Friendica may suggest new members to add you as a contact."] = "如果您愿意，Friendica 可能会建议新成员将您添加为联系人。";
+$a->strings["Permit unknown people to send you private mail?"] = "允许生人寄给您私人邮件？";
+$a->strings["Friendica network users may send you private messages even if they are not in your contact list."] = "Friendica 网络用户可能会向您发送私人信息，即使他们不在您的联系人列表中。";
+$a->strings["Profile is <strong>not published</strong>."] = "简介<strong>未发布</strong>。";
+$a->strings["Your Identity Address is <strong>'%s'</strong> or '%s'."] = "你的身份地址是 <strong>'%s'</strong> 或者 '%s'.";
+$a->strings["Automatically expire posts after this many days:"] = "在这数天后自动使文章过期：";
+$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "如果为空，文章不会过期。过期的文章将被删除";
+$a->strings["Advanced expiration settings"] = "高级过期设置";
+$a->strings["Advanced Expiration"] = "先进的过期";
+$a->strings["Expire posts:"] = "把文章过期：";
+$a->strings["Expire personal notes:"] = "把私人便条过期：";
+$a->strings["Expire starred posts:"] = "把星的文章过期：";
+$a->strings["Expire photos:"] = "把照片过期：";
+$a->strings["Only expire posts by others:"] = "只别人的文章过期：";
+$a->strings["Account Settings"] = "帐户设置";
+$a->strings["Password Settings"] = "密码设置";
+$a->strings["New Password:"] = "新密码：";
+$a->strings["Confirm:"] = "确认：";
+$a->strings["Leave password fields blank unless changing"] = "留空密码字段，除非要修改";
+$a->strings["Current Password:"] = "当前密码：";
+$a->strings["Your current password to confirm the changes"] = "你的当前密码，来确认修改";
+$a->strings["Password:"] = "密码：";
+$a->strings["Basic Settings"] = "基础设置";
+$a->strings["Full Name:"] = "全名：";
+$a->strings["Email Address:"] = "电子邮件地址:";
+$a->strings["Your Timezone:"] = "你的时区：";
+$a->strings["Your Language:"] = "你的语言：";
+$a->strings["Set the language we use to show you friendica interface and to send you emails"] = "";
+$a->strings["Default Post Location:"] = "默认文章位置：";
+$a->strings["Use Browser Location:"] = "使用浏览器位置：";
+$a->strings["Security and Privacy Settings"] = "安全和隐私设置";
+$a->strings["Maximum Friend Requests/Day:"] = "每天最大朋友请求数：";
+$a->strings["(to prevent spam abuse)"] = "（用于防止垃圾信息滥用）";
+$a->strings["Default Post Permissions"] = "默认文章权限";
+$a->strings["(click to open/close)"] = "（点击来打开/关闭）";
+$a->strings["Show to Groups"] = "给组表示";
+$a->strings["Show to Contacts"] = "展示给联系人";
+$a->strings["Default Private Post"] = "默认私人文章";
+$a->strings["Default Public Post"] = "默认公开文章";
+$a->strings["Default Permissions for New Posts"] = "新文章的默认权限";
+$a->strings["Maximum private messages per day from unknown people:"] = "每天来自未知的人的私信：";
+$a->strings["Notification Settings"] = "通知设置";
+$a->strings["Send a notification email when:"] = "发一个消息要是：";
+$a->strings["You receive an introduction"] = "你收到一份介绍";
+$a->strings["Your introductions are confirmed"] = "你的介绍被确认了";
+$a->strings["Someone writes on your profile wall"] = "某人写在你的简历墙";
+$a->strings["Someone writes a followup comment"] = "某人写一个后续的评论";
+$a->strings["You receive a private message"] = "你收到一封私信";
+$a->strings["You receive a friend suggestion"] = "你受到一个朋友建议";
+$a->strings["You are tagged in a post"] = "你被在新闻标签";
+$a->strings["You are poked/prodded/etc. in a post"] = "您在文章被戳";
+$a->strings["Activate desktop notifications"] = "启用桌面通知";
+$a->strings["Show desktop popup on new notifications"] = "在有新的提示时显示桌面弹出窗口";
+$a->strings["Text-only notification emails"] = "纯文本通知邮件";
+$a->strings["Send text only notification emails, without the html part"] = "发送纯文本通知邮件，无 html 部分";
+$a->strings["Show detailled notifications"] = "显示详细通知";
+$a->strings["Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed."] = "";
+$a->strings["Advanced Account/Page Type Settings"] = "专家账户／页种设置";
+$a->strings["Change the behaviour of this account for special situations"] = "把这个账户特别情况的时候行动变化";
+$a->strings["Relocate"] = "调动";
+$a->strings["If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."] = "如果您调动这个简介从别的服务器但有的熟人没收到您的更新，尝试按这个钮。";
+$a->strings["Resend relocate message to contacts"] = "把调动信息寄给熟人";
+$a->strings["{0} wants to be your friend"] = "{0}想成为您的朋友";
+$a->strings["{0} sent you a message"] = "{0}发给您一个通信";
+$a->strings["{0} requested registration"] = "{0}要求注册";
+$a->strings["Remove term"] = "删除关键字";
+$a->strings["Saved Searches"] = "保存的搜索";
+$a->strings["Only logged in users are permitted to perform a search."] = "只有已登录的用户被允许进行搜索。";
+$a->strings["Too Many Requests"] = "过多请求";
+$a->strings["Only one search per minute is permitted for not logged in users."] = "对未登录的用户，每分钟只允许一条搜索。";
+$a->strings["No results."] = "没有结果。";
+$a->strings["Items tagged with: %s"] = "项目标记为：%s";
+$a->strings["Results for: %s"] = "";
+$a->strings["No contacts in common."] = "没有共同的联系人。";
+$a->strings["Common Friends"] = "普通朋友们";
+$a->strings["Login"] = "登录";
+$a->strings["The post was created"] = "文章创建了";
+$a->strings["add"] = "添加";
+$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = [
+	0 => "警告：这个组包含 %s 来自不允许非公开消息的网络的成员。",
+];
+$a->strings["Messages in this group won't be send to these receivers."] = "这个组中的消息不会被发送至这些接收者。";
+$a->strings["No such group"] = "没有这个组";
+$a->strings["Group is empty"] = "组没有成员";
+$a->strings["Group: %s"] = "组：%s";
+$a->strings["Private messages to this person are at risk of public disclosure."] = "私人通信给这个人回被公开。";
+$a->strings["Invalid contact."] = "无效的联系人。";
+$a->strings["Commented Order"] = "评论时间顺序";
+$a->strings["Sort by Comment Date"] = "按评论日期顺序排列";
+$a->strings["Posted Order"] = "发布时间顺序";
+$a->strings["Sort by Post Date"] = "按发布日期顺序排列";
+$a->strings["Personal"] = "私人";
+$a->strings["Posts that mention or involve you"] = "提及你或你参与的文章";
+$a->strings["New"] = "新";
+$a->strings["Activity Stream - by date"] = "活动流－按日期";
+$a->strings["Shared Links"] = "共享的链接";
+$a->strings["Interesting Links"] = "有意思的超链接";
+$a->strings["Starred"] = "被星";
+$a->strings["Favourite Posts"] = "最喜欢的文章";
+$a->strings["Group created."] = "群组已创建。";
+$a->strings["Could not create group."] = "无法创建群组。";
+$a->strings["Group not found."] = "组找不到。";
+$a->strings["Group name changed."] = "组名变化了。";
+$a->strings["Save Group"] = "保存组";
+$a->strings["Filter"] = "";
+$a->strings["Create a group of contacts/friends."] = "创建一组联系人／朋友。";
+$a->strings["Group Name: "] = "组名：";
+$a->strings["Contacts not in any group"] = "不在任何组的联系人";
+$a->strings["Group removed."] = "组删除了。";
+$a->strings["Unable to remove group."] = "不能删除组。";
+$a->strings["Delete Group"] = "删除群组";
+$a->strings["Edit Group Name"] = "编辑群组名称";
+$a->strings["Members"] = "成员";
+$a->strings["All Contacts"] = "所有联系人";
+$a->strings["Remove contact from group"] = "";
+$a->strings["Click on a contact to add or remove."] = "单击联系人以添加或删除。";
+$a->strings["Add contact to group"] = "";
+$a->strings["Parent user not found."] = "未找到家长账户。";
+$a->strings["No parent user"] = "无家长账户";
+$a->strings["Parent Password:"] = "家长密码：";
+$a->strings["Please enter the password of the parent account to legitimize your request."] = "请为家长账户设置密码以使您的请求有效化。";
+$a->strings["Parent User"] = "家长账户";
+$a->strings["Parent users have total control about this account, including the account settings. Please double check whom you give this access."] = "";
+$a->strings["Delegate Page Management"] = "页代表管理";
+$a->strings["Delegates"] = "代表";
+$a->strings["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."] = "代表会管理所有的方面这个账户／页除了基础账户配置以外。请别代表您私人账户给您没完全信的人。";
+$a->strings["Existing Page Delegates"] = "目前页代表";
+$a->strings["Potential Delegates"] = "潜力的代表";
+$a->strings["Remove"] = "移走";
+$a->strings["Add"] = "加";
+$a->strings["No entries."] = "没有项目。";
+$a->strings["Export account"] = "导出账户";
+$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "导出你的账户信息和联系人。用这个功能来生成一个你的账户的备份，并且/或者把它移到另外一个服务器。";
+$a->strings["Export all"] = "导出全部";
+$a->strings["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)"] = "导出你的账户信息、联系人和所有你的项目为 json 格式。可能会是一个很大的文件，并可能花费很多时间。用这个功能来做一个你的账户的全备份（照片不会被导出）";
+$a->strings["Resubscribing to OStatus contacts"] = "重新订阅 OStatus 联系人";
+$a->strings["Error"] = "错误";
+$a->strings["Done"] = "完成";
+$a->strings["Keep this window open until done."] = "保持窗口打开直到完成。";
+$a->strings["Access denied."] = "没有用权。";
+$a->strings["No contacts."] = "没有联系人。";
+$a->strings["Visit %s's profile [%s]"] = "看%s的简介[%s]";
+$a->strings["Contact wasn't found or can't be unfollowed."] = "找不到联系人或者不能关注联系人。";
+$a->strings["Contact unfollowed"] = "取消关注了的联系人";
+$a->strings["Submit Request"] = "提交要求";
+$a->strings["You aren't a friend of this contact."] = "你不是这个联系人的朋友。";
+$a->strings["Unfollowing is currently not supported by your network."] = "取消关注现在不被你的网络支持。";
+$a->strings["Disconnect/Unfollow"] = "断开连接/取消关注";
+$a->strings["Your Identity Address:"] = "你的身份地址：";
+$a->strings["Profile URL"] = "简介 URL";
+$a->strings["Status Messages and Posts"] = "现状通知和文章";
+$a->strings["[Embedded content - reload page to view]"] = "[嵌入内容－重新加载页为看]";
+$a->strings["Registration successful. Please check your email for further instructions."] = "注册成功了。请咨询说明再您的收件箱。";
+$a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "发送邮件失败。你的账户消息是：<br>用户名：%s<br> 密码: %s<br><br>。登录后能改密码。";
+$a->strings["Registration successful."] = "注册成功。";
+$a->strings["Your registration can not be processed."] = "处理不了您的注册。";
+$a->strings["Your registration is pending approval by the site owner."] = "您的注册等网页主的批准。";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "这个网站超过一天最多账户注册。请明天再试。";
+$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "您会(可选的)用OpenID填这个表格通过提供您的OpenID和点击「注册」。";
+$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "如果您没熟悉OpenID,请留空这个栏和填另些栏。";
+$a->strings["Your OpenID (optional): "] = "您的OpenID(可选的):";
+$a->strings["Include your profile in member directory?"] = "放您的简介再员目录？";
+$a->strings["Note for the admin"] = "给管理员的便条";
+$a->strings["Leave a message for the admin, why you want to join this node"] = "给管理员留条消息，为什么你想加入这个节点";
+$a->strings["Membership on this site is by invitation only."] = "会员身份在这个网站是光通过邀请。";
+$a->strings["Your invitation code: "] = "您的邀请码：";
+$a->strings["Registration"] = "注册";
+$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "你的全名 (比如张三，真名或看起来是真名)：";
+$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "您的电子邮件地址：(初始信息将发送到这里，所以这必须是一个存在的地址。)";
+$a->strings["Leave empty for an auto generated password."] = "留空以使用自动生成的密码。";
+$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@%s</strong>'."] = "";
+$a->strings["Choose a nickname: "] = "选择昵称：";
+$a->strings["Register"] = "注册";
+$a->strings["Import"] = "";
+$a->strings["Import your profile to this friendica instance"] = "进口您的简介到这个friendica服务器";
+$a->strings["Terms of Service"] = "服务条款";
+$a->strings["Note: This node explicitly contains adult content"] = "";
+$a->strings["Invalid request identifier."] = "无效要求身份号。";
+$a->strings["Discard"] = "丢弃";
+$a->strings["Ignore"] = "忽视";
+$a->strings["Notifications"] = "通知";
+$a->strings["Network Notifications"] = "网络通知";
+$a->strings["System Notifications"] = "系统通知";
+$a->strings["Personal Notifications"] = "私人通知";
+$a->strings["Home Notifications"] = "主页通知";
+$a->strings["Show Ignored Requests"] = "显示被忽视的请求";
+$a->strings["Hide Ignored Requests"] = "隐藏被忽视的请求";
+$a->strings["Notification type:"] = "";
+$a->strings["Suggested by:"] = "";
+$a->strings["Hide this contact from others"] = "对其他人隐藏这个联系人";
+$a->strings["Approve"] = "批准";
+$a->strings["Claims to be known to you: "] = "声称被您认识：";
+$a->strings["yes"] = "是";
+$a->strings["no"] = "否";
+$a->strings["Shall your connection be bidirectional or not?"] = "是否启用双向连接？";
+$a->strings["Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed."] = "";
+$a->strings["Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed."] = "";
+$a->strings["Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed."] = "";
+$a->strings["Friend"] = "朋友";
+$a->strings["Sharer"] = "分享者";
+$a->strings["Subscriber"] = "订阅者";
+$a->strings["Tags:"] = "标签：";
+$a->strings["Network:"] = "网络";
+$a->strings["No introductions."] = "没有介绍。";
+$a->strings["Show unread"] = "显示未读";
+$a->strings["Show all"] = "显示全部";
+$a->strings["No more %s notifications."] = "没有更多的 %s 通知。";
+$a->strings["New Message"] = "新的消息";
+$a->strings["Unable to locate contact information."] = "无法找到联系人信息。";
+$a->strings["Do you really want to delete this message?"] = "您真的想删除这个通知吗？";
+$a->strings["Message deleted."] = "消息删除了。";
+$a->strings["Conversation removed."] = "交流删除了。";
+$a->strings["No messages."] = "没有消息";
+$a->strings["Message not available."] = "通信不可用的";
+$a->strings["Delete message"] = "删除消息";
+$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
+$a->strings["Delete conversation"] = "删除交谈";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "没可用的安全交通。您<strong>可能</strong>会在发送人的简介页会回答。";
+$a->strings["Send Reply"] = "发回答";
+$a->strings["Unknown sender - %s"] = "生发送人－%s";
+$a->strings["You and %s"] = "您和%s";
+$a->strings["%s and You"] = "%s和您";
+$a->strings["%d message"] = [
+	0 => "%d通知",
+];
+$a->strings["No profile"] = "无简介";
+$a->strings["Subscribing to OStatus contacts"] = "正在订阅 OStatus 联系人";
+$a->strings["No contact provided."] = "未提供联系人。";
+$a->strings["Couldn't fetch information for contact."] = "无法获取联系人信息。";
+$a->strings["Couldn't fetch friends for contact."] = "无法取得联系人的朋友信息。";
+$a->strings["success"] = "成功";
+$a->strings["failed"] = "失败";
+$a->strings["ignored"] = "已忽视的";
+$a->strings["%1\$s welcomes %2\$s"] = "%1\$s欢迎%2\$s";
+$a->strings["User deleted their account"] = "";
+$a->strings["On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups."] = "";
+$a->strings["The user id is %d"] = "用户 id 为 %d";
+$a->strings["Remove My Account"] = "删除我的账户";
+$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "这要完全删除您的账户。这一做过，就不能恢复。";
+$a->strings["Please enter your password for verification:"] = "请输入密码为确认：";
+$a->strings["Tag removed"] = "标签去除了";
+$a->strings["Remove Item Tag"] = "去除项目标签";
+$a->strings["Select a tag to remove: "] = "选择删除一个标签: ";
+$a->strings["Welcome to %s"] = "%s欢迎你";
+$a->strings["Do you really want to delete this suggestion?"] = "您真的想删除这个建议吗？";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "没有建议。如果这是新网站，请24小时后再试。";
+$a->strings["Ignore/Hide"] = "忽视／隐藏";
+$a->strings["- select -"] = "－选择－";
+$a->strings["This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s."] = "";
+$a->strings["Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more about the Friendica project."] = "请浏览 <a href=\"https://friendi.ca\">Friendi.ca</a> 以了解更多关于 Friendica 项目的信息。";
+$a->strings["Bug reports and issues: please visit"] = "Bug 及 issues 报告：请访问";
+$a->strings["the bugtracker at github"] = "在 github 上的错误追踪系统";
+$a->strings["Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"] = "";
+$a->strings["Installed addons/apps:"] = "已安装的插件/应用：";
+$a->strings["No installed addons/apps"] = "没有已安装的插件或应用";
+$a->strings["Read about the <a href=\"%1\$s/tos\">Terms of Service</a> of this node."] = "阅读此节点的<a href=\"%1\$s/tos\">服务条款</a>。";
+$a->strings["On this server the following remote servers are blocked."] = "在这个服务器上以下远程服务器被封禁了。";
+$a->strings["Blocked domain"] = "被封禁的域名";
+$a->strings["Reason for the block"] = "封禁原因";
+$a->strings["Access to this profile has been restricted."] = "使用权这个简介被限制了.";
+$a->strings["Invalid request."] = "无效请求。";
+$a->strings["Image exceeds size limit of %s"] = "图片超过 %s 的大小限制";
+$a->strings["Unable to process image."] = "处理不了图像.";
+$a->strings["Wall Photos"] = "墙照片";
+$a->strings["Image upload failed."] = "图像上载失败了.";
 $a->strings["Welcome to Friendica"] = "Friendica欢迎你";
 $a->strings["New Member Checklist"] = "新成员清单";
 $a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "我们想提供一些建议和链接以助于让你有愉快的经历。点击任意一项访问相应的网页。在你注册之后，到这个页面的链接会在你的主页显示两周，之后悄声地消失。";
 $a->strings["Getting Started"] = "入门";
 $a->strings["Friendica Walk-Through"] = "Friendica 漫游";
 $a->strings["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."] = "在你的<em>快速上手</em>页－找到一个简要的对你的简介和网络标签的介绍，创建一些新的连接，并找一些群组加入。";
-$a->strings["Settings"] = "设置";
 $a->strings["Go to Your Settings"] = "您的设置";
 $a->strings["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."] = "在你的<em>设置</em>页 - 改变你最初的密码。同时也记住你的身份地址。这看起来像一个电子邮件地址 - 并且在这个自由的社交网络交友时会有用。";
 $a->strings["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."] = "校对别的设置，特别是隐私设置。一个未发布的目录项目是跟未出版的电话号码一样。平时，你可能应该出版你的目录项目-除非都你的朋友们和可交的朋友们已经知道确切地怎么找你。";
-$a->strings["Profile"] = "简介";
 $a->strings["Upload Profile Photo"] = "上传简历照片";
 $a->strings["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."] = "上传一张简历照片除非你已经做过。研究表明有真正自己的照片的人比没有的交朋友们可能多十倍。";
 $a->strings["Edit Your Profile"] = "编辑您的简介";
@@ -330,284 +913,6 @@ $a->strings["Friendica respects your privacy. By default, your posts will only s
 $a->strings["Getting Help"] = "获取帮助";
 $a->strings["Go to the Help Section"] = "看帮助部分";
 $a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "我们<strong>帮助</strong>页可查阅到详情关于别的编程特点和资源。";
-$a->strings["Visit %s's profile [%s]"] = "看%s的简介[%s]";
-$a->strings["Edit contact"] = "编辑联系人";
-$a->strings["Contacts who are not members of a group"] = "不在组里的联系人";
-$a->strings["Not Extended"] = "未扩展";
-$a->strings["Resubscribing to OStatus contacts"] = "重新订阅 OStatus 联系人";
-$a->strings["Error"] = "错误";
-$a->strings["Done"] = "完成";
-$a->strings["Keep this window open until done."] = "保持窗口打开直到完成。";
-$a->strings["Do you really want to delete this suggestion?"] = "您真的想删除这个建议吗？";
-$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "没有建议。如果这是新网站，请24小时后再试。";
-$a->strings["Ignore/Hide"] = "忽视／隐藏";
-$a->strings["Friend Suggestions"] = "朋友推荐";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "这个网站超过一天最多账户注册。请明天再试。";
-$a->strings["Import"] = "";
-$a->strings["Move account"] = "把账户搬出";
-$a->strings["You can import an account from another Friendica server."] = "您会从别的Friendica服务器进口账户";
-$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "你需要从老服务器导出你的账户并在这里上传。我们会在这里重建你的账户，包括你所有的联系人。我们也会通知你的朋友们你搬到了这里。";
-$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "这个特性是实验性的。我们不能从 OStatus 网络 (GNU Social/Statusnet) 或者 Diaspora 导入联系人";
-$a->strings["Account file"] = "账户文件";
-$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "为了导出你的账户，点击「设置→导出你的个人信息」和选择「导出账户」";
-$a->strings["No keywords to match. Please add keywords to your default profile."] = "没有符合的关键字。请在您的默认简介加关键字。";
-$a->strings["is interested in:"] = "感兴趣对：";
-$a->strings["Profile Match"] = "简介符合";
-$a->strings["No matches"] = "没有结果";
-$a->strings["Manage Identities and/or Pages"] = "管理身份或页";
-$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "交替不同同一人或社会／组页合用您的账户或给您「管理」批准";
-$a->strings["Select an identity to manage: "] = "选择同一个人管理：";
-$a->strings["Submit"] = "提交";
-$a->strings["Invalid request."] = "无效请求。";
-$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "不好意思，可能你上传的是PHP设置允许的大";
-$a->strings["Or - did you try to upload an empty file?"] = "或者，你是不是上传空的文件？";
-$a->strings["File exceeds size limit of %s"] = "文件超过了 %s 的大小限制";
-$a->strings["File upload failed."] = "文件上传失败。";
-$a->strings["- select -"] = "－选择－";
-$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
-$a->strings["Time Conversion"] = "时间装换";
-$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica提供这个服务目的是分享项目跟别的网络和朋友们在别的时区。";
-$a->strings["UTC time: %s"] = "UTC时间: %s";
-$a->strings["Current timezone: %s"] = "现在时区: %s";
-$a->strings["Converted localtime: %s"] = "装换的当地时间：%s";
-$a->strings["Please select your timezone:"] = "请选择你的时区:";
-$a->strings["No more system notifications."] = "没别系统通知。";
-$a->strings["System Notifications"] = "系统通知";
-$a->strings["{0} wants to be your friend"] = "{0}想成为您的朋友";
-$a->strings["{0} sent you a message"] = "{0}发给您一个通信";
-$a->strings["{0} requested registration"] = "{0}要求注册";
-$a->strings["Poke/Prod"] = "戳";
-$a->strings["poke, prod or do other things to somebody"] = "把人家戳或别的行动";
-$a->strings["Recipient"] = "接受者";
-$a->strings["Choose what you wish to do to recipient"] = "选择您想把别人作";
-$a->strings["Make this post private"] = "使这个文章私人";
-$a->strings["Public access denied."] = "拒绝公开访问";
-$a->strings["Only logged in users are permitted to perform a probing."] = "只有已登录用户才被允许进行探测。";
-$a->strings["Permission denied"] = "权限不够";
-$a->strings["Invalid profile identifier."] = "无限的简介标识符。";
-$a->strings["Profile Visibility Editor"] = "简介能见度编辑器。";
-$a->strings["Click on a contact to add or remove."] = "单击联系人以添加或删除。";
-$a->strings["Visible To"] = "能见被";
-$a->strings["All Contacts (with secure profile access)"] = "";
-$a->strings["Account approved."] = "账户已被批准。";
-$a->strings["Registration revoked for %s"] = "撤销了 %s 的注册";
-$a->strings["Please login."] = "请登录。";
-$a->strings["Tag removed"] = "标签去除了";
-$a->strings["Remove Item Tag"] = "去除项目标签";
-$a->strings["Select a tag to remove: "] = "选择删除一个标签: ";
-$a->strings["Remove"] = "移走";
-$a->strings["Export account"] = "导出账户";
-$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "导出你的账户信息和联系人。用这个功能来生成一个你的账户的备份，并且/或者把它移到另外一个服务器。";
-$a->strings["Export all"] = "导出全部";
-$a->strings["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)"] = "导出你的账户信息、联系人和所有你的项目为 json 格式。可能会是一个很大的文件，并可能花费很多时间。用这个功能来做一个你的账户的全备份（照片不会被导出）";
-$a->strings["Export personal data"] = "导出个人信息";
-$a->strings["No contacts."] = "没有联系人。";
-$a->strings["Access denied."] = "没有用权。";
-$a->strings["Image exceeds size limit of %s"] = "图片超过 %s 的大小限制";
-$a->strings["Unable to process image."] = "处理不了图像.";
-$a->strings["Wall Photos"] = "墙照片";
-$a->strings["Image upload failed."] = "图像上载失败了.";
-$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "一天最多墙通知给%s超过了。通知没有通过 。";
-$a->strings["No recipient selected."] = "没有选择的接受者。";
-$a->strings["Unable to check your home location."] = "核对不了您的主页。";
-$a->strings["Message could not be sent."] = "消息发不了。";
-$a->strings["Message collection failure."] = "通信受到错误。";
-$a->strings["Message sent."] = "消息发了";
-$a->strings["No recipient."] = "没有接受者。";
-$a->strings["Send Private Message"] = "发私人的通信";
-$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "如果您想%s回答，请核对您网站的隐私设置允许生发送人的私人邮件。";
-$a->strings["To:"] = "到：";
-$a->strings["Subject:"] = "题目：";
-$a->strings["Your message:"] = "你的消息：";
-$a->strings["Login"] = "登录";
-$a->strings["The post was created"] = "文章创建了";
-$a->strings["Item not found"] = "项目没找到";
-$a->strings["Edit post"] = "编辑文章";
-$a->strings["CC: email addresses"] = "抄送: 电子邮件地址";
-$a->strings["Example: bob@example.com, mary@example.com"] = "比如: li@example.com, wang@example.com";
-$a->strings["Contact not found."] = "没有找到联系人。";
-$a->strings["Friend suggestion sent."] = "朋友建议发送了。";
-$a->strings["Suggest Friends"] = "推荐的朋友们";
-$a->strings["Suggest a friend for %s"] = "给 %s 推荐朋友";
-$a->strings["Access to this profile has been restricted."] = "使用权这个简介被限制了.";
-$a->strings["Events"] = "事件";
-$a->strings["View"] = "查看";
-$a->strings["Previous"] = "上";
-$a->strings["Next"] = "下";
-$a->strings["today"] = "今天";
-$a->strings["month"] = "月";
-$a->strings["week"] = "星期";
-$a->strings["day"] = "日";
-$a->strings["list"] = "列表";
-$a->strings["User not found"] = "找不到用户";
-$a->strings["This calendar format is not supported"] = "这个日历格式不被支持";
-$a->strings["No exportable data found"] = "找不到可导出的数据";
-$a->strings["calendar"] = "日历";
-$a->strings["Network:"] = "网络";
-$a->strings["%d contact edited."] = [
-	0 => "%d 个联系人被编辑了。",
-];
-$a->strings["Could not access contact record."] = "无法访问联系人记录。";
-$a->strings["Could not locate selected profile."] = "找不到选择的简介。";
-$a->strings["Contact updated."] = "联系人更新了。";
-$a->strings["Failed to update contact record."] = "更新联系人记录失败。";
-$a->strings["Contact has been blocked"] = "联系人已被屏蔽";
-$a->strings["Contact has been unblocked"] = "联系人已被解除屏蔽";
-$a->strings["Contact has been ignored"] = "联系人已被忽视";
-$a->strings["Contact has been unignored"] = "联系人已被解除忽视";
-$a->strings["Contact has been archived"] = "联系人已存档";
-$a->strings["Contact has been unarchived"] = "联系人已被解除存档";
-$a->strings["Drop contact"] = "";
-$a->strings["Do you really want to delete this contact?"] = "您真的想删除这个联系人吗？";
-$a->strings["Contact has been removed."] = "联系人被删除了。";
-$a->strings["You are mutual friends with %s"] = "您和 %s 互为朋友";
-$a->strings["You are sharing with %s"] = "你正在和 %s 分享";
-$a->strings["%s is sharing with you"] = "%s 正在和你分享";
-$a->strings["Private communications are not available for this contact."] = "私人交流对这个联系人不可用。";
-$a->strings["Never"] = "从未";
-$a->strings["(Update was successful)"] = "(更新成功)";
-$a->strings["(Update was not successful)"] = "(更新不成功)";
-$a->strings["Suggest friends"] = "建议朋友们";
-$a->strings["Network type: %s"] = "网络种类: %s";
-$a->strings["Communications lost with this contact!"] = "和这个联系人的通信断开了！";
-$a->strings["Fetch further information for feeds"] = "拿文源别的消息";
-$a->strings["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."] = "";
-$a->strings["Disabled"] = "已停用";
-$a->strings["Fetch information"] = "取消息";
-$a->strings["Fetch keywords"] = "获取关键字";
-$a->strings["Fetch information and keywords"] = "取消息和关键词";
-$a->strings["Disconnect/Unfollow"] = "断开连接/取消关注";
-$a->strings["Contact"] = "联系人";
-$a->strings["Profile Visibility"] = "简历可见量";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "请选择简介您想给%s显示他安全地看您的简介的时候。";
-$a->strings["Contact Information / Notes"] = "联系人信息/便条";
-$a->strings["Their personal note"] = "";
-$a->strings["Edit contact notes"] = "编辑联系人便条";
-$a->strings["Block/Unblock contact"] = "屏蔽/解除屏蔽联系人";
-$a->strings["Ignore contact"] = "忽略联系人";
-$a->strings["Repair URL settings"] = "维修URL设置";
-$a->strings["View conversations"] = "看交流";
-$a->strings["Last update:"] = "上个更新：";
-$a->strings["Update public posts"] = "更新公开文章";
-$a->strings["Update now"] = "现在更新";
-$a->strings["Unblock"] = "解除屏蔽";
-$a->strings["Block"] = "屏蔽";
-$a->strings["Unignore"] = "取消忽视";
-$a->strings["Ignore"] = "忽视";
-$a->strings["Currently blocked"] = "现在被封禁的";
-$a->strings["Currently ignored"] = "现在不理的";
-$a->strings["Currently archived"] = "当前已存档";
-$a->strings["Awaiting connection acknowledge"] = "等待连接确认";
-$a->strings["Hide this contact from others"] = "对其他人隐藏这个联系人";
-$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "回答／喜欢关您公开文章<strong>会</strong>还可见的";
-$a->strings["Notification for new posts"] = "新消息提示";
-$a->strings["Send a notification of every new post of this contact"] = "发送这个联系人的每篇新文章的通知";
-$a->strings["Blacklisted keywords"] = "黑名单关键词";
-$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "逗号分的关键词不应该翻译成主题标签，如果“取消息和关键词”选择的。";
-$a->strings["Profile URL"] = "简介 URL";
-$a->strings["Location:"] = "位置:";
-$a->strings["XMPP:"] = "XMPP：";
-$a->strings["About:"] = "关于：";
-$a->strings["Tags:"] = "标签：";
-$a->strings["Actions"] = "";
-$a->strings["Status"] = "状态";
-$a->strings["Contact Settings"] = "联系人设置";
-$a->strings["Suggestions"] = "建议";
-$a->strings["Suggest potential friends"] = "建议潜在朋友们";
-$a->strings["All Contacts"] = "所有联系人";
-$a->strings["Show all contacts"] = "显示所有的联系人";
-$a->strings["Unblocked"] = "未屏蔽的";
-$a->strings["Only show unblocked contacts"] = "只显示没被屏蔽的联系人";
-$a->strings["Blocked"] = "被屏蔽的";
-$a->strings["Only show blocked contacts"] = "只显示被屏蔽的联系人";
-$a->strings["Ignored"] = "忽视的";
-$a->strings["Only show ignored contacts"] = "只显示忽略的联系人";
-$a->strings["Archived"] = "已存档";
-$a->strings["Only show archived contacts"] = "只显示已存档联系人";
-$a->strings["Hidden"] = "隐藏的";
-$a->strings["Only show hidden contacts"] = "只显示隐藏的联系人";
-$a->strings["Search your contacts"] = "搜索您的联系人";
-$a->strings["Results for: %s"] = "";
-$a->strings["Find"] = "搜索";
-$a->strings["Update"] = "更新";
-$a->strings["Archive"] = "存档";
-$a->strings["Unarchive"] = "从存档拿来";
-$a->strings["Batch Actions"] = "批量操作";
-$a->strings["Status Messages and Posts"] = "现状通知和文章";
-$a->strings["Profile Details"] = "简介内容";
-$a->strings["View all contacts"] = "查看所有联系人";
-$a->strings["View all common friends"] = "查看所有公共好友";
-$a->strings["Advanced"] = "高级";
-$a->strings["Advanced Contact Settings"] = "高级联系人设置";
-$a->strings["Mutual Friendship"] = "共同友谊";
-$a->strings["is a fan of yours"] = "是你的粉丝";
-$a->strings["you are a fan of"] = "您已关注";
-$a->strings["This is you"] = "这是你";
-$a->strings["Toggle Blocked status"] = "切换屏蔽状态";
-$a->strings["Toggle Ignored status"] = "交替忽视现状";
-$a->strings["Toggle Archive status"] = "交替档案现状";
-$a->strings["Delete contact"] = "删除联系人";
-$a->strings["Parent user not found."] = "未找到家长账户。";
-$a->strings["No parent user"] = "无家长账户";
-$a->strings["Parent Password:"] = "家长密码：";
-$a->strings["Please enter the password of the parent account to legitimize your request."] = "请为家长账户设置密码以使您的请求有效化。";
-$a->strings["Parent User"] = "家长账户";
-$a->strings["Parent users have total control about this account, including the account settings. Please double check whom you give this access."] = "";
-$a->strings["Save Settings"] = "保存设置";
-$a->strings["Delegate Page Management"] = "页代表管理";
-$a->strings["Delegates"] = "代表";
-$a->strings["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."] = "代表会管理所有的方面这个账户／页除了基础账户配置以外。请别代表您私人账户给您没完全信的人。";
-$a->strings["Existing Page Delegates"] = "目前页代表";
-$a->strings["Potential Delegates"] = "潜力的代表";
-$a->strings["Add"] = "加";
-$a->strings["No entries."] = "没有项目。";
-$a->strings["You must be logged in to use this module"] = "您必须登录才能使用此模块";
-$a->strings["Source URL"] = "源链接";
-$a->strings["Post successful."] = "评论发表了。";
-$a->strings["Subscribing to OStatus contacts"] = "正在订阅 OStatus 联系人";
-$a->strings["No contact provided."] = "未提供联系人。";
-$a->strings["Couldn't fetch information for contact."] = "无法获取联系人信息。";
-$a->strings["Couldn't fetch friends for contact."] = "无法取得联系人的朋友信息。";
-$a->strings["success"] = "成功";
-$a->strings["failed"] = "失败";
-$a->strings["ignored"] = "已忽视的";
-$a->strings["Image uploaded but image cropping failed."] = "照片上传去了，但修剪失灵。";
-$a->strings["Image size reduction [%s] failed."] = "照片减少[%s]失灵。";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "万一新照片一会出现，换档重新加载或者成为空浏览器高速缓存。";
-$a->strings["Unable to process image"] = "不能处理照片";
-$a->strings["Upload File:"] = "上传文件：";
-$a->strings["Select a profile:"] = "选择一个简介";
-$a->strings["or"] = "或者";
-$a->strings["skip this step"] = "略过这步";
-$a->strings["select a photo from your photo albums"] = "从您的照片册选择一片。";
-$a->strings["Crop Image"] = "修剪照片";
-$a->strings["Please adjust the image cropping for optimum viewing."] = "请调图片剪裁为最好看。";
-$a->strings["Done Editing"] = "编辑完成";
-$a->strings["Image uploaded successfully."] = "照片成功地上传了。";
-$a->strings["Contact wasn't found or can't be unfollowed."] = "找不到联系人或者不能关注联系人。";
-$a->strings["Contact unfollowed"] = "取消关注了的联系人";
-$a->strings["Submit Request"] = "提交要求";
-$a->strings["You aren't a friend of this contact."] = "你不是这个联系人的朋友。";
-$a->strings["Unfollowing is currently not supported by your network."] = "取消关注现在不被你的网络支持。";
-$a->strings["Your Identity Address:"] = "你的身份地址：";
-$a->strings["Gender:"] = "性别:";
-$a->strings["Status:"] = "现状:";
-$a->strings["Homepage:"] = "主页:";
-$a->strings["Global Directory"] = "综合目录";
-$a->strings["Find on this site"] = "找在这网站";
-$a->strings["Results for:"] = "结果：";
-$a->strings["Site Directory"] = "网站目录";
-$a->strings["No entries (some entries may be hidden)."] = "没有文章(有的文章会被隐藏)。";
-$a->strings["People Search - %s"] = "搜索人 - %s";
-$a->strings["Forum Search - %s"] = "搜索论坛 - %s";
-$a->strings["The contact could not be added."] = "无法添加此联系人。";
-$a->strings["You already added this contact."] = "您已添加此联系人。";
-$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Diaspora 支持没被启用。无法添加联系人。";
-$a->strings["OStatus support is disabled. Contact can't be added."] = "OStatus 支持没被启用。无法添加联系人。";
-$a->strings["The network type couldn't be detected. Contact can't be added."] = "网络类型无法被检测。无法添加联系人。";
-$a->strings["Please answer the following:"] = "请回答下述的：";
-$a->strings["Does %s know you?"] = "%s是否认识你？";
-$a->strings["Add a personal note:"] = "添加一个个人便条：";
 $a->strings["No valid account found."] = "找不到效的账户。";
 $a->strings["Password reset request issued. Check your email."] = "重设密码要求发布了。核对您的收件箱。";
 $a->strings["\n\t\tDear %1\$s,\n\t\t\tA request was recently received at \"%2\$s\" to reset your account\n\t\tpassword. In order to confirm this request, please select the verification link\n\t\tbelow or paste it into your web browser address bar.\n\n\t\tIf you did NOT request this change, please DO NOT follow the link\n\t\tprovided and ignore and/or delete this email, the request will expire shortly.\n\n\t\tYour password will not be changed unless we can verify that you\n\t\tissued this request."] = "";
@@ -647,111 +952,6 @@ $a->strings["Source text"] = "源文本";
 $a->strings["BBCode"] = "";
 $a->strings["Markdown"] = "Markdown";
 $a->strings["HTML"] = "HTML";
-$a->strings["This is Friendica, version"] = "这是Friendica，版本";
-$a->strings["running at web location"] = "运作再网址";
-$a->strings["Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more about the Friendica project."] = "请浏览 <a href=\"https://friendi.ca\">Friendi.ca</a> 以了解更多关于 Friendica 项目的信息。";
-$a->strings["Bug reports and issues: please visit"] = "Bug 及 issues 报告：请访问";
-$a->strings["the bugtracker at github"] = "在 github 上的错误追踪系统";
-$a->strings["Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"] = "";
-$a->strings["Installed addons/apps:"] = "已安装的插件/应用：";
-$a->strings["No installed addons/apps"] = "没有已安装的插件或应用";
-$a->strings["Read about the <a href=\"%1\$s/tos\">Terms of Service</a> of this node."] = "阅读此节点的<a href=\"%1\$s/tos\">服务条款</a>。";
-$a->strings["On this server the following remote servers are blocked."] = "在这个服务器上以下远程服务器被封禁了。";
-$a->strings["Blocked domain"] = "被封禁的域名";
-$a->strings["Reason for the block"] = "封禁原因";
-$a->strings["Total invitation limit exceeded."] = "邀请限超过了。";
-$a->strings["%s : Not a valid email address."] = "%s : 不是效的电子邮件地址.";
-$a->strings["Please join us on Friendica"] = "请加入我们再Friendica";
-$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "邀请限超过了。请联系您的网站管理员。";
-$a->strings["%s : Message delivery failed."] = "%s : 送消息失败了。";
-$a->strings["%d message sent."] = [
-	0 => "%d消息传送了。",
-];
-$a->strings["You have no more invitations available"] = "您没有别的邀请";
-$a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "参观%s看一单公开网站您会加入。Friendica成员在别的网站都会互相连接，再跟很多别的社会网络。";
-$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "为接受这个邀请，请再%s或什么别的Friendica网站注册。";
-$a->strings["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. See %s for a list of alternate Friendica sites you can join."] = "Friendica 站点互相连接来创建一个增强隐私的由他们的成员拥有并控制的社交网络。它们也能跟多传统的社交网络连接。看 %s 来获取一份你可以选择加入的 Friendica 站点。";
-$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "不好意思。这个系统目前没设置跟别的公开网站连接或邀请成员。";
-$a->strings["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."] = "各 Friendica 站点相互连接以创造出一个由其组成成员控制拥有的有强大隐私保护能力的大型社交网络。各站点同时也能够接入许多传统社交网络。";
-$a->strings["To accept this invitation, please visit and register at %s."] = "要接受这个邀请，请在 %s 访问并注册。";
-$a->strings["Send invitations"] = "发请柬";
-$a->strings["Enter email addresses, one per line:"] = "输入电子邮件地址，一行一个：";
-$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "在 Friendica，你被诚挚地邀请来加入我和其他亲密的朋友－并帮助我们创建更好的社会网络。";
-$a->strings["You will need to supply this invitation code: \$invite_code"] = "您要输入这个邀请密码：\$invite_code";
-$a->strings["Once you have registered, please connect with me via my profile page at:"] = "您一注册，请页跟我连接，用我的简介在：";
-$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca"] = "欲了解更多关于 Friendica 项目的信息以及为什么我们认为这很重要，请访问 http://friendi.ca";
-$a->strings["Contact settings applied."] = "联系人设置已应用。";
-$a->strings["Contact update failed."] = "联系人更新失败。";
-$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>警告：此为进阶</strong>，如果您输入不正确的信息，您也许无法与这位联系人的正常通讯。";
-$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "请<strong>立即</strong>用后退按钮如果您不确定怎么用这页";
-$a->strings["No mirroring"] = "没有复制";
-$a->strings["Mirror as forwarded posting"] = "复制为传达文章";
-$a->strings["Mirror as my own posting"] = "复制为我自己的文章";
-$a->strings["Return to contact editor"] = "返回到联系人编辑器";
-$a->strings["Refetch contact data"] = "重新获取联系人数据";
-$a->strings["Remote Self"] = "遥远的自身";
-$a->strings["Mirror postings from this contact"] = "把这个熟人的文章复制。";
-$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "表明这个熟人当遥远的自身。Friendica要把这个熟人的新的文章复制。";
-$a->strings["Name"] = "名字";
-$a->strings["Account Nickname"] = "帐户昵称";
-$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname越过名／昵称";
-$a->strings["Account URL"] = "帐户URL";
-$a->strings["Friend Request URL"] = "朋友请求URL";
-$a->strings["Friend Confirm URL"] = "朋友确认URL";
-$a->strings["Notification Endpoint URL"] = "通知端URL";
-$a->strings["Poll/Feed URL"] = "喂URL";
-$a->strings["New photo from this URL"] = "新照片从这个URL";
-$a->strings["%1\$s welcomes %2\$s"] = "%1\$s欢迎%2\$s";
-$a->strings["Help:"] = "帮助：";
-$a->strings["Help"] = "帮助";
-$a->strings["Page not found."] = "页发现。";
-$a->strings["Friendica Communications Server - Setup"] = "Friendica沟通服务器－安装";
-$a->strings["Could not connect to database."] = "解不了数据库。";
-$a->strings["Could not create table."] = "无法创建表格。";
-$a->strings["Your Friendica site database has been installed."] = "您Friendica网站数据库被安装了。";
-$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "您可能要手工地进口文件「database.sql」用phpmyadmin或mysql。";
-$a->strings["Please see the file \"INSTALL.txt\"."] = "请看文件「INSTALL.txt」";
-$a->strings["Database already in use."] = "数据库已经被使用。";
-$a->strings["System check"] = "系统检测";
-$a->strings["Check again"] = "再检测";
-$a->strings["Database connection"] = "数据库接通";
-$a->strings["In order to install Friendica we need to know how to connect to your database."] = "为安装Friendica我们要知道怎么连接您的数据库。";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "你有关于这些设置有问题的话，请给互联网托管服务或者网页管理联系。";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "您下边指定的数据库应该已经存在。如果还没有，请创建后继续。";
-$a->strings["Database Server Name"] = "数据库服务器名";
-$a->strings["Database Login Name"] = "数据库登录名";
-$a->strings["Database Login Password"] = "数据库登录密码";
-$a->strings["For security reasons the password must not be empty"] = "由于安全的原因，密码不能为空";
-$a->strings["Database Name"] = "数据库名字";
-$a->strings["Site administrator email address"] = "网站行政人员邮件地址";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "您账户邮件地址必要符合这个为用网站处理仪表板";
-$a->strings["Please select a default timezone for your website"] = "请选择您网站的默认时区";
-$a->strings["Site settings"] = "网站设置";
-$a->strings["System Language:"] = "系统语言：";
-$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "为 Friendica 安装界面及邮件发送设置默认语言。";
-$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "数据库配置文件 \".htconfig.php\" 无法被写入。请在 web 服务器根目录下使用附上的文字创建一个配置文件。";
-$a->strings["<h1>What next</h1>"] = "<h1>下步是什么</h1>";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the worker."] = "";
-$a->strings["Go to your new Friendica node <a href=\"%s/register\">registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel."] = "";
-$a->strings["New Message"] = "新的消息";
-$a->strings["Unable to locate contact information."] = "无法找到联系人信息。";
-$a->strings["Messages"] = "消息";
-$a->strings["Do you really want to delete this message?"] = "您真的想删除这个通知吗？";
-$a->strings["Message deleted."] = "消息删除了。";
-$a->strings["Conversation removed."] = "交流删除了。";
-$a->strings["No messages."] = "没有消息";
-$a->strings["Message not available."] = "通信不可用的";
-$a->strings["Delete message"] = "删除消息";
-$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
-$a->strings["Delete conversation"] = "删除交谈";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "没可用的安全交通。您<strong>可能</strong>会在发送人的简介页会回答。";
-$a->strings["Send Reply"] = "发回答";
-$a->strings["Unknown sender - %s"] = "生发送人－%s";
-$a->strings["You and %s"] = "您和%s";
-$a->strings["%s and You"] = "%s和您";
-$a->strings["%d message"] = [
-	0 => "%d通知",
-];
 $a->strings["Theme settings updated."] = "主题设置更新了。";
 $a->strings["Information"] = "资料";
 $a->strings["Overview"] = "概览";
@@ -759,13 +959,11 @@ $a->strings["Federation Statistics"] = "联邦网络统计";
 $a->strings["Configuration"] = "配置";
 $a->strings["Site"] = "网站";
 $a->strings["Users"] = "用户";
-$a->strings["Addons"] = "插件";
 $a->strings["Themes"] = "主题";
-$a->strings["Additional features"] = "附加的特点";
-$a->strings["Terms of Service"] = "服务条款";
 $a->strings["Database"] = "数据库";
 $a->strings["DB updates"] = "数据库更新";
 $a->strings["Inspect Queue"] = "检查队列";
+$a->strings["Inspect worker Queue"] = "";
 $a->strings["Tools"] = "工具";
 $a->strings["Contact Blocklist"] = "联系人屏蔽列表";
 $a->strings["Server Blocklist"] = "服务器屏蔽列表";
@@ -814,6 +1012,8 @@ $a->strings["This page allows you to prevent any message from a remote contact t
 $a->strings["Block Remote Contact"] = "";
 $a->strings["select all"] = "全选";
 $a->strings["select none"] = "";
+$a->strings["Block"] = "屏蔽";
+$a->strings["Unblock"] = "解除屏蔽";
 $a->strings["No remote contact is blocked from this node."] = "";
 $a->strings["Blocked Remote Contacts"] = "";
 $a->strings["Block New Remote Contact"] = "";
@@ -836,15 +1036,20 @@ $a->strings["Currently this node is aware of %d nodes with %d registered users f
 $a->strings["ID"] = "ID";
 $a->strings["Recipient Name"] = "接收者的名字";
 $a->strings["Recipient Profile"] = "接收者的简介";
-$a->strings["Network"] = "网络";
 $a->strings["Created"] = "已创建";
 $a->strings["Last Tried"] = "上次尝试";
 $a->strings["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."] = "";
+$a->strings["Inspect Worker Queue"] = "";
+$a->strings["Job Parameters"] = "";
+$a->strings["Priority"] = "";
+$a->strings["This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you've set up during install."] = "";
 $a->strings["Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href=\"%s\">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php bin/console.php dbstructure toinnodb</tt> of your Friendica installation for an automatic conversion.<br />"] = "";
 $a->strings["There is a new version of Friendica available for download. Your current version is %1\$s, upstream version is %2\$s"] = "有新的 Friendica 版本可供下载。您当前的版本为 %1\$s，上游版本为 %2\$s";
 $a->strings["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."] = "";
 $a->strings["The worker was never executed. Please check your database structure!"] = "";
 $a->strings["The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings."] = "";
+$a->strings["Friendica's configuration now is stored in config/local.ini.php, please copy config/local-sample.ini.php and move your config from <code>.htconfig.php</code>. See <a href=\"%s\">the Config help page</a> for help with the transition."] = "";
+$a->strings["<a href=\"%s\">%s</a> is not reachable on your system. This is a servere configuration issue that prevents the communication.. See <a href=\"%s\">the installation page</a> for help."] = "";
 $a->strings["Normal Account"] = "正常帐户";
 $a->strings["Automatic Follower Account"] = "";
 $a->strings["Public Forum Account"] = "";
@@ -859,12 +1064,12 @@ $a->strings["Version"] = "版本";
 $a->strings["Active addons"] = "激活插件";
 $a->strings["Can not parse base url. Must have at least <scheme>://<domain>"] = "不能分析基础URL。至少要<scheme>://<domain>";
 $a->strings["Site settings updated."] = "网站设置更新了。";
-$a->strings["No special theme for mobile devices"] = "没专门适合手机的主题";
 $a->strings["No community page for local users"] = "";
 $a->strings["No community page"] = "没有社会页";
 $a->strings["Public postings from users of this site"] = "本网站用户的公开文章";
 $a->strings["Public postings from the federated network"] = "";
 $a->strings["Public postings from local users and the federated network"] = "";
+$a->strings["Disabled"] = "已停用";
 $a->strings["Users, Global Contacts"] = "用户，全球联系人";
 $a->strings["Users, Global Contacts/fallback"] = "";
 $a->strings["One month"] = "一个月";
@@ -882,9 +1087,9 @@ $a->strings["Don't check"] = "请勿检查";
 $a->strings["check the stable version"] = "检查稳定版";
 $a->strings["check the development version"] = "检查开发版本";
 $a->strings["Republish users to directory"] = "";
-$a->strings["Registration"] = "注册";
 $a->strings["File upload"] = "文件上传";
 $a->strings["Policies"] = "政策";
+$a->strings["Advanced"] = "高级";
 $a->strings["Auto Discovered Contact Directory"] = "";
 $a->strings["Performance"] = "性能";
 $a->strings["Worker"] = "";
@@ -925,6 +1130,8 @@ $a->strings["Maximum Daily Registrations"] = "一天最多注册";
 $a->strings["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."] = "如果注册上边许可的，这个选择一天最多新用户注册会接待。如果注册关闭了，这个设置没有印象。";
 $a->strings["Register text"] = "注册正文";
 $a->strings["Will be displayed prominently on the registration page. You can use BBCode here."] = "";
+$a->strings["Forbidden Nicknames"] = "";
+$a->strings["Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142."] = "";
 $a->strings["Accounts abandoned after x days"] = "账户丢弃X天后";
 $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "拒绝浪费系统资源看外网站找丢弃的账户。输入0为无时限。";
 $a->strings["Allowed friend domains"] = "允许的朋友域";
@@ -950,6 +1157,8 @@ $a->strings["Disallow public access to addons listed in the apps menu."] = "不
 $a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "复选这个框为把应用选内插件限制仅成员";
 $a->strings["Don't embed private images in posts"] = "别嵌入私人图案在文章里";
 $a->strings["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."] = "别把复制嵌入的照相代替本网站的私人照相在文章里。结果是收包括私人照相的熟人要认证才卸载个张照片，会花许久。";
+$a->strings["Explicit Content"] = "";
+$a->strings["Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page."] = "";
 $a->strings["Allow Users to set remote_self"] = "允许用户用遥远的自身";
 $a->strings["With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream."] = "选择这个之后，用户们允许表明熟人当遥远的自身在熟人修理页。遥远的自身所有文章被复制到用户文章流。";
 $a->strings["Block multiple registrations"] = "阻止多次注册";
@@ -1030,7 +1239,7 @@ $a->strings["RINO Encryption"] = "RINO 加密";
 $a->strings["Encryption layer between nodes."] = "节点之间的加密层。";
 $a->strings["Enabled"] = "已启用";
 $a->strings["Maximum number of parallel workers"] = "";
-$a->strings["On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4."] = "";
+$a->strings["On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d."] = "";
 $a->strings["Don't use 'proc_open' with the worker"] = "";
 $a->strings["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."] = "";
 $a->strings["Enable fastlane"] = "启用快车道模式";
@@ -1051,6 +1260,7 @@ $a->strings["Server tags"] = "";
 $a->strings["Comma separated list of tags for the 'tags' subscription."] = "";
 $a->strings["Allow user tags"] = "";
 $a->strings["If enabled, the tags from the saved searches will used for the 'tags' subscription in addition to the 'relay_server_tags'."] = "";
+$a->strings["Start Relocation"] = "";
 $a->strings["Update has been marked successful"] = "更新当成功标签了";
 $a->strings["Database structure update %s was successfully applied."] = "";
 $a->strings["Executing of database structure update %s failed with error: %s"] = "";
@@ -1076,15 +1286,7 @@ $a->strings["%s user deleted"] = [
 $a->strings["User '%s' deleted"] = "用户 '%s' 被删除了";
 $a->strings["User '%s' unblocked"] = "用户“%s”已解除屏蔽";
 $a->strings["User '%s' blocked"] = "用户“%s”已屏蔽";
-$a->strings["Normal Account Page"] = "标准账户页面";
-$a->strings["Soapbox Page"] = "演讲台页";
-$a->strings["Public Forum"] = "公共论坛";
-$a->strings["Automatic Friend Page"] = "自动朋友页";
 $a->strings["Private Forum"] = "";
-$a->strings["Personal Page"] = "个人页面";
-$a->strings["Organisation Page"] = "组织页面";
-$a->strings["News Page"] = "新闻页面";
-$a->strings["Community Forum"] = "社区论坛";
 $a->strings["Email"] = "电子邮件";
 $a->strings["Register date"] = "注册日期";
 $a->strings["Last login"] = "上次登录";
@@ -1096,8 +1298,8 @@ $a->strings["User waiting for permanent deletion"] = "用户等待长久删除";
 $a->strings["Request date"] = "要求日期";
 $a->strings["No registrations."] = "没有注册。";
 $a->strings["Note from the user"] = "";
-$a->strings["Approve"] = "批准";
 $a->strings["Deny"] = "否定";
+$a->strings["User blocked"] = "";
 $a->strings["Site admin"] = "网站管理员";
 $a->strings["Account expired"] = "帐户过期了";
 $a->strings["New User"] = "新用户";
@@ -1132,39 +1334,14 @@ $a->strings["Log file"] = "日志文件";
 $a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "必要被网页服务器可写的。相对Friendica主文件夹。";
 $a->strings["Log level"] = "日志级别";
 $a->strings["PHP logging"] = "PHP 日志";
-$a->strings["To enable logging of PHP errors and warnings you can add the following to the .htconfig.php file of your installation. The filename set in the 'error_log' line is relative to the friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."] = "";
+$a->strings["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 the 'error_log' line is relative to the friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."] = "";
 $a->strings["Error trying to open <strong>%1\$s</strong> log file.\\r\\n<br/>Check to see if file %1\$s exist and is readable."] = "打开  <strong>%1\$s</strong> 日志文件出错。\\r\\n <br/> 请检查 %1\$s 文件是否存在并且可读。";
 $a->strings["Couldn't open <strong>%1\$s</strong> log file.\\r\\n<br/>Check to see if file %1\$s is readable."] = "无法打开 <strong>%1\$s</strong> 日志文件。\\r\\n <br/> 请检查 %1\$s 文件是否可读。";
-$a->strings["Off"] = "关";
-$a->strings["On"] = "开";
 $a->strings["Lock feature %s"] = "锁定特性 %s";
 $a->strings["Manage Additional Features"] = "管理附加特性";
-$a->strings["Community option not available."] = "社区选项不可用。";
-$a->strings["Not available."] = "不可用的";
-$a->strings["Local Community"] = "本地社区";
-$a->strings["Posts from local users on this server"] = "";
-$a->strings["Global Community"] = "全球社区";
-$a->strings["Posts from users of the whole federated network"] = "";
-$a->strings["No results."] = "没有结果。";
-$a->strings["This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users."] = "";
-$a->strings["Profile not found."] = "找不到简介。";
-$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "这会偶尔地发生熟人双方都要求和已经批准的时候。";
-$a->strings["Response from remote site was not understood."] = "遥网站的回答明白不了。";
-$a->strings["Unexpected response from remote site: "] = "居然回答从遥网站：";
-$a->strings["Confirmation completed successfully."] = "确认成功完成。";
-$a->strings["Temporary failure. Please wait and try again."] = "临时失败。请等一会，再试。";
-$a->strings["Introduction failed or was revoked."] = "介绍失败或被吊销。";
-$a->strings["Remote site reported: "] = "远程站点报告：";
-$a->strings["Unable to set contact photo."] = "无法设置联系人照片。";
-$a->strings["No user record found for '%s' "] = "找不到「%s」的用户记录";
-$a->strings["Our site encryption key is apparently messed up."] = "看起来我们的加密钥匙失灵了。";
-$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "空的URL供应，或URL解不了码。";
-$a->strings["Contact record was not found for you on our site."] = "无法在本站点为您找到联系人记录。";
-$a->strings["Site public key not available in contact record for URL %s."] = "没有网站公开钥匙在熟人记录在URL%s。";
-$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "身份证明由您的系统是在我们的重做。你再试应该运行。";
-$a->strings["Unable to set your contact credentials on our system."] = "不能创作您的熟人证件在我们的系统。";
-$a->strings["Unable to update your contact profile details on our system"] = "不能更新您的熟人简介消息在我们的系统";
-$a->strings["[Name Withheld]"] = "[名字拒给]";
+$a->strings["OpenID protocol error. No ID returned."] = "OpenID协议错误。没ID还。 ";
+$a->strings["Account not found and OpenID registration is not permitted on this site."] = "找不到账户和OpenID注册不允许。";
+$a->strings["Login failed."] = "登录失败。";
 $a->strings["This introduction has already been accepted."] = "这个介绍已经接受了。";
 $a->strings["Profile location is not valid or does not contain profile information."] = "简介位置失效或不包含简介信息。";
 $a->strings["Warning: profile location has no identifiable owner name."] = "警告：简介位置没有可设别的主名。";
@@ -1183,6 +1360,7 @@ $a->strings["You have already introduced yourself here."] = "您已经自我介
 $a->strings["Apparently you are already friends with %s."] = "看上去您已经是%s的朋友。";
 $a->strings["Invalid profile URL."] = "无效的简介URL。";
 $a->strings["Disallowed profile URL."] = "不允许的简介地址.";
+$a->strings["Failed to update contact record."] = "更新联系人记录失败。";
 $a->strings["Your introduction has been sent."] = "您的介绍发布了。";
 $a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "无法为您的网络完成远程订阅。请直接在您的系统上订阅。";
 $a->strings["Please login to confirm introduction."] = "请登录以确认介绍。";
@@ -1195,10 +1373,171 @@ $a->strings["Please enter your 'Identity Address' from one of the following supp
 $a->strings["If you are not yet a member of the free social web, <a href=\"%s\">follow this link to find a public Friendica site and join us today</a>."] = "如果您还不是自由社交网络用户中的一员，<a href=\"%s\"> 请通过此链接查找公共 Friendica 站点并在今天加入我们吧 </a>。";
 $a->strings["Friend/Connection Request"] = "朋友/连接请求";
 $a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de"] = "例如：jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de";
+$a->strings["Please answer the following:"] = "请回答下述的：";
+$a->strings["Does %s know you?"] = "%s是否认识你？";
+$a->strings["Add a personal note:"] = "添加一个个人便条：";
 $a->strings["Friendica"] = "Friendica";
 $a->strings["GNU Social (Pleroma, Mastodon)"] = "GNU Social (Pleroma, Mastodon)";
 $a->strings["Diaspora (Socialhome, Hubzilla)"] = "Diaspora (Socialhome, Hubzilla)";
 $a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = " - 请别用这个表格。而是在你的 Diaspora 搜索栏输入 %s.";
+$a->strings["Authorize application connection"] = "授权应用连接";
+$a->strings["Return to your app and insert this Securty Code:"] = "回归您的应用和输入这个安全密码：";
+$a->strings["Please login to continue."] = "请登录以继续。";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "你要授权这个应用访问你的文章和联系人，及/或为你创建新的文章吗？";
+$a->strings["Image uploaded but image cropping failed."] = "照片上传去了，但修剪失灵。";
+$a->strings["Image size reduction [%s] failed."] = "照片减少[%s]失灵。";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "万一新照片一会出现，换档重新加载或者成为空浏览器高速缓存。";
+$a->strings["Unable to process image"] = "不能处理照片";
+$a->strings["Upload File:"] = "上传文件：";
+$a->strings["Select a profile:"] = "选择一个简介";
+$a->strings["Upload"] = "上传";
+$a->strings["or"] = "或者";
+$a->strings["skip this step"] = "略过这步";
+$a->strings["select a photo from your photo albums"] = "从您的照片册选择一片。";
+$a->strings["Crop Image"] = "修剪照片";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "请调图片剪裁为最好看。";
+$a->strings["Done Editing"] = "编辑完成";
+$a->strings["Image uploaded successfully."] = "照片成功地上传了。";
+$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "不好意思，可能你上传的是PHP设置允许的大";
+$a->strings["Or - did you try to upload an empty file?"] = "或者，你是不是上传空的文件？";
+$a->strings["File exceeds size limit of %s"] = "文件超过了 %s 的大小限制";
+$a->strings["File upload failed."] = "文件上传失败。";
+$a->strings["Unable to locate original post."] = "找不到当初的新闻";
+$a->strings["Empty post discarded."] = "空帖子被丢弃了。";
+$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "这个新闻是由%s，Friendica社会化网络成员之一，发给你。";
+$a->strings["You may visit them online at %s"] = "你可以网上拜访他在%s";
+$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "你不想受到这些新闻的话，请回答这个新闻给发者联系。";
+$a->strings["%s posted an update."] = "%s贴上一个新闻。";
+$a->strings["Help:"] = "帮助：";
+$a->strings["Move account"] = "把账户搬出";
+$a->strings["You can import an account from another Friendica server."] = "您会从别的Friendica服务器进口账户";
+$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "你需要从老服务器导出你的账户并在这里上传。我们会在这里重建你的账户，包括你所有的联系人。我们也会通知你的朋友们你搬到了这里。";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "这个特性是实验性的。我们不能从 OStatus 网络 (GNU Social/Statusnet) 或者 Diaspora 导入联系人";
+$a->strings["Account file"] = "账户文件";
+$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "为了导出你的账户，点击「设置→导出你的个人信息」和选择「导出账户」";
+$a->strings["Invalid profile identifier."] = "无限的简介标识符。";
+$a->strings["Profile Visibility Editor"] = "简介能见度编辑器。";
+$a->strings["Visible To"] = "能见被";
+$a->strings["All Contacts (with secure profile access)"] = "";
+$a->strings["View"] = "查看";
+$a->strings["Previous"] = "上";
+$a->strings["today"] = "今天";
+$a->strings["month"] = "月";
+$a->strings["week"] = "星期";
+$a->strings["day"] = "日";
+$a->strings["list"] = "列表";
+$a->strings["User not found"] = "找不到用户";
+$a->strings["This calendar format is not supported"] = "这个日历格式不被支持";
+$a->strings["No exportable data found"] = "找不到可导出的数据";
+$a->strings["calendar"] = "日历";
+$a->strings["Account approved."] = "账户已被批准。";
+$a->strings["Registration revoked for %s"] = "撤销了 %s 的注册";
+$a->strings["Please login."] = "请登录。";
+$a->strings["Item not found"] = "项目没找到";
+$a->strings["Edit post"] = "编辑文章";
+$a->strings["CC: email addresses"] = "抄送: 电子邮件地址";
+$a->strings["Example: bob@example.com, mary@example.com"] = "比如: li@example.com, wang@example.com";
+$a->strings["Applications"] = "应用";
+$a->strings["No installed applications."] = "没有安装的应用";
+$a->strings["You must be logged in to use this module"] = "您必须登录才能使用此模块";
+$a->strings["Source URL"] = "源链接";
+$a->strings["Friend suggestion sent."] = "朋友建议发送了。";
+$a->strings["Suggest Friends"] = "推荐的朋友们";
+$a->strings["Suggest a friend for %s"] = "给 %s 推荐朋友";
+$a->strings["System down for maintenance"] = "系统关闭为了维持";
+$a->strings["Requested profile is not available."] = "要求的简介联系不上的。";
+$a->strings["%s's timeline"] = "%s 的时间线";
+$a->strings["%s's posts"] = "%s的帖子";
+$a->strings["%s's comments"] = "%s 的评论";
+$a->strings["No friends to display."] = "没有朋友展示。";
+$a->strings["%d contact edited."] = [
+	0 => "%d 个联系人被编辑了。",
+];
+$a->strings["Could not access contact record."] = "无法访问联系人记录。";
+$a->strings["Could not locate selected profile."] = "找不到选择的简介。";
+$a->strings["Contact updated."] = "联系人更新了。";
+$a->strings["Contact has been blocked"] = "联系人已被屏蔽";
+$a->strings["Contact has been unblocked"] = "联系人已被解除屏蔽";
+$a->strings["Contact has been ignored"] = "联系人已被忽视";
+$a->strings["Contact has been unignored"] = "联系人已被解除忽视";
+$a->strings["Contact has been archived"] = "联系人已存档";
+$a->strings["Contact has been unarchived"] = "联系人已被解除存档";
+$a->strings["Drop contact"] = "";
+$a->strings["Do you really want to delete this contact?"] = "您真的想删除这个联系人吗？";
+$a->strings["Contact has been removed."] = "联系人被删除了。";
+$a->strings["You are mutual friends with %s"] = "您和 %s 互为朋友";
+$a->strings["You are sharing with %s"] = "你正在和 %s 分享";
+$a->strings["%s is sharing with you"] = "%s 正在和你分享";
+$a->strings["Private communications are not available for this contact."] = "私人交流对这个联系人不可用。";
+$a->strings["Never"] = "从未";
+$a->strings["(Update was successful)"] = "(更新成功)";
+$a->strings["(Update was not successful)"] = "(更新不成功)";
+$a->strings["Suggest friends"] = "建议朋友们";
+$a->strings["Network type: %s"] = "网络种类: %s";
+$a->strings["Communications lost with this contact!"] = "和这个联系人的通信断开了！";
+$a->strings["Fetch further information for feeds"] = "拿文源别的消息";
+$a->strings["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."] = "";
+$a->strings["Fetch information"] = "取消息";
+$a->strings["Fetch keywords"] = "获取关键字";
+$a->strings["Fetch information and keywords"] = "取消息和关键词";
+$a->strings["Profile Visibility"] = "简历可见量";
+$a->strings["Contact Information / Notes"] = "联系人信息/便条";
+$a->strings["Contact Settings"] = "联系人设置";
+$a->strings["Contact"] = "联系人";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "请选择简介您想给%s显示他安全地看您的简介的时候。";
+$a->strings["Their personal note"] = "";
+$a->strings["Edit contact notes"] = "编辑联系人便条";
+$a->strings["Block/Unblock contact"] = "屏蔽/解除屏蔽联系人";
+$a->strings["Ignore contact"] = "忽略联系人";
+$a->strings["Repair URL settings"] = "维修URL设置";
+$a->strings["View conversations"] = "看交流";
+$a->strings["Last update:"] = "上个更新：";
+$a->strings["Update public posts"] = "更新公开文章";
+$a->strings["Update now"] = "现在更新";
+$a->strings["Unignore"] = "取消忽视";
+$a->strings["Currently blocked"] = "现在被封禁的";
+$a->strings["Currently ignored"] = "现在不理的";
+$a->strings["Currently archived"] = "当前已存档";
+$a->strings["Awaiting connection acknowledge"] = "等待连接确认";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "回答／喜欢关您公开文章<strong>会</strong>还可见的";
+$a->strings["Notification for new posts"] = "新消息提示";
+$a->strings["Send a notification of every new post of this contact"] = "发送这个联系人的每篇新文章的通知";
+$a->strings["Blacklisted keywords"] = "黑名单关键词";
+$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "逗号分的关键词不应该翻译成主题标签，如果“取消息和关键词”选择的。";
+$a->strings["XMPP:"] = "XMPP：";
+$a->strings["Actions"] = "";
+$a->strings["Suggestions"] = "建议";
+$a->strings["Suggest potential friends"] = "建议潜在朋友们";
+$a->strings["Show all contacts"] = "显示所有的联系人";
+$a->strings["Unblocked"] = "未屏蔽的";
+$a->strings["Only show unblocked contacts"] = "只显示没被屏蔽的联系人";
+$a->strings["Blocked"] = "被屏蔽的";
+$a->strings["Only show blocked contacts"] = "只显示被屏蔽的联系人";
+$a->strings["Ignored"] = "忽视的";
+$a->strings["Only show ignored contacts"] = "只显示忽略的联系人";
+$a->strings["Archived"] = "已存档";
+$a->strings["Only show archived contacts"] = "只显示已存档联系人";
+$a->strings["Hidden"] = "隐藏的";
+$a->strings["Only show hidden contacts"] = "只显示隐藏的联系人";
+$a->strings["Search your contacts"] = "搜索您的联系人";
+$a->strings["Archive"] = "存档";
+$a->strings["Unarchive"] = "从存档拿来";
+$a->strings["Batch Actions"] = "批量操作";
+$a->strings["Conversations started by this contact"] = "";
+$a->strings["Posts and Comments"] = "";
+$a->strings["Profile Details"] = "简介内容";
+$a->strings["View all contacts"] = "查看所有联系人";
+$a->strings["View all common friends"] = "查看所有公共好友";
+$a->strings["Advanced Contact Settings"] = "高级联系人设置";
+$a->strings["Mutual Friendship"] = "共同友谊";
+$a->strings["is a fan of yours"] = "是你的粉丝";
+$a->strings["you are a fan of"] = "您已关注";
+$a->strings["This is you"] = "这是你";
+$a->strings["Edit contact"] = "编辑联系人";
+$a->strings["Toggle Blocked status"] = "切换屏蔽状态";
+$a->strings["Toggle Ignored status"] = "交替忽视现状";
+$a->strings["Toggle Archive status"] = "交替档案现状";
+$a->strings["Delete contact"] = "删除联系人";
 $a->strings["Event can not end before it has started."] = "事件不能在开始前结束。";
 $a->strings["Event title and start time are required."] = "项目标题和开始时间是必须的。";
 $a->strings["Create New Event"] = "创建新的事件";
@@ -1216,133 +1555,61 @@ $a->strings["Basic"] = "基本";
 $a->strings["Permissions"] = "权限";
 $a->strings["Failed to remove event"] = "删除事件失败";
 $a->strings["Event removed"] = "事件已删除";
-$a->strings["Group created."] = "群组已创建。";
-$a->strings["Could not create group."] = "无法创建群组。";
-$a->strings["Group not found."] = "组找不到。";
-$a->strings["Group name changed."] = "组名变化了。";
-$a->strings["Save Group"] = "保存组";
-$a->strings["Create a group of contacts/friends."] = "创建一组联系人／朋友。";
-$a->strings["Group Name: "] = "组名：";
-$a->strings["Group removed."] = "组删除了。";
-$a->strings["Unable to remove group."] = "不能删除组。";
-$a->strings["Delete Group"] = "删除群组";
-$a->strings["Group Editor"] = "组编辑器";
-$a->strings["Edit Group Name"] = "编辑群组名称";
-$a->strings["Members"] = "成员";
-$a->strings["Group is empty"] = "组没有成员";
-$a->strings["Remove contact from group"] = "";
-$a->strings["Add contact to group"] = "";
-$a->strings["Unable to locate original post."] = "找不到当初的新闻";
-$a->strings["Empty post discarded."] = "空帖子被丢弃了。";
-$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "这个新闻是由%s，Friendica社会化网络成员之一，发给你。";
-$a->strings["You may visit them online at %s"] = "你可以网上拜访他在%s";
-$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "你不想受到这些新闻的话，请回答这个新闻给发者联系。";
-$a->strings["%s posted an update."] = "%s贴上一个新闻。";
-$a->strings["Remove term"] = "删除关键字";
-$a->strings["Saved Searches"] = "保存的搜索";
-$a->strings["add"] = "添加";
-$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = [
-	0 => "警告：这个组包含 %s 来自不允许非公开消息的网络的成员。",
+$a->strings["The contact could not be added."] = "无法添加此联系人。";
+$a->strings["You already added this contact."] = "您已添加此联系人。";
+$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Diaspora 支持没被启用。无法添加联系人。";
+$a->strings["OStatus support is disabled. Contact can't be added."] = "OStatus 支持没被启用。无法添加联系人。";
+$a->strings["The network type couldn't be detected. Contact can't be added."] = "网络类型无法被检测。无法添加联系人。";
+$a->strings["Contact Photos"] = "联系人照片";
+$a->strings["Files"] = "文件";
+$a->strings["Post successful."] = "评论发表了。";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s关注着%2\$s的%3\$s";
+$a->strings["Credits"] = "贡献";
+$a->strings["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!"] = "Friendica 是一个社区项目，如果没有许多人的努力她将无法实现。这里列出了那些为代码作出贡献或者参与本地化翻译的人们。感谢大家的努力！";
+$a->strings["Item not available."] = "项目不可用的";
+$a->strings["Item was not found."] = "找不到项目。";
+$a->strings["No more system notifications."] = "没别系统通知。";
+$a->strings["Community option not available."] = "社区选项不可用。";
+$a->strings["Not available."] = "不可用的";
+$a->strings["Local Community"] = "本地社区";
+$a->strings["Posts from local users on this server"] = "";
+$a->strings["Global Community"] = "全球社区";
+$a->strings["Posts from users of the whole federated network"] = "";
+$a->strings["This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users."] = "";
+$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
+$a->strings["Time Conversion"] = "时间装换";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica提供这个服务目的是分享项目跟别的网络和朋友们在别的时区。";
+$a->strings["UTC time: %s"] = "UTC时间: %s";
+$a->strings["Current timezone: %s"] = "现在时区: %s";
+$a->strings["Converted localtime: %s"] = "装换的当地时间：%s";
+$a->strings["Please select your timezone:"] = "请选择你的时区:";
+$a->strings["Poke/Prod"] = "戳";
+$a->strings["poke, prod or do other things to somebody"] = "把人家戳或别的行动";
+$a->strings["Recipient"] = "接受者";
+$a->strings["Choose what you wish to do to recipient"] = "选择您想把别人作";
+$a->strings["Make this post private"] = "使这个文章私人";
+$a->strings["Total invitation limit exceeded."] = "邀请限超过了。";
+$a->strings["%s : Not a valid email address."] = "%s : 不是效的电子邮件地址.";
+$a->strings["Please join us on Friendica"] = "请加入我们再Friendica";
+$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "邀请限超过了。请联系您的网站管理员。";
+$a->strings["%s : Message delivery failed."] = "%s : 送消息失败了。";
+$a->strings["%d message sent."] = [
+	0 => "%d消息传送了。",
 ];
-$a->strings["Messages in this group won't be send to these receivers."] = "这个组中的消息不会被发送至这些接收者。";
-$a->strings["No such group"] = "没有这个组";
-$a->strings["Group: %s"] = "组：%s";
-$a->strings["Private messages to this person are at risk of public disclosure."] = "私人通信给这个人回被公开。";
-$a->strings["Invalid contact."] = "无效的联系人。";
-$a->strings["Commented Order"] = "评论时间顺序";
-$a->strings["Sort by Comment Date"] = "按评论日期顺序排列";
-$a->strings["Posted Order"] = "发布时间顺序";
-$a->strings["Sort by Post Date"] = "按发布日期顺序排列";
-$a->strings["Personal"] = "私人";
-$a->strings["Posts that mention or involve you"] = "提及你或你参与的文章";
-$a->strings["New"] = "新";
-$a->strings["Activity Stream - by date"] = "活动流－按日期";
-$a->strings["Shared Links"] = "共享的链接";
-$a->strings["Interesting Links"] = "有意思的超链接";
-$a->strings["Starred"] = "被星";
-$a->strings["Favourite Posts"] = "最喜欢的文章";
+$a->strings["You have no more invitations available"] = "您没有别的邀请";
+$a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "参观%s看一单公开网站您会加入。Friendica成员在别的网站都会互相连接，再跟很多别的社会网络。";
+$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "为接受这个邀请，请再%s或什么别的Friendica网站注册。";
+$a->strings["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. See %s for a list of alternate Friendica sites you can join."] = "Friendica 站点互相连接来创建一个增强隐私的由他们的成员拥有并控制的社交网络。它们也能跟多传统的社交网络连接。看 %s 来获取一份你可以选择加入的 Friendica 站点。";
+$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "不好意思。这个系统目前没设置跟别的公开网站连接或邀请成员。";
+$a->strings["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."] = "各 Friendica 站点相互连接以创造出一个由其组成成员控制拥有的有强大隐私保护能力的大型社交网络。各站点同时也能够接入许多传统社交网络。";
+$a->strings["To accept this invitation, please visit and register at %s."] = "要接受这个邀请，请在 %s 访问并注册。";
+$a->strings["Send invitations"] = "发请柬";
+$a->strings["Enter email addresses, one per line:"] = "输入电子邮件地址，一行一个：";
+$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "在 Friendica，你被诚挚地邀请来加入我和其他亲密的朋友－并帮助我们创建更好的社会网络。";
+$a->strings["You will need to supply this invitation code: \$invite_code"] = "您要输入这个邀请密码：\$invite_code";
+$a->strings["Once you have registered, please connect with me via my profile page at:"] = "您一注册，请页跟我连接，用我的简介在：";
+$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca"] = "欲了解更多关于 Friendica 项目的信息以及为什么我们认为这很重要，请访问 http://friendi.ca";
 $a->strings["Personal Notes"] = "私人便条";
-$a->strings["Invalid request identifier."] = "无效要求身份号。";
-$a->strings["Discard"] = "丢弃";
-$a->strings["Notifications"] = "通知";
-$a->strings["Network Notifications"] = "网络通知";
-$a->strings["Personal Notifications"] = "私人通知";
-$a->strings["Home Notifications"] = "主页通知";
-$a->strings["Show Ignored Requests"] = "显示被忽视的请求";
-$a->strings["Hide Ignored Requests"] = "隐藏被忽视的请求";
-$a->strings["Notification type: "] = "通知种类：";
-$a->strings["suggested by %s"] = "由%s建议的";
-$a->strings["Claims to be known to you: "] = "声称被您认识：";
-$a->strings["yes"] = "是";
-$a->strings["no"] = "否";
-$a->strings["Shall your connection be bidirectional or not?"] = "是否启用双向连接？";
-$a->strings["Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed."] = "";
-$a->strings["Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed."] = "";
-$a->strings["Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed."] = "";
-$a->strings["Friend"] = "朋友";
-$a->strings["Sharer"] = "分享者";
-$a->strings["Subscriber"] = "订阅者";
-$a->strings["No introductions."] = "没有介绍。";
-$a->strings["Show unread"] = "显示未读";
-$a->strings["Show all"] = "显示全部";
-$a->strings["No more %s notifications."] = "没有更多的 %s 通知。";
-$a->strings["OpenID protocol error. No ID returned."] = "OpenID协议错误。没ID还。 ";
-$a->strings["Account not found and OpenID registration is not permitted on this site."] = "找不到账户和OpenID注册不允许。";
-$a->strings["Login failed."] = "登录失败。";
-$a->strings["Photo Albums"] = "相册";
-$a->strings["Recent Photos"] = "最近的照片";
-$a->strings["Upload New Photos"] = "上传新照片";
-$a->strings["everybody"] = "每人";
-$a->strings["Contact information unavailable"] = "联系人信息不可用";
-$a->strings["Album not found."] = "取回不了相册.";
-$a->strings["Delete Album"] = "删除相册";
-$a->strings["Do you really want to delete this photo album and all its photos?"] = "您真的想删除这个相册和所有里面的照相吗？";
-$a->strings["Delete Photo"] = "删除照片";
-$a->strings["Do you really want to delete this photo?"] = "您真的想删除这个照相吗？";
-$a->strings["a photo"] = "一张照片";
-$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s被%3\$s标签在%2\$s";
-$a->strings["Image upload didn't complete, please try again"] = "图片上传未完成，请重试";
-$a->strings["Image file is missing"] = "缺少图片文件";
-$a->strings["Server can't accept new file upload at this time, please contact your administrator"] = "服务器目前无法接受新的上传文件，请联系您的管理员";
-$a->strings["Image file is empty."] = "图片文件空的。";
-$a->strings["No photos selected"] = "没有照片挑选了";
-$a->strings["Access to this item is restricted."] = "这个项目使用权限的。";
-$a->strings["Upload Photos"] = "上传照片";
-$a->strings["New album name: "] = "新册名：";
-$a->strings["or existing album name: "] = "或现有册名";
-$a->strings["Do not show a status post for this upload"] = "别显示现状报到关于这个上传";
-$a->strings["Show to Groups"] = "给组表示";
-$a->strings["Show to Contacts"] = "展示给联系人";
-$a->strings["Edit Album"] = "编照片册";
-$a->strings["Show Newest First"] = "先表示最新的";
-$a->strings["Show Oldest First"] = "先表示最老的";
-$a->strings["View Photo"] = "看照片";
-$a->strings["Permission denied. Access to this item may be restricted."] = "无权利。用这个项目可能受限制。";
-$a->strings["Photo not available"] = "不可获得的照片";
-$a->strings["View photo"] = "看照片";
-$a->strings["Edit photo"] = "编辑照片";
-$a->strings["Use as profile photo"] = "用为资料图";
-$a->strings["Private Message"] = "私人的新闻";
-$a->strings["View Full Size"] = "看全尺寸";
-$a->strings["Tags: "] = "标签：";
-$a->strings["[Remove any tag]"] = "[删除任何标签]";
-$a->strings["New album name"] = "新册名";
-$a->strings["Caption"] = "字幕";
-$a->strings["Add a Tag"] = "加标签";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "例子：@zhang, @Zhang_San, @li@example.com, #Beijing, #ktv";
-$a->strings["Do not rotate"] = "不要旋转";
-$a->strings["Rotate CW (right)"] = "顺时针地转动（左）";
-$a->strings["Rotate CCW (left)"] = "反顺时针地转动（右）";
-$a->strings["I like this (toggle)"] = "我喜欢这(交替)";
-$a->strings["I don't like this (toggle)"] = "我不喜欢这(交替)";
-$a->strings["Comment"] = "评论";
-$a->strings["Map"] = "地图";
-$a->strings["View Album"] = "看照片册";
-$a->strings["Requested profile is not available."] = "要求的简介联系不上的。";
-$a->strings["%s's timeline"] = "%s 的时间线";
-$a->strings["%s's posts"] = "%s的帖子";
-$a->strings["%s's comments"] = "%s 的评论";
-$a->strings["Tips for New Members"] = "新人建议";
 $a->strings["Profile deleted."] = "简介删除了。";
 $a->strings["Profile-"] = "简介-";
 $a->strings["New profile created."] = "新的简介已创建。";
@@ -1367,6 +1634,7 @@ $a->strings["Profile Actions"] = "";
 $a->strings["Edit Profile Details"] = "剪辑简介消息";
 $a->strings["Change Profile Photo"] = "改变简介照片";
 $a->strings["View this profile"] = "看这个简介";
+$a->strings["View all profiles"] = "";
 $a->strings["Edit visibility"] = "修改能见度";
 $a->strings["Create a new profile using these settings"] = "使用这些设置创建一份新的简介";
 $a->strings["Clone this profile"] = "复制这个简介";
@@ -1422,332 +1690,61 @@ $a->strings["visible to everybody"] = "给打假可见的";
 $a->strings["Edit/Manage Profiles"] = "编辑／管理简介";
 $a->strings["Change profile photo"] = "换简介照片";
 $a->strings["Create New Profile"] = "创建新的简介";
-$a->strings["Registration successful. Please check your email for further instructions."] = "注册成功了。请咨询说明再您的收件箱。";
-$a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "发送邮件失败。你的账户消息是：<br>用户名：%s<br> 密码: %s<br><br>。登录后能改密码。";
-$a->strings["Registration successful."] = "注册成功。";
-$a->strings["Your registration can not be processed."] = "处理不了您的注册。";
-$a->strings["Your registration is pending approval by the site owner."] = "您的注册等网页主的批准。";
-$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "您会(可选的)用OpenID填这个表格通过提供您的OpenID和点击「注册」。";
-$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "如果您没熟悉OpenID,请留空这个栏和填另些栏。";
-$a->strings["Your OpenID (optional): "] = "您的OpenID(可选的):";
-$a->strings["Include your profile in member directory?"] = "放您的简介再员目录？";
-$a->strings["Note for the admin"] = "给管理员的便条";
-$a->strings["Leave a message for the admin, why you want to join this node"] = "给管理员留条消息，为什么你想加入这个节点";
-$a->strings["Membership on this site is by invitation only."] = "会员身份在这个网站是光通过邀请。";
-$a->strings["Your invitation code: "] = "您的邀请码：";
-$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "你的全名 (比如张三，真名或看起来是真名)：";
-$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "您的电子邮件地址：(初始信息将发送到这里，所以这必须是一个存在的地址。)";
-$a->strings["New Password:"] = "新密码：";
-$a->strings["Leave empty for an auto generated password."] = "留空以使用自动生成的密码。";
-$a->strings["Confirm:"] = "确认：";
-$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@%s</strong>'."] = "";
-$a->strings["Choose a nickname: "] = "选择昵称：";
-$a->strings["Register"] = "注册";
-$a->strings["Import your profile to this friendica instance"] = "进口您的简介到这个friendica服务器";
-$a->strings["User deleted their account"] = "";
-$a->strings["On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups."] = "";
-$a->strings["The user id is %d"] = "用户 id 为 %d";
-$a->strings["Remove My Account"] = "删除我的账户";
-$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "这要完全删除您的账户。这一做过，就不能恢复。";
-$a->strings["Please enter your password for verification:"] = "请输入密码为确认：";
-$a->strings["Only logged in users are permitted to perform a search."] = "只有已登录的用户被允许进行搜索。";
-$a->strings["Too Many Requests"] = "过多请求";
-$a->strings["Only one search per minute is permitted for not logged in users."] = "对未登录的用户，每分钟只允许一条搜索。";
-$a->strings["Items tagged with: %s"] = "项目标记为：%s";
-$a->strings["Account"] = "帐户";
-$a->strings["Display"] = "显示";
-$a->strings["Social Networks"] = "社会化网络";
-$a->strings["Delegations"] = "代表";
-$a->strings["Connected apps"] = "连接着应用";
-$a->strings["Remove account"] = "删除账户";
-$a->strings["Missing some important data!"] = "缺失一些重要数据！";
-$a->strings["Failed to connect with email account using the settings provided."] = "不能连接电子邮件账户用输入的设置。";
-$a->strings["Email settings updated."] = "电子邮件设置更新了";
-$a->strings["Features updated"] = "特点更新了";
-$a->strings["Relocate message has been send to your contacts"] = "调动消息已发送给您的联系人";
-$a->strings["Passwords do not match. Password unchanged."] = "密码不匹配。密码没改变。";
-$a->strings["Empty passwords are not allowed. Password unchanged."] = "空的密码禁止。密码没未改变的。";
-$a->strings["The new password has been exposed in a public data dump, please choose another."] = "新密码已暴露在公共数据转储中，请务必另选密码。";
-$a->strings["Wrong password."] = "密码不正确。";
-$a->strings["Password changed."] = "密码变化了。";
-$a->strings["Password update failed. Please try again."] = "密码更新失败了。请再试。";
-$a->strings[" Please use a shorter name."] = " 请用一个更短的名字。";
-$a->strings[" Name too short."] = " 名字过短。";
-$a->strings["Wrong Password"] = "密码不正确";
-$a->strings["Invalid email."] = "无效的邮箱。";
-$a->strings["Cannot change to that email."] = "无法更改到此电子邮件地址。";
-$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "私人评坛没有隐私批准。默认隐私组用者。";
-$a->strings["Private forum has no privacy permissions and no default privacy group."] = "私人评坛没有隐私批准或默认隐私组。";
-$a->strings["Settings updated."] = "设置更新了。";
-$a->strings["Add application"] = "加入应用";
-$a->strings["Consumer Key"] = "钥匙(Consumer Key)";
-$a->strings["Consumer Secret"] = "密码(Consumer Secret)";
-$a->strings["Redirect"] = "重定向";
-$a->strings["Icon url"] = "图符URL";
-$a->strings["You can't edit this application."] = "您不能编辑这个应用。";
-$a->strings["Connected Apps"] = "连接着应用";
-$a->strings["Edit"] = "编辑";
-$a->strings["Client key starts with"] = "客户钥匙头字是";
-$a->strings["No name"] = "无名";
-$a->strings["Remove authorization"] = "撤消权能";
-$a->strings["No Addon settings configured"] = "无插件设置配置完成";
-$a->strings["Addon Settings"] = "插件设置";
-$a->strings["Additional Features"] = "附加特性";
-$a->strings["Diaspora"] = "Diaspora";
-$a->strings["enabled"] = "能够做的";
-$a->strings["disabled"] = "已停用";
-$a->strings["Built-in support for %s connectivity is %s"] = "包括的支持为%s连通性是%s";
-$a->strings["GNU Social (OStatus)"] = "GNU Social (OStatus)";
-$a->strings["Email access is disabled on this site."] = "电子邮件访问在这个站上被禁用。";
-$a->strings["General Social Media Settings"] = "通用社交媒体设置";
-$a->strings["Disable Content Warning"] = "禁用内容警告";
-$a->strings["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 collapsing and sets the content warning as the post title. Doesn't affect any other content filtering you eventually set up."] = "";
-$a->strings["Disable intelligent shortening"] = "";
-$a->strings["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."] = "";
-$a->strings["Automatically follow any GNU Social (OStatus) followers/mentioners"] = "自动关注任何 GNU Social (OStatus) 关注者/提及者";
-$a->strings["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."] = "";
-$a->strings["Default group for OStatus contacts"] = "用于 OStatus 联系人的默认组";
-$a->strings["Your legacy GNU Social account"] = "您遗留的 GNU Social 账户";
-$a->strings["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."] = "如果您在这里输入您旧的 GNU Social/Statusnet 账号名 (格式示例 user@domain.tld) ，您的联系人列表将会被自动添加。完成后该字段将被清空。";
-$a->strings["Repair OStatus subscriptions"] = "修复 OStatus 订阅";
-$a->strings["Email/Mailbox Setup"] = "邮件收件箱设置";
-$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "如果您想用这股服务(可选的)跟邮件熟人交流，请指定怎么连通您的收件箱。";
-$a->strings["Last successful email check:"] = "上个成功收件箱检查：";
-$a->strings["IMAP server name:"] = "IMAP服务器名字：";
-$a->strings["IMAP port:"] = "IMAP服务器端口：";
-$a->strings["Security:"] = "安全：";
-$a->strings["None"] = "没有";
-$a->strings["Email login name:"] = "邮件登录名：";
-$a->strings["Email password:"] = "邮件密码：";
-$a->strings["Reply-to address:"] = "回答地址：";
-$a->strings["Send public posts to all email contacts:"] = "发送公开文章给所有的邮件联系人：";
-$a->strings["Action after import:"] = "进口后行动：";
-$a->strings["Mark as seen"] = "标注看过";
-$a->strings["Move to folder"] = "搬到文件夹";
-$a->strings["Move to folder:"] = "搬到文件夹：";
-$a->strings["%s - (Unsupported)"] = "%s - (不支持的)";
-$a->strings["%s - (Experimental)"] = "%s - (实验性)";
-$a->strings["Display Settings"] = "表示设置";
-$a->strings["Display Theme:"] = "显示主题：";
-$a->strings["Mobile Theme:"] = "手机主题：";
-$a->strings["Suppress warning of insecure networks"] = "";
-$a->strings["Should the system suppress the warning that the current group contains members of networks that can't receive non public postings."] = "";
-$a->strings["Update browser every xx seconds"] = "更新游览器每XX秒";
-$a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "至少 10 秒。输入 -1 禁用。";
-$a->strings["Number of items to display per page:"] = "每页表示多少项目：";
-$a->strings["Maximum of 100 items"] = "最多100项目";
-$a->strings["Number of items to display per page when viewed from mobile device:"] = "用手机看一页展示多少项目：";
-$a->strings["Don't show emoticons"] = "不显示表情符号";
-$a->strings["Calendar"] = "日历";
-$a->strings["Beginning of week:"] = "一周的开始：";
-$a->strings["Don't show notices"] = "不显示提示";
-$a->strings["Infinite scroll"] = "无限的滚动";
-$a->strings["Automatic updates only at the top of the network page"] = "仅在返回到网页头部时自动更新";
-$a->strings["When disabled, the network page is updated all the time, which could be confusing while reading."] = "禁用后，网页将会一直更新，这可能会对阅读造成干扰。";
-$a->strings["Bandwidth Saver Mode"] = "";
-$a->strings["When enabled, embedded content is not displayed on automatic updates, they only show on page reload."] = "当启用时，嵌入的内容不会在自动更新时显示，它们只在页面重载时显示。";
-$a->strings["Smart Threading"] = "";
-$a->strings["When enabled, suppress extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled."] = "";
-$a->strings["General Theme Settings"] = "通用主题设置";
-$a->strings["Custom Theme Settings"] = "自定义主题设置";
-$a->strings["Content Settings"] = "内容设置";
-$a->strings["Theme settings"] = "主题设置";
-$a->strings["Unable to find your profile. Please contact your admin."] = "无法找到您的简介。请联系您的管理员。";
-$a->strings["Account Types"] = "账户类型";
-$a->strings["Personal Page Subtypes"] = "";
-$a->strings["Community Forum Subtypes"] = "";
-$a->strings["Account for a personal profile."] = "";
-$a->strings["Account for an organisation that automatically approves contact requests as \"Followers\"."] = "";
-$a->strings["Account for a news reflector that automatically approves contact requests as \"Followers\"."] = "";
-$a->strings["Account for community discussions."] = "";
-$a->strings["Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."] = "";
-$a->strings["Account for a public profile that automatically approves contact requests as \"Followers\"."] = "";
-$a->strings["Automatically approves all contact requests."] = "自动批准所有联系人请求。";
-$a->strings["Account for a popular profile that automatically approves contact requests as \"Friends\"."] = "";
-$a->strings["Private Forum [Experimental]"] = "隐私评坛［实验性的 ］";
-$a->strings["Requires manual approval of contact requests."] = "需要人工批准联系人请求。";
-$a->strings["OpenID:"] = "OpenID:";
-$a->strings["(Optional) Allow this OpenID to login to this account."] = "(可选的) 允许这个 OpenID 登录这个账户。";
-$a->strings["Publish your default profile in your local site directory?"] = "出版您默认简介在您当地的网站目录？";
-$a->strings["Your profile will be published in this node's <a href=\"%s\">local directory</a>. Your profile details may be publicly visible depending on the system settings."] = "";
-$a->strings["Publish your default profile in the global social directory?"] = "出版您默认简介在综合社会目录？";
-$a->strings["Your profile will be published in the global friendica directories (e.g. <a href=\"%s\">%s</a>). Your profile will be visible in public."] = "";
-$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "在您的默认简介中向访问者隐藏您的联系人/朋友列表？";
-$a->strings["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"] = "您的联系人列表将不会在您的默认简介页面展示。您可以决定在您自建的各附加简介中分别展示您的联系人列表";
-$a->strings["Hide your profile details from anonymous viewers?"] = "对匿名访问者隐藏详细简介？";
-$a->strings["Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means."] = "";
-$a->strings["Allow friends to post to your profile page?"] = "允许朋友们贴文章在您的简介页？";
-$a->strings["Your contacts may write posts on your profile wall. These posts will be distributed to your contacts"] = "";
-$a->strings["Allow friends to tag your posts?"] = "允许朋友们标签您的文章？";
-$a->strings["Your contacts can add additional tags to your posts."] = "您的联系人可以为您的帖子添加额外的标签。";
-$a->strings["Allow us to suggest you as a potential friend to new members?"] = "允许我们建议您潜力朋友给新成员？";
-$a->strings["If you like, Friendica may suggest new members to add you as a contact."] = "如果您愿意，Friendica 可能会建议新成员将您添加为联系人。";
-$a->strings["Permit unknown people to send you private mail?"] = "允许生人寄给您私人邮件？";
-$a->strings["Friendica network users may send you private messages even if they are not in your contact list."] = "Friendica 网络用户可能会向您发送私人信息，即使他们不在您的联系人列表中。";
-$a->strings["Profile is <strong>not published</strong>."] = "简介<strong>未发布</strong>。";
-$a->strings["Your Identity Address is <strong>'%s'</strong> or '%s'."] = "你的身份地址是 <strong>'%s'</strong> 或者 '%s'.";
-$a->strings["Automatically expire posts after this many days:"] = "在这数天后自动使文章过期：";
-$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "如果为空，文章不会过期。过期的文章将被删除";
-$a->strings["Advanced expiration settings"] = "高级过期设置";
-$a->strings["Advanced Expiration"] = "先进的过期";
-$a->strings["Expire posts:"] = "把文章过期：";
-$a->strings["Expire personal notes:"] = "把私人便条过期：";
-$a->strings["Expire starred posts:"] = "把星的文章过期：";
-$a->strings["Expire photos:"] = "把照片过期：";
-$a->strings["Only expire posts by others:"] = "只别人的文章过期：";
-$a->strings["Account Settings"] = "帐户设置";
-$a->strings["Password Settings"] = "密码设置";
-$a->strings["Leave password fields blank unless changing"] = "留空密码字段，除非要修改";
-$a->strings["Current Password:"] = "当前密码：";
-$a->strings["Your current password to confirm the changes"] = "你的当前密码，来确认修改";
-$a->strings["Password:"] = "密码：";
-$a->strings["Basic Settings"] = "基础设置";
-$a->strings["Full Name:"] = "全名：";
-$a->strings["Email Address:"] = "电子邮件地址:";
-$a->strings["Your Timezone:"] = "你的时区：";
-$a->strings["Your Language:"] = "你的语言：";
-$a->strings["Set the language we use to show you friendica interface and to send you emails"] = "";
-$a->strings["Default Post Location:"] = "默认文章位置：";
-$a->strings["Use Browser Location:"] = "使用浏览器位置：";
-$a->strings["Security and Privacy Settings"] = "安全和隐私设置";
-$a->strings["Maximum Friend Requests/Day:"] = "每天最大朋友请求数：";
-$a->strings["(to prevent spam abuse)"] = "（用于防止垃圾信息滥用）";
-$a->strings["Default Post Permissions"] = "默认文章权限";
-$a->strings["(click to open/close)"] = "（点击来打开/关闭）";
-$a->strings["Default Private Post"] = "默认私人文章";
-$a->strings["Default Public Post"] = "默认公开文章";
-$a->strings["Default Permissions for New Posts"] = "新文章的默认权限";
-$a->strings["Maximum private messages per day from unknown people:"] = "每天来自未知的人的私信：";
-$a->strings["Notification Settings"] = "通知设置";
-$a->strings["Send a notification email when:"] = "发一个消息要是：";
-$a->strings["You receive an introduction"] = "你收到一份介绍";
-$a->strings["Your introductions are confirmed"] = "你的介绍被确认了";
-$a->strings["Someone writes on your profile wall"] = "某人写在你的简历墙";
-$a->strings["Someone writes a followup comment"] = "某人写一个后续的评论";
-$a->strings["You receive a private message"] = "你收到一封私信";
-$a->strings["You receive a friend suggestion"] = "你受到一个朋友建议";
-$a->strings["You are tagged in a post"] = "你被在新闻标签";
-$a->strings["You are poked/prodded/etc. in a post"] = "您在文章被戳";
-$a->strings["Activate desktop notifications"] = "启用桌面通知";
-$a->strings["Show desktop popup on new notifications"] = "在有新的提示时显示桌面弹出窗口";
-$a->strings["Text-only notification emails"] = "纯文本通知邮件";
-$a->strings["Send text only notification emails, without the html part"] = "发送纯文本通知邮件，无 html 部分";
-$a->strings["Show detailled notifications"] = "显示详细通知";
-$a->strings["Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed."] = "";
-$a->strings["Advanced Account/Page Type Settings"] = "专家账户／页种设置";
-$a->strings["Change the behaviour of this account for special situations"] = "把这个账户特别情况的时候行动变化";
-$a->strings["Relocate"] = "调动";
-$a->strings["If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."] = "如果您调动这个简介从别的服务器但有的熟人没收到您的更新，尝试按这个钮。";
-$a->strings["Resend relocate message to contacts"] = "把调动信息寄给熟人";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s关注着%2\$s的%3\$s";
-$a->strings["[Embedded content - reload page to view]"] = "[嵌入内容－重新加载页为看]";
-$a->strings["Do you really want to delete this video?"] = "你真的想删除这个视频吗？";
-$a->strings["Delete Video"] = "删除视频";
-$a->strings["No videos selected"] = "没有视频被选择";
-$a->strings["Recent Videos"] = "最近的视频";
-$a->strings["Upload New Videos"] = "上传新视频";
-$a->strings["default"] = "默认";
-$a->strings["greenzero"] = "greenzero";
-$a->strings["purplezero"] = "purplezero";
-$a->strings["easterbunny"] = "easterbunny";
-$a->strings["darkzero"] = "darkzero";
-$a->strings["comix"] = "comix";
-$a->strings["slackr"] = "slackr";
-$a->strings["Variations"] = "变化";
-$a->strings["Top Banner"] = "";
-$a->strings["Resize image to the width of the screen and show background color below on long pages."] = "";
-$a->strings["Full screen"] = "";
-$a->strings["Resize image to fill entire screen, clipping either the right or the bottom."] = "";
-$a->strings["Single row mosaic"] = "";
-$a->strings["Resize image to repeat it on a single row, either vertical or horizontal."] = "";
-$a->strings["Mosaic"] = "";
-$a->strings["Repeat image to fill the screen."] = "";
-$a->strings["Custom"] = "";
-$a->strings["Note"] = "便条";
-$a->strings["Check image permissions if all users are allowed to see the image"] = "";
-$a->strings["Select color scheme"] = "";
-$a->strings["Navigation bar background color"] = "";
-$a->strings["Navigation bar icon color "] = "";
-$a->strings["Link color"] = "链接颜色";
-$a->strings["Set the background color"] = "设置背景色";
-$a->strings["Content background opacity"] = "";
-$a->strings["Set the background image"] = "设置背景图片";
-$a->strings["Background image style"] = "";
-$a->strings["Login page background image"] = "登录页面背景图片";
-$a->strings["Login page background color"] = "登录页面背景色";
-$a->strings["Leave background image and color empty for theme defaults"] = "";
-$a->strings["Guest"] = "";
-$a->strings["Visitor"] = "访客";
-$a->strings["Logout"] = "注销";
-$a->strings["End this session"] = "结束此次会话";
-$a->strings["Your posts and conversations"] = "你的消息和交谈";
-$a->strings["Your profile page"] = "你的简介页";
-$a->strings["Your photos"] = "你的照片";
-$a->strings["Videos"] = "视频";
-$a->strings["Your videos"] = "你的视频";
-$a->strings["Your events"] = "你的项目";
-$a->strings["Conversations from your friends"] = "来自你的朋友们的交谈";
-$a->strings["Events and Calendar"] = "事件和日历";
-$a->strings["Private mail"] = "私人的邮件";
-$a->strings["Account settings"] = "帐户设置";
-$a->strings["Manage/edit friends and contacts"] = "管理/编辑朋友和联系人";
-$a->strings["Alignment"] = "对齐";
-$a->strings["Left"] = "左边";
-$a->strings["Center"] = "中间";
-$a->strings["Color scheme"] = "色彩方案";
-$a->strings["Posts font size"] = "文章";
-$a->strings["Textareas font size"] = "文本区字体大小";
-$a->strings["Comma separated list of helper forums"] = "";
-$a->strings["don't show"] = "不要显示";
-$a->strings["show"] = "显示";
-$a->strings["Set style"] = "设置风格";
-$a->strings["Community Pages"] = "社会页";
-$a->strings["Community Profiles"] = "社会简介";
-$a->strings["Help or @NewHere ?"] = "需要帮助或@第一次来这儿？";
-$a->strings["Connect Services"] = "连接服务";
-$a->strings["Find Friends"] = "找朋友们";
-$a->strings["Last users"] = "上次用户";
-$a->strings["Find People"] = "找人物";
-$a->strings["Enter name or interest"] = "输入名字或兴趣";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "比如：李某，打鱼";
-$a->strings["Similar Interests"] = "相似兴趣";
-$a->strings["Random Profile"] = "随机简介";
-$a->strings["Invite Friends"] = "邀请朋友们";
-$a->strings["Local Directory"] = "本地目录";
-$a->strings["External link to forum"] = "到论坛的外链";
-$a->strings["Quick Start"] = "快速入门";
-$a->strings["Error decoding account file"] = "解码账户文件出错误";
-$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "错误！文件没有版本数！这不是Friendica账户文件吗？";
-$a->strings["User '%s' already exists on this server!"] = "用户「%s」已经存在这个服务器！";
-$a->strings["User creation error"] = "用户创建错误";
-$a->strings["User profile creation error"] = "用户简介创建错误";
-$a->strings["%d contact not imported"] = [
-	0 => "%d 个联系人没导入",
-];
-$a->strings["Done. You can now login with your username and password"] = "完成。你现在可以用你的用户名和密码登录";
-$a->strings["Post to Email"] = "电邮发布";
-$a->strings["Hide your profile details from unknown viewers?"] = "使简介信息给陌生的看着看不了？";
-$a->strings["Connectors disabled, since \"%s\" is enabled."] = "连接器已停用，因为\"%s\"启用。";
-$a->strings["Visible to everybody"] = "任何人可见的";
-$a->strings["Close"] = "关闭";
-$a->strings["Enter new password: "] = "";
-$a->strings["Password can't be empty"] = "";
-$a->strings["Could not find any unarchived contact entry for this URL (%s)"] = "";
-$a->strings["The contact entries have been archived"] = "";
-$a->strings["System"] = "系统";
-$a->strings["Home"] = "主页";
-$a->strings["Introductions"] = "介绍";
-$a->strings["%s commented on %s's post"] = "%s 在 %s 的文章发表了评论";
-$a->strings["%s created a new post"] = "%s 创建了一个新文章";
-$a->strings["%s liked %s's post"] = "%s喜欢了%s的消息";
-$a->strings["%s disliked %s's post"] = "%s不喜欢了%s的消息";
-$a->strings["%s is attending %s's event"] = "%s 正在参加 %s 的事件";
-$a->strings["%s is not attending %s's event"] = "%s 不在参加 %s 的事件";
-$a->strings["%s may attend %s's event"] = "%s 可以参加 %s 的事件";
-$a->strings["%s is now friends with %s"] = "%s成为%s的朋友";
-$a->strings["Friend Suggestion"] = "朋友建议";
-$a->strings["Friend/Connect Request"] = "友谊／联络要求";
-$a->strings["New Follower"] = "新关注者";
+$a->strings["Photo Albums"] = "相册";
+$a->strings["Recent Photos"] = "最近的照片";
+$a->strings["Upload New Photos"] = "上传新照片";
+$a->strings["Contact information unavailable"] = "联系人信息不可用";
+$a->strings["Album not found."] = "取回不了相册.";
+$a->strings["Delete Album"] = "删除相册";
+$a->strings["Do you really want to delete this photo album and all its photos?"] = "您真的想删除这个相册和所有里面的照相吗？";
+$a->strings["Delete Photo"] = "删除照片";
+$a->strings["Do you really want to delete this photo?"] = "您真的想删除这个照相吗？";
+$a->strings["a photo"] = "一张照片";
+$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s被%3\$s标签在%2\$s";
+$a->strings["Image upload didn't complete, please try again"] = "图片上传未完成，请重试";
+$a->strings["Image file is missing"] = "缺少图片文件";
+$a->strings["Server can't accept new file upload at this time, please contact your administrator"] = "服务器目前无法接受新的上传文件，请联系您的管理员";
+$a->strings["Image file is empty."] = "图片文件空的。";
+$a->strings["No photos selected"] = "没有照片挑选了";
+$a->strings["Upload Photos"] = "上传照片";
+$a->strings["New album name: "] = "新册名：";
+$a->strings["or select existing album:"] = "";
+$a->strings["Do not show a status post for this upload"] = "别显示现状报到关于这个上传";
+$a->strings["Edit Album"] = "编照片册";
+$a->strings["Show Newest First"] = "先表示最新的";
+$a->strings["Show Oldest First"] = "先表示最老的";
+$a->strings["View Photo"] = "看照片";
+$a->strings["Permission denied. Access to this item may be restricted."] = "无权利。用这个项目可能受限制。";
+$a->strings["Photo not available"] = "不可获得的照片";
+$a->strings["View photo"] = "看照片";
+$a->strings["Edit photo"] = "编辑照片";
+$a->strings["Use as profile photo"] = "用为资料图";
+$a->strings["Private Message"] = "私人的新闻";
+$a->strings["View Full Size"] = "看全尺寸";
+$a->strings["Tags: "] = "标签：";
+$a->strings["[Remove any tag]"] = "[删除任何标签]";
+$a->strings["New album name"] = "新册名";
+$a->strings["Caption"] = "字幕";
+$a->strings["Add a Tag"] = "加标签";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "例子：@zhang, @Zhang_San, @li@example.com, #Beijing, #ktv";
+$a->strings["Do not rotate"] = "不要旋转";
+$a->strings["Rotate CW (right)"] = "顺时针地转动（左）";
+$a->strings["Rotate CCW (left)"] = "反顺时针地转动（右）";
+$a->strings["I like this (toggle)"] = "我喜欢这(交替)";
+$a->strings["I don't like this (toggle)"] = "我不喜欢这(交替)";
+$a->strings["Comment"] = "评论";
+$a->strings["Map"] = "地图";
+$a->strings["<span><a href=\"%s\" target=\"_blank\" class=\"shared-wall-item-name\">%s</a> wrote the following <a href=\"%s\" target=\"_blank\">post</a>"] = "";
+$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "";
+$a->strings["<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a href=\"%s\" target=\"_blank\">post</a>"] = "";
+$a->strings["Update %s failed. See error logs."] = "更新 %s 失败。查看错误日志。";
+$a->strings["There are no tables on MyISAM."] = "未在 MyISAM 中发现表。";
+$a->strings["\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "";
+$a->strings["The error message is\n[pre]%s[/pre]"] = "错误消息是\n[pre]%s[/pre]";
+$a->strings["\nError %d occurred during database update:\n%s\n"] = "\n在数据库更新的时候发生了错误 %d\n%s\n";
+$a->strings["Errors encountered performing database changes: "] = "操作数据库更改的时候遇到了错误：";
+$a->strings["%s: Database update"] = "";
+$a->strings["%s: updating %s table."] = "%s: 正在更新 %s 表。";
 $a->strings["Could not find a command line version of PHP in the web server PATH."] = "没找到命令行PHP在网服务器PATH。";
 $a->strings["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://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>"] = "";
 $a->strings["PHP executable path"] = "PHP可执行路径";
@@ -1781,11 +1778,11 @@ $a->strings["Error: mb_string PHP module required but not installed."] = "错误
 $a->strings["Error: iconv PHP module required but not installed."] = "错误：需要 iconv PHP 模块但它并没有被安装。";
 $a->strings["Error: POSIX PHP module required but not installed."] = "";
 $a->strings["Error, XML PHP module required but not installed."] = "部件错误，需要 XML PHP 模块但它并没有被安装。";
-$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "网页安装器要创建一个叫 \".htconfig.php\" 的文件在你的 web 服务器的顶层目录下，但无法这么做。";
+$a->strings["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."] = "";
 $a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "这常常是一个权设置，因为网服务器可能不会写文件在文件夹－即使您会。";
-$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "这个步骤头，我们给您正文要保存在叫.htconfig.php的文件在您Friendica主文件夹。";
+$a->strings["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."] = "";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "或者您会这个步骤不做还是实行手动的安装。请看INSTALL.txt文件为说明。";
-$a->strings[".htconfig.php is writable"] = ".htconfig.php是可写的";
+$a->strings["config/local.ini.php is writable"] = "";
 $a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica用Smarty3模板机车为建筑网页。Smarty3把模板编译成PHP为催建筑网页。";
 $a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "为了保存这些模板，网服务器要写权利于view/smarty3/目录在Friendica主目录下。";
 $a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "请保险您网服务器用户（比如www-data）有这个目录的写权利。";
@@ -1797,6 +1794,102 @@ $a->strings["Url rewrite is working"] = "URL改写发挥机能";
 $a->strings["ImageMagick PHP extension is not installed"] = "ImageMagick PHP 扩展没有安装";
 $a->strings["ImageMagick PHP extension is installed"] = "ImageMagick PHP 扩展已安装";
 $a->strings["ImageMagick supports GIF"] = "ImageMagick 支持 GIF";
+$a->strings["Post to Email"] = "电邮发布";
+$a->strings["Hide your profile details from unknown viewers?"] = "使简介信息给陌生的看着看不了？";
+$a->strings["Connectors disabled, since \"%s\" is enabled."] = "连接器已停用，因为\"%s\"启用。";
+$a->strings["Visible to everybody"] = "任何人可见的";
+$a->strings["Close"] = "关闭";
+$a->strings["Could not find any unarchived contact entry for this URL (%s)"] = "";
+$a->strings["The contact entries have been archived"] = "";
+$a->strings["Execute pending post updates."] = "";
+$a->strings["All pending post updates are done."] = "";
+$a->strings["Enter new password: "] = "";
+$a->strings["Password can't be empty"] = "";
+$a->strings["System"] = "系统";
+$a->strings["Home"] = "主页";
+$a->strings["Introductions"] = "介绍";
+$a->strings["%s commented on %s's post"] = "%s 在 %s 的文章发表了评论";
+$a->strings["%s created a new post"] = "%s 创建了一个新文章";
+$a->strings["%s liked %s's post"] = "%s喜欢了%s的消息";
+$a->strings["%s disliked %s's post"] = "%s不喜欢了%s的消息";
+$a->strings["%s is attending %s's event"] = "%s 正在参加 %s 的事件";
+$a->strings["%s is not attending %s's event"] = "%s 不在参加 %s 的事件";
+$a->strings["%s may attend %s's event"] = "%s 可以参加 %s 的事件";
+$a->strings["%s is now friends with %s"] = "%s成为%s的朋友";
+$a->strings["Friend Suggestion"] = "朋友建议";
+$a->strings["Friend/Connect Request"] = "友谊／联络要求";
+$a->strings["New Follower"] = "新关注者";
+$a->strings["Error decoding account file"] = "解码账户文件出错误";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "错误！文件没有版本数！这不是Friendica账户文件吗？";
+$a->strings["User '%s' already exists on this server!"] = "用户「%s」已经存在这个服务器！";
+$a->strings["User creation error"] = "用户创建错误";
+$a->strings["User profile creation error"] = "用户简介创建错误";
+$a->strings["%d contact not imported"] = [
+	0 => "%d 个联系人没导入",
+];
+$a->strings["Done. You can now login with your username and password"] = "完成。你现在可以用你的用户名和密码登录";
+$a->strings["(no subject)"] = "（无主题）";
+$a->strings["This entry was edited"] = "这个条目被编辑了";
+$a->strings["Delete globally"] = "";
+$a->strings["Remove locally"] = "";
+$a->strings["save to folder"] = "保存在文件夹";
+$a->strings["I will attend"] = "我将会参加";
+$a->strings["I will not attend"] = "我将不会参加";
+$a->strings["I might attend"] = "我可能会参加";
+$a->strings["ignore thread"] = "忽视主题";
+$a->strings["unignore thread"] = "取消忽视主题";
+$a->strings["toggle ignore status"] = "切换忽视状态";
+$a->strings["add star"] = "加星";
+$a->strings["remove star"] = "消星";
+$a->strings["toggle star status"] = "转变星现状";
+$a->strings["starred"] = "已标星";
+$a->strings["add tag"] = "加标签";
+$a->strings["like"] = "喜欢";
+$a->strings["dislike"] = "不喜欢";
+$a->strings["Share this"] = "分享这个";
+$a->strings["share"] = "分享";
+$a->strings["to"] = "至";
+$a->strings["via"] = "经过";
+$a->strings["Wall-to-Wall"] = "从墙到墙";
+$a->strings["via Wall-To-Wall:"] = "通过从墙到墙";
+$a->strings["%d comment"] = [
+	0 => "%d 条评论",
+];
+$a->strings["Bold"] = "粗体";
+$a->strings["Italic"] = "斜体";
+$a->strings["Underline"] = "下划线";
+$a->strings["Quote"] = "引语";
+$a->strings["Code"] = "源代码";
+$a->strings["Image"] = "图片";
+$a->strings["Link"] = "链接";
+$a->strings["Video"] = "录像";
+$a->strings["Delete this item?"] = "删除这个项目？";
+$a->strings["show fewer"] = "显示更小";
+$a->strings["No system theme config value set."] = "";
+$a->strings["Logged out."] = "已注销。";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "我们用您输入的OpenID登录的时候碰到问题。请核实拼法是对的。";
+$a->strings["The error message was:"] = "错误通知是：";
+$a->strings["Create a New Account"] = "创建新的账户";
+$a->strings["Password: "] = "密码：";
+$a->strings["Remember me"] = "记住我";
+$a->strings["Or login using OpenID: "] = "或者使用 OpenID 登录: ";
+$a->strings["Forgot your password?"] = "忘记你的密码吗？";
+$a->strings["Website Terms of Service"] = "网站服务条款";
+$a->strings["terms of service"] = "服务条款";
+$a->strings["Website Privacy Policy"] = "网站隐私政策";
+$a->strings["privacy policy"] = "隐私政策";
+$a->strings["At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node's user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication."] = "";
+$a->strings["This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts."] = "";
+$a->strings["At any point in time a logged in user can export their account data from the <a href=\"%1\$s/settings/uexport\">account settings</a>. If the user wants to delete their account they can do so at <a href=\"%1\$s/removeme\">%1\$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners."] = "";
+$a->strings["Privacy Statement"] = "隐私声明";
+$a->strings["%s is now following %s."] = "%s 正在关注 %s.";
+$a->strings["following"] = "关注";
+$a->strings["%s stopped following %s."] = "%s 停止关注了 %s.";
+$a->strings["stopped following"] = "取消关注";
+$a->strings["%s's birthday"] = "%s的生日";
+$a->strings["Happy Birthday %s"] = "生日快乐%s";
+$a->strings["Sharing notification from Diaspora network"] = "分享通知从Diaspora网络";
+$a->strings["Attachments:"] = "附件：";
 $a->strings["Birthday:"] = "生日：";
 $a->strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD 或 MM-DD";
 $a->strings["never"] = "从未";
@@ -1813,18 +1906,114 @@ $a->strings["minutes"] = "分钟";
 $a->strings["second"] = "秒";
 $a->strings["seconds"] = "秒";
 $a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s以前";
-$a->strings["view full size"] = "看全尺寸";
-$a->strings["Image/photo"] = "图像／照片";
-$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "";
-$a->strings["$1 wrote:"] = "$1写：";
-$a->strings["Encrypted content"] = "加密的内容";
-$a->strings["Invalid source protocol"] = "无效的源协议";
-$a->strings["Invalid link protocol"] = "无效的连接协议";
-$a->strings["Embedding disabled"] = "嵌入已停用";
-$a->strings["Embedded content"] = "嵌入内容";
-$a->strings["Export"] = "导出";
-$a->strings["Export calendar as ical"] = "导出日历为 ical";
-$a->strings["Export calendar as csv"] = "导出日历为 csv";
+$a->strings["[no subject]"] = "[无题目]";
+$a->strings["Drop Contact"] = "删除联系人";
+$a->strings["Organisation"] = "组织";
+$a->strings["News"] = "新闻";
+$a->strings["Forum"] = "论坛";
+$a->strings["Connect URL missing."] = "连接URL失踪的。";
+$a->strings["The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."] = "";
+$a->strings["This site is not configured to allow communications with other networks."] = "这网站没配置允许跟别的网络交流.";
+$a->strings["No compatible communication protocols or feeds were discovered."] = "没有兼容协议或者摘要找到了.";
+$a->strings["The profile address specified does not provide adequate information."] = "输入的简介地址没有够消息。";
+$a->strings["An author or name was not found."] = "找不到作者或名。";
+$a->strings["No browser URL could be matched to this address."] = "这个地址没有符合什么游览器URL。";
+$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "无法匹配一个@-风格的身份地址和一个已知的协议或电子邮件联系人。";
+$a->strings["Use mailto: in front of address to force email check."] = "输入mailto:地址前为要求电子邮件检查。";
+$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "输入的简介地址属在这个网站使不可用的网络。";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "有限的简介。这人不会接受直达／私人通信从您。";
+$a->strings["Unable to retrieve contact information."] = "无法检索联系人信息。";
+$a->strings["Starts:"] = "开始：";
+$a->strings["Finishes:"] = "结束：";
+$a->strings["all-day"] = "全天";
+$a->strings["Jun"] = "六月";
+$a->strings["Sept"] = "九月";
+$a->strings["No events to display"] = "没有可显示的事件";
+$a->strings["l, F j"] = "l, F j";
+$a->strings["Edit event"] = "编辑事件";
+$a->strings["Duplicate event"] = "";
+$a->strings["Delete event"] = "删除事件";
+$a->strings["D g:i A"] = "";
+$a->strings["g:i A"] = "";
+$a->strings["Show map"] = "显示地图";
+$a->strings["Hide map"] = "隐藏地图";
+$a->strings["Login failed"] = "登录失败";
+$a->strings["Not enough information to authenticate"] = "没有足够信息以认证";
+$a->strings["An invitation is required."] = "需要邀请。";
+$a->strings["Invitation could not be verified."] = "不能验证邀请。";
+$a->strings["Invalid OpenID url"] = "无效的OpenID url";
+$a->strings["Please enter the required information."] = "请输入必要的信息。";
+$a->strings["Please use a shorter name."] = "请用一个短一点的名字。";
+$a->strings["Name too short."] = "名字太短。";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "这看上去不是您的全姓名。";
+$a->strings["Your email domain is not among those allowed on this site."] = "这网站允许的域名中没有您的";
+$a->strings["Not a valid email address."] = "无效的邮件地址。";
+$a->strings["The nickname was blocked from registration by the nodes admin."] = "";
+$a->strings["Cannot use that email."] = "无法使用此邮件地址。";
+$a->strings["Your nickname can only contain a-z, 0-9 and _."] = "您的昵称只能由字母、数字和下划线组成。";
+$a->strings["Nickname is already registered. Please choose another."] = "此昵称已被注册。请选择新的昵称。";
+$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "严重错误：安全密钥生成失败。";
+$a->strings["An error occurred during registration. Please try again."] = "注册出现问题。请再次尝试。";
+$a->strings["An error occurred creating your default profile. Please try again."] = "创建你的默认简介的时候出现了一个错误。请再试。";
+$a->strings["An error occurred creating your self contact. Please try again."] = "";
+$a->strings["Friends"] = "朋友";
+$a->strings["An error occurred creating your default contact group. Please try again."] = "";
+$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\t\t"] = "";
+$a->strings["Registration at %s"] = "在 %s 的注册";
+$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "\n\t\t\t亲爱的 %1\$s，\n\t\t\t\t感谢您在 %2\$s 注册。您的账户已被创建。\n\t\t";
+$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "";
+$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "一个用这个名字的被删掉的组复活了。现有项目的权限<strong>可能</strong>对这个组和任何未来的成员有效。如果这不是你想要的，请用一个不同的名字创建另一个组。";
+$a->strings["Default privacy group for new contacts"] = "对新联系人的默认隐私组";
+$a->strings["Everybody"] = "每人";
+$a->strings["edit"] = "编辑";
+$a->strings["Edit group"] = "编辑组";
+$a->strings["Create a new group"] = "创建新组";
+$a->strings["Edit groups"] = "编辑组";
+$a->strings["Requested account is not available."] = "要求的账户不可用。";
+$a->strings["Edit profile"] = "修改简介";
+$a->strings["Atom feed"] = "Atom 源";
+$a->strings["Manage/edit profiles"] = "管理/修改简介";
+$a->strings["g A l F d"] = "g A l d F";
+$a->strings["F d"] = "F d";
+$a->strings["[today]"] = "[今天]";
+$a->strings["Birthday Reminders"] = "提醒生日";
+$a->strings["Birthdays this week:"] = "这周的生日:";
+$a->strings["[No description]"] = "[无描述]";
+$a->strings["Event Reminders"] = "事件提醒";
+$a->strings["Upcoming events the next 7 days:"] = "";
+$a->strings["Member since:"] = "";
+$a->strings["j F, Y"] = "j F, Y";
+$a->strings["j F"] = "j F";
+$a->strings["Age:"] = "年龄：";
+$a->strings["for %1\$d %2\$s"] = "为%1\$d %2\$s";
+$a->strings["Religion:"] = "宗教：";
+$a->strings["Hobbies/Interests:"] = "爱好／兴趣";
+$a->strings["Contact information and Social Networks:"] = "联系人消息和社交网络：";
+$a->strings["Musical interests:"] = "音乐兴趣：";
+$a->strings["Books, literature:"] = "书，文学";
+$a->strings["Television:"] = "电视：";
+$a->strings["Film/dance/culture/entertainment:"] = "电影/跳舞/文化/娱乐：";
+$a->strings["Love/Romance:"] = "爱情／浪漫";
+$a->strings["Work/employment:"] = "工作";
+$a->strings["School/education:"] = "学院／教育";
+$a->strings["Forums:"] = "";
+$a->strings["Only You Can See This"] = "只有你可以看这个";
+$a->strings["Tips for New Members"] = "新人建议";
+$a->strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "";
+$a->strings["Add New Contact"] = "添加新的联系人";
+$a->strings["Enter address or web location"] = "输入地址或网络位置";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "比如：li@example.com, http://example.com/li";
+$a->strings["%d invitation available"] = [
+	0 => "%d邀请可用的",
+];
+$a->strings["Networks"] = "网络";
+$a->strings["All Networks"] = "所有网络";
+$a->strings["Saved Folders"] = "保存的文件夹";
+$a->strings["Everything"] = "一切";
+$a->strings["Categories"] = "种类";
+$a->strings["%d contact in common"] = [
+	0 => "%d 个共同的联系人",
+];
 $a->strings["Frequently"] = "";
 $a->strings["Hourly"] = "每小时";
 $a->strings["Twice daily"] = "每天两次";
@@ -1833,7 +2022,6 @@ $a->strings["Weekly"] = "每周";
 $a->strings["Monthly"] = "每月";
 $a->strings["OStatus"] = "OStatus";
 $a->strings["RSS/Atom"] = "RSS/Atom";
-$a->strings["Facebook"] = "Facebook";
 $a->strings["Zot!"] = "Zot!";
 $a->strings["LinkedIn"] = "LinkedIn";
 $a->strings["XMPP/IM"] = "XMPP/IM";
@@ -1844,7 +2032,6 @@ $a->strings["Twitter"] = "推特";
 $a->strings["Diaspora Connector"] = "";
 $a->strings["GNU Social Connector"] = "GNU Social 连接器";
 $a->strings["pnut"] = "";
-$a->strings["App.net"] = "";
 $a->strings["Male"] = "男";
 $a->strings["Female"] = "女";
 $a->strings["Currently Male"] = "目前为男";
@@ -1880,7 +2067,6 @@ $a->strings["Infatuated"] = "痴迷";
 $a->strings["Dating"] = "约会";
 $a->strings["Unfaithful"] = "外遇";
 $a->strings["Sex Addict"] = "性交因成瘾者";
-$a->strings["Friends"] = "朋友";
 $a->strings["Friends/Benefits"] = "朋友/益";
 $a->strings["Casual"] = "休闲";
 $a->strings["Engaged"] = "已订婚的";
@@ -1902,20 +2088,6 @@ $a->strings["Uncertain"] = "不确定";
 $a->strings["It's complicated"] = "是复杂";
 $a->strings["Don't care"] = "无所谓";
 $a->strings["Ask me"] = "问我";
-$a->strings["Add New Contact"] = "添加新的联系人";
-$a->strings["Enter address or web location"] = "输入地址或网络位置";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "比如：li@example.com, http://example.com/li";
-$a->strings["%d invitation available"] = [
-	0 => "%d邀请可用的",
-];
-$a->strings["Networks"] = "网络";
-$a->strings["All Networks"] = "所有网络";
-$a->strings["Saved Folders"] = "保存的文件夹";
-$a->strings["Everything"] = "一切";
-$a->strings["Categories"] = "种类";
-$a->strings["%d contact in common"] = [
-	0 => "%d 个共同的联系人",
-];
 $a->strings["General Features"] = "通用特性";
 $a->strings["Multiple Profiles"] = "多简介";
 $a->strings["Ability to create multiple profiles"] = "能穿凿多简介";
@@ -1992,174 +2164,18 @@ $a->strings["Inbox"] = "收件箱";
 $a->strings["Outbox"] = "发件箱";
 $a->strings["Manage"] = "管理";
 $a->strings["Manage other pages"] = "管理别的页";
-$a->strings["Profiles"] = "简介";
 $a->strings["Manage/Edit Profiles"] = "管理／编辑简介";
 $a->strings["Site setup and configuration"] = "网站开办和配置";
 $a->strings["Navigation"] = "导航";
 $a->strings["Site map"] = "网站地图";
-$a->strings["There are no tables on MyISAM."] = "未在 MyISAM 中发现表。";
-$a->strings["\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "";
-$a->strings["The error message is\n[pre]%s[/pre]"] = "错误消息是\n[pre]%s[/pre]";
-$a->strings["\nError %d occurred during database update:\n%s\n"] = "\n在数据库更新的时候发生了错误 %d\n%s\n";
-$a->strings["Errors encountered performing database changes: "] = "操作数据库更改的时候遇到了错误：";
-$a->strings["%s: Database update"] = "";
-$a->strings["%s: updating %s table."] = "%s: 正在更新 %s 表。";
-$a->strings["[no subject]"] = "[无题目]";
-$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "一个用这个名字的被删掉的组复活了。现有项目的权限<strong>可能</strong>对这个组和任何未来的成员有效。如果这不是你想要的，请用一个不同的名字创建另一个组。";
-$a->strings["Default privacy group for new contacts"] = "对新联系人的默认隐私组";
-$a->strings["Everybody"] = "每人";
-$a->strings["edit"] = "编辑";
-$a->strings["Edit group"] = "编辑组";
-$a->strings["Contacts not in any group"] = "不在任何组的联系人";
-$a->strings["Create a new group"] = "创建新组";
-$a->strings["Edit groups"] = "编辑组";
-$a->strings["Drop Contact"] = "删除联系人";
-$a->strings["Organisation"] = "组织";
-$a->strings["News"] = "新闻";
-$a->strings["Forum"] = "论坛";
-$a->strings["Connect URL missing."] = "连接URL失踪的。";
-$a->strings["The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."] = "";
-$a->strings["This site is not configured to allow communications with other networks."] = "这网站没配置允许跟别的网络交流.";
-$a->strings["No compatible communication protocols or feeds were discovered."] = "没有兼容协议或者摘要找到了.";
-$a->strings["The profile address specified does not provide adequate information."] = "输入的简介地址没有够消息。";
-$a->strings["An author or name was not found."] = "找不到作者或名。";
-$a->strings["No browser URL could be matched to this address."] = "这个地址没有符合什么游览器URL。";
-$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "无法匹配一个@-风格的身份地址和一个已知的协议或电子邮件联系人。";
-$a->strings["Use mailto: in front of address to force email check."] = "输入mailto:地址前为要求电子邮件检查。";
-$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "输入的简介地址属在这个网站使不可用的网络。";
-$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "有限的简介。这人不会接受直达／私人通信从您。";
-$a->strings["Unable to retrieve contact information."] = "无法检索联系人信息。";
-$a->strings["%s's birthday"] = "%s的生日";
-$a->strings["Happy Birthday %s"] = "生日快乐%s";
-$a->strings["Starts:"] = "开始：";
-$a->strings["Finishes:"] = "结束：";
-$a->strings["all-day"] = "全天";
-$a->strings["Jun"] = "六月";
-$a->strings["Sept"] = "九月";
-$a->strings["No events to display"] = "没有可显示的事件";
-$a->strings["l, F j"] = "l, F j";
-$a->strings["Edit event"] = "编辑事件";
-$a->strings["Duplicate event"] = "";
-$a->strings["Delete event"] = "删除事件";
-$a->strings["D g:i A"] = "";
-$a->strings["g:i A"] = "";
-$a->strings["Show map"] = "显示地图";
-$a->strings["Hide map"] = "隐藏地图";
-$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s 正在参加 %2\$s 的 %3\$s";
-$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s 不在参加 %2\$s 的 %3\$s";
-$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s 可以参加 %2\$s 的 %3\$s";
-$a->strings["Requested account is not available."] = "要求的账户不可用。";
-$a->strings["Edit profile"] = "修改简介";
-$a->strings["Atom feed"] = "Atom 源";
-$a->strings["Manage/edit profiles"] = "管理/修改简介";
-$a->strings["g A l F d"] = "g A l d F";
-$a->strings["F d"] = "F d";
-$a->strings["[today]"] = "[今天]";
-$a->strings["Birthday Reminders"] = "提醒生日";
-$a->strings["Birthdays this week:"] = "这周的生日:";
-$a->strings["[No description]"] = "[无描述]";
-$a->strings["Event Reminders"] = "事件提醒";
-$a->strings["Events this week:"] = "这周的事件:";
-$a->strings["Member since:"] = "";
-$a->strings["j F, Y"] = "j F, Y";
-$a->strings["j F"] = "j F";
-$a->strings["Age:"] = "年龄：";
-$a->strings["for %1\$d %2\$s"] = "为%1\$d %2\$s";
-$a->strings["Religion:"] = "宗教：";
-$a->strings["Hobbies/Interests:"] = "爱好／兴趣";
-$a->strings["Contact information and Social Networks:"] = "联系人消息和社交网络：";
-$a->strings["Musical interests:"] = "音乐兴趣：";
-$a->strings["Books, literature:"] = "书，文学";
-$a->strings["Television:"] = "电视：";
-$a->strings["Film/dance/culture/entertainment:"] = "电影/跳舞/文化/娱乐：";
-$a->strings["Love/Romance:"] = "爱情／浪漫";
-$a->strings["Work/employment:"] = "工作";
-$a->strings["School/education:"] = "学院／教育";
-$a->strings["Forums:"] = "";
-$a->strings["Only You Can See This"] = "只有你可以看这个";
-$a->strings["Login failed"] = "登录失败";
-$a->strings["Not enough information to authenticate"] = "没有足够信息以认证";
-$a->strings["An invitation is required."] = "需要邀请。";
-$a->strings["Invitation could not be verified."] = "不能验证邀请。";
-$a->strings["Invalid OpenID url"] = "无效的OpenID url";
-$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "我们用您输入的OpenID登录的时候碰到问题。请核实拼法是对的。";
-$a->strings["The error message was:"] = "错误通知是：";
-$a->strings["Please enter the required information."] = "请输入必要的信息。";
-$a->strings["Please use a shorter name."] = "请用一个短一点的名字。";
-$a->strings["Name too short."] = "名字太短。";
-$a->strings["That doesn't appear to be your full (First Last) name."] = "这看上去不是您的全姓名。";
-$a->strings["Your email domain is not among those allowed on this site."] = "这网站允许的域名中没有您的";
-$a->strings["Not a valid email address."] = "无效的邮件地址。";
-$a->strings["Cannot use that email."] = "无法使用此邮件地址。";
-$a->strings["Your nickname can only contain a-z, 0-9 and _."] = "您的昵称只能由字母、数字和下划线组成。";
-$a->strings["Nickname is already registered. Please choose another."] = "此昵称已被注册。请选择新的昵称。";
-$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "严重错误：安全密钥生成失败。";
-$a->strings["An error occurred during registration. Please try again."] = "注册出现问题。请再次尝试。";
-$a->strings["An error occurred creating your default profile. Please try again."] = "创建你的默认简介的时候出现了一个错误。请再试。";
-$a->strings["An error occurred creating your self contact. Please try again."] = "";
-$a->strings["An error occurred creating your default contact group. Please try again."] = "";
-$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\t\t"] = "";
-$a->strings["Registration at %s"] = "在 %s 的注册";
-$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "\n\t\t\t亲爱的 %1\$s，\n\t\t\t\t感谢您在 %2\$s 注册。您的账户已被创建。\n\t\t";
-$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "";
-$a->strings["Sharing notification from Diaspora network"] = "分享通知从Diaspora网络";
-$a->strings["Attachments:"] = "附件：";
-$a->strings["%s is now following %s."] = "%s 正在关注 %s.";
-$a->strings["following"] = "关注";
-$a->strings["%s stopped following %s."] = "%s 停止关注了 %s.";
-$a->strings["stopped following"] = "取消关注";
-$a->strings["(no subject)"] = "（无主题）";
-$a->strings["Logged out."] = "已注销。";
-$a->strings["Create a New Account"] = "创建新的账户";
-$a->strings["Password: "] = "密码：";
-$a->strings["Remember me"] = "记住我";
-$a->strings["Or login using OpenID: "] = "或者使用 OpenID 登录: ";
-$a->strings["Forgot your password?"] = "忘记你的密码吗？";
-$a->strings["Website Terms of Service"] = "网站服务条款";
-$a->strings["terms of service"] = "服务条款";
-$a->strings["Website Privacy Policy"] = "网站隐私政策";
-$a->strings["privacy policy"] = "隐私政策";
-$a->strings["At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node's user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication."] = "";
-$a->strings["This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts."] = "";
-$a->strings["At any point in time a logged in user can export their account data from the <a href=\"%1\$s/settings/uexport\">account settings</a>. If the user wants to delete their account they can do so at <a href=\"%1\$s/removeme\">%1\$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners."] = "";
-$a->strings["Privacy Statement"] = "隐私声明";
-$a->strings["This entry was edited"] = "这个条目被编辑了";
-$a->strings["Delete globally"] = "";
-$a->strings["Remove locally"] = "";
-$a->strings["save to folder"] = "保存在文件夹";
-$a->strings["I will attend"] = "我将会参加";
-$a->strings["I will not attend"] = "我将不会参加";
-$a->strings["I might attend"] = "我可能会参加";
-$a->strings["add star"] = "加星";
-$a->strings["remove star"] = "消星";
-$a->strings["toggle star status"] = "转变星现状";
-$a->strings["starred"] = "已标星";
-$a->strings["ignore thread"] = "忽视主题";
-$a->strings["unignore thread"] = "取消忽视主题";
-$a->strings["toggle ignore status"] = "切换忽视状态";
-$a->strings["add tag"] = "加标签";
-$a->strings["like"] = "喜欢";
-$a->strings["dislike"] = "不喜欢";
-$a->strings["Share this"] = "分享这个";
-$a->strings["share"] = "分享";
-$a->strings["to"] = "至";
-$a->strings["via"] = "经过";
-$a->strings["Wall-to-Wall"] = "从墙到墙";
-$a->strings["via Wall-To-Wall:"] = "通过从墙到墙";
-$a->strings["%d comment"] = [
-	0 => "%d 条评论",
-];
-$a->strings["Bold"] = "粗体";
-$a->strings["Italic"] = "斜体";
-$a->strings["Underline"] = "下划线";
-$a->strings["Quote"] = "引语";
-$a->strings["Code"] = "源代码";
-$a->strings["Image"] = "图片";
-$a->strings["Link"] = "链接";
-$a->strings["Video"] = "录像";
-$a->strings["Delete this item?"] = "删除这个项目？";
-$a->strings["show fewer"] = "显示更小";
-$a->strings["No system theme config value set."] = "";
-$a->strings["toggle mobile"] = "切换移动设备";
-$a->strings["Update %s failed. See error logs."] = "更新 %s 失败。查看错误日志。";
-$a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "";
+$a->strings["Export"] = "导出";
+$a->strings["Export calendar as ical"] = "导出日历为 ical";
+$a->strings["Export calendar as csv"] = "导出日历为 csv";
+$a->strings["Embedding disabled"] = "嵌入已停用";
+$a->strings["Embedded content"] = "嵌入内容";
+$a->strings["view full size"] = "看全尺寸";
+$a->strings["Image/photo"] = "图像／照片";
+$a->strings["$1 wrote:"] = "$1写：";
+$a->strings["Encrypted content"] = "加密的内容";
+$a->strings["Invalid source protocol"] = "无效的源协议";
+$a->strings["Invalid link protocol"] = "无效的连接协议";

From 2660882f1ec5dd1d4109147b1a053e51319666e4 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 17 Sep 2018 19:43:39 +0200
Subject: [PATCH 81/96] NL translation update THX Jeroen

---
 view/lang/nl/messages.po | 15825 +++++++++++++++++++------------------
 1 file changed, 7928 insertions(+), 7897 deletions(-)

diff --git a/view/lang/nl/messages.po b/view/lang/nl/messages.po
index 8d2e63752b..ae6e3e7caa 100644
--- a/view/lang/nl/messages.po
+++ b/view/lang/nl/messages.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-07 09:58+0200\n"
-"PO-Revision-Date: 2018-08-24 13:50+0000\n"
+"POT-Creation-Date: 2018-08-25 15:34+0000\n"
+"PO-Revision-Date: 2018-08-30 10:00+0000\n"
 "Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
 "Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -29,6 +29,1533 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: index.php:261 mod/apps.php:14
+msgid "You must be logged in to use addons. "
+msgstr "Je moet ingelogd zijn om deze addons te kunnen gebruiken. "
+
+#: index.php:308 mod/fetch.php:20 mod/fetch.php:47 mod/fetch.php:54
+#: mod/help.php:62
+msgid "Not Found"
+msgstr "Niet gevonden"
+
+#: index.php:313 mod/viewcontacts.php:35 mod/dfrn_poll.php:486 mod/help.php:65
+#: mod/cal.php:44
+msgid "Page not found."
+msgstr "Pagina niet gevonden"
+
+#: index.php:431 mod/group.php:83 mod/profperm.php:29
+msgid "Permission denied"
+msgstr "Toegang geweigerd"
+
+#: index.php:432 include/items.php:412 mod/crepair.php:100
+#: mod/wallmessage.php:16 mod/wallmessage.php:40 mod/wallmessage.php:79
+#: mod/wallmessage.php:103 mod/dfrn_confirm.php:66 mod/dirfind.php:27
+#: mod/manage.php:131 mod/settings.php:43 mod/settings.php:149
+#: mod/settings.php:665 mod/common.php:28 mod/network.php:34 mod/group.php:26
+#: mod/delegate.php:27 mod/delegate.php:45 mod/delegate.php:56
+#: mod/repair_ostatus.php:16 mod/viewcontacts.php:60 mod/unfollow.php:17
+#: mod/unfollow.php:59 mod/unfollow.php:93 mod/register.php:53
+#: mod/notifications.php:67 mod/message.php:60 mod/message.php:105
+#: mod/ostatus_subscribe.php:17 mod/nogroup.php:23 mod/suggest.php:61
+#: mod/wall_upload.php:104 mod/wall_upload.php:107 mod/api.php:35
+#: mod/api.php:40 mod/profile_photo.php:29 mod/profile_photo.php:176
+#: mod/profile_photo.php:198 mod/wall_attach.php:80 mod/wall_attach.php:83
+#: mod/item.php:166 mod/uimport.php:28 mod/cal.php:306 mod/regmod.php:108
+#: mod/editpost.php:19 mod/fsuggest.php:80 mod/allfriends.php:23
+#: mod/contacts.php:381 mod/events.php:193 mod/follow.php:54
+#: mod/follow.php:118 mod/attach.php:39 mod/poke.php:145 mod/invite.php:21
+#: mod/invite.php:112 mod/notes.php:32 mod/profiles.php:179
+#: mod/profiles.php:511 mod/photos.php:183 mod/photos.php:1065
+msgid "Permission denied."
+msgstr "Toegang geweigerd"
+
+#: index.php:460
+msgid "toggle mobile"
+msgstr "mobiel thema omwisselen"
+
+#: view/theme/duepuntozero/config.php:54 src/Model/User.php:544
+msgid "default"
+msgstr "standaard"
+
+#: view/theme/duepuntozero/config.php:55
+msgid "greenzero"
+msgstr "greenzero"
+
+#: view/theme/duepuntozero/config.php:56
+msgid "purplezero"
+msgstr "purplezero"
+
+#: view/theme/duepuntozero/config.php:57
+msgid "easterbunny"
+msgstr "easterbunny"
+
+#: view/theme/duepuntozero/config.php:58
+msgid "darkzero"
+msgstr "darkzero"
+
+#: view/theme/duepuntozero/config.php:59
+msgid "comix"
+msgstr "comix"
+
+#: view/theme/duepuntozero/config.php:60
+msgid "slackr"
+msgstr "slackr"
+
+#: view/theme/duepuntozero/config.php:71 view/theme/quattro/config.php:73
+#: view/theme/vier/config.php:119 view/theme/frio/config.php:118
+#: mod/crepair.php:150 mod/install.php:206 mod/install.php:244
+#: mod/manage.php:184 mod/message.php:264 mod/message.php:430
+#: mod/fsuggest.php:114 mod/contacts.php:630 mod/events.php:533
+#: mod/localtime.php:56 mod/poke.php:195 mod/invite.php:155
+#: mod/profiles.php:577 mod/photos.php:1094 mod/photos.php:1180
+#: mod/photos.php:1452 mod/photos.php:1497 mod/photos.php:1536
+#: mod/photos.php:1596 src/Object/Post.php:795
+msgid "Submit"
+msgstr "Opslaan"
+
+#: view/theme/duepuntozero/config.php:73 view/theme/quattro/config.php:75
+#: view/theme/vier/config.php:121 view/theme/frio/config.php:120
+#: mod/settings.php:981
+msgid "Theme settings"
+msgstr "Thema-instellingen"
+
+#: view/theme/duepuntozero/config.php:74
+msgid "Variations"
+msgstr "Variaties"
+
+#: view/theme/quattro/config.php:76
+msgid "Alignment"
+msgstr "Uitlijning"
+
+#: view/theme/quattro/config.php:76
+msgid "Left"
+msgstr "Links"
+
+#: view/theme/quattro/config.php:76
+msgid "Center"
+msgstr "Gecentreerd"
+
+#: view/theme/quattro/config.php:77
+msgid "Color scheme"
+msgstr "Kleurschema"
+
+#: view/theme/quattro/config.php:78
+msgid "Posts font size"
+msgstr "Lettergrootte berichten"
+
+#: view/theme/quattro/config.php:79
+msgid "Textareas font size"
+msgstr "Lettergrootte tekstgebieden"
+
+#: view/theme/vier/config.php:75
+msgid "Comma separated list of helper forums"
+msgstr "Kommagescheiden lijst van de helper forums"
+
+#: view/theme/vier/config.php:115 src/Core/ACL.php:298
+msgid "don't show"
+msgstr "niet tonen"
+
+#: view/theme/vier/config.php:115 src/Core/ACL.php:297
+msgid "show"
+msgstr "tonen"
+
+#: view/theme/vier/config.php:122
+msgid "Set style"
+msgstr "Stijl instellen"
+
+#: view/theme/vier/config.php:123
+msgid "Community Pages"
+msgstr "Forum/groepspagina's"
+
+#: view/theme/vier/config.php:124 view/theme/vier/theme.php:149
+msgid "Community Profiles"
+msgstr "Forum/groepsprofielen"
+
+#: view/theme/vier/config.php:125
+msgid "Help or @NewHere ?"
+msgstr "Help of @NewHere ?"
+
+#: view/theme/vier/config.php:126 view/theme/vier/theme.php:386
+msgid "Connect Services"
+msgstr "Diensten verbinden"
+
+#: view/theme/vier/config.php:127
+msgid "Find Friends"
+msgstr "Zoek vrienden"
+
+#: view/theme/vier/config.php:128 view/theme/vier/theme.php:179
+msgid "Last users"
+msgstr "Laatste gebruikers"
+
+#: view/theme/vier/theme.php:197 src/Content/Widget.php:59
+msgid "Find People"
+msgstr "Zoek mensen"
+
+#: view/theme/vier/theme.php:198 src/Content/Widget.php:60
+msgid "Enter name or interest"
+msgstr "Vul naam of interesse in"
+
+#: view/theme/vier/theme.php:199 include/conversation.php:881
+#: mod/dirfind.php:231 mod/match.php:90 mod/suggest.php:86
+#: mod/allfriends.php:76 mod/contacts.php:604 mod/contacts.php:610
+#: mod/follow.php:143 src/Model/Contact.php:933 src/Content/Widget.php:61
+msgid "Connect/Follow"
+msgstr "Verbind/Volg"
+
+#: view/theme/vier/theme.php:200 src/Content/Widget.php:62
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Voorbeelden: Jan Peeters, Vissen"
+
+#: view/theme/vier/theme.php:201 mod/directory.php:214 mod/contacts.php:842
+#: src/Content/Widget.php:63
+msgid "Find"
+msgstr "Zoek"
+
+#: view/theme/vier/theme.php:202 mod/suggest.php:117 src/Content/Widget.php:64
+msgid "Friend Suggestions"
+msgstr "Vriendschapsvoorstellen"
+
+#: view/theme/vier/theme.php:203 src/Content/Widget.php:65
+msgid "Similar Interests"
+msgstr "Dezelfde interesses"
+
+#: view/theme/vier/theme.php:204 src/Content/Widget.php:66
+msgid "Random Profile"
+msgstr "Willekeurig Profiel"
+
+#: view/theme/vier/theme.php:205 src/Content/Widget.php:67
+msgid "Invite Friends"
+msgstr "Vrienden uitnodigen"
+
+#: view/theme/vier/theme.php:206 mod/directory.php:207
+#: src/Content/Widget.php:68
+msgid "Global Directory"
+msgstr "Globale gids"
+
+#: view/theme/vier/theme.php:208 src/Content/Widget.php:70
+msgid "Local Directory"
+msgstr "Lokale gids"
+
+#: view/theme/vier/theme.php:251 include/text.php:909 src/Content/Nav.php:151
+#: src/Content/ForumManager.php:125
+msgid "Forums"
+msgstr "Forums"
+
+#: view/theme/vier/theme.php:253 src/Content/ForumManager.php:127
+msgid "External link to forum"
+msgstr "Externe link naar het forum"
+
+#: view/theme/vier/theme.php:256 include/items.php:489 src/Object/Post.php:429
+#: src/App.php:786 src/Content/Widget.php:310 src/Content/ForumManager.php:130
+msgid "show more"
+msgstr "toon meer"
+
+#: view/theme/vier/theme.php:289
+msgid "Quick Start"
+msgstr "Snelstart"
+
+#: view/theme/vier/theme.php:295 mod/help.php:56 src/Content/Nav.php:134
+msgid "Help"
+msgstr "Help"
+
+#: view/theme/frio/config.php:102
+msgid "Custom"
+msgstr "Aangepast"
+
+#: view/theme/frio/config.php:114
+msgid "Note"
+msgstr "Nota"
+
+#: view/theme/frio/config.php:114
+msgid "Check image permissions if all users are allowed to see the image"
+msgstr "Controleer of alle gebruikers permissie hebben om het beeld te zien "
+
+#: view/theme/frio/config.php:121
+msgid "Select color scheme"
+msgstr "Selecteer kleurschema"
+
+#: view/theme/frio/config.php:122
+msgid "Navigation bar background color"
+msgstr "Navigatie balk achtergrondkleur"
+
+#: view/theme/frio/config.php:123
+msgid "Navigation bar icon color "
+msgstr "Navigatie balk icoon kleur"
+
+#: view/theme/frio/config.php:124
+msgid "Link color"
+msgstr "Link kleur"
+
+#: view/theme/frio/config.php:125
+msgid "Set the background color"
+msgstr "Stel de achtergrondkleur in"
+
+#: view/theme/frio/config.php:126
+msgid "Content background opacity"
+msgstr "Content achtergrond opaciteit"
+
+#: view/theme/frio/config.php:127
+msgid "Set the background image"
+msgstr "Stel het achtergrondbeeld in"
+
+#: view/theme/frio/config.php:128
+msgid "Background image style"
+msgstr "Achtergrond beeld stijl"
+
+#: view/theme/frio/config.php:133
+msgid "Login page background image"
+msgstr "Achtergrondafbeelding aanmeldpagina"
+
+#: view/theme/frio/config.php:137
+msgid "Login page background color"
+msgstr "Achtergrondkleur aanmeldpagina"
+
+#: view/theme/frio/config.php:137
+msgid "Leave background image and color empty for theme defaults"
+msgstr "Laat de achtergrondafbeelding en kleur leeg om de standaard van het thema te gebruiken"
+
+#: view/theme/frio/theme.php:248
+msgid "Guest"
+msgstr "Gast"
+
+#: view/theme/frio/theme.php:253
+msgid "Visitor"
+msgstr "Bezoeker"
+
+#: view/theme/frio/theme.php:266 src/Module/Login.php:309
+#: src/Content/Nav.php:97
+msgid "Logout"
+msgstr "Uitloggen"
+
+#: view/theme/frio/theme.php:266 src/Content/Nav.php:97
+msgid "End this session"
+msgstr "Deze sessie beëindigen"
+
+#: view/theme/frio/theme.php:269 mod/contacts.php:689 mod/contacts.php:877
+#: src/Model/Profile.php:875 src/Content/Nav.php:100
+msgid "Status"
+msgstr "Tijdlijn"
+
+#: view/theme/frio/theme.php:269 src/Content/Nav.php:100
+#: src/Content/Nav.php:186
+msgid "Your posts and conversations"
+msgstr "Jouw berichten en gesprekken"
+
+#: view/theme/frio/theme.php:270 mod/newmember.php:24 mod/profperm.php:116
+#: mod/contacts.php:691 mod/contacts.php:893 src/Model/Profile.php:717
+#: src/Model/Profile.php:850 src/Model/Profile.php:883 src/Content/Nav.php:101
+msgid "Profile"
+msgstr "Profiel"
+
+#: view/theme/frio/theme.php:270 src/Content/Nav.php:101
+msgid "Your profile page"
+msgstr "Jouw profiel pagina"
+
+#: view/theme/frio/theme.php:271 mod/fbrowser.php:35 src/Model/Profile.php:891
+#: src/Content/Nav.php:102
+msgid "Photos"
+msgstr "Foto's"
+
+#: view/theme/frio/theme.php:271 src/Content/Nav.php:102
+msgid "Your photos"
+msgstr "Jouw foto's"
+
+#: view/theme/frio/theme.php:272 src/Model/Profile.php:899
+#: src/Model/Profile.php:902 src/Content/Nav.php:103
+msgid "Videos"
+msgstr "Video's"
+
+#: view/theme/frio/theme.php:272 src/Content/Nav.php:103
+msgid "Your videos"
+msgstr "Je video's"
+
+#: view/theme/frio/theme.php:273 view/theme/frio/theme.php:277 mod/cal.php:276
+#: mod/events.php:390 src/Model/Profile.php:911 src/Model/Profile.php:922
+#: src/Content/Nav.php:104 src/Content/Nav.php:170
+msgid "Events"
+msgstr "Gebeurtenissen"
+
+#: view/theme/frio/theme.php:273 src/Content/Nav.php:104
+msgid "Your events"
+msgstr "Jouw gebeurtenissen"
+
+#: view/theme/frio/theme.php:276 mod/admin.php:771
+#: src/Core/NotificationsManager.php:179 src/Content/Nav.php:183
+msgid "Network"
+msgstr "Netwerk"
+
+#: view/theme/frio/theme.php:276 src/Content/Nav.php:183
+msgid "Conversations from your friends"
+msgstr "Gesprekken van je vrienden"
+
+#: view/theme/frio/theme.php:277 src/Model/Profile.php:914
+#: src/Model/Profile.php:925 src/Content/Nav.php:170
+msgid "Events and Calendar"
+msgstr "Gebeurtenissen en kalender"
+
+#: view/theme/frio/theme.php:278 mod/message.php:127 src/Content/Nav.php:196
+msgid "Messages"
+msgstr "Privéberichten"
+
+#: view/theme/frio/theme.php:278 src/Content/Nav.php:196
+msgid "Private mail"
+msgstr "Privéberichten"
+
+#: view/theme/frio/theme.php:279 mod/settings.php:131 mod/newmember.php:19
+#: mod/admin.php:2015 mod/admin.php:2285 src/Content/Nav.php:207
+msgid "Settings"
+msgstr "Instellingen"
+
+#: view/theme/frio/theme.php:279 src/Content/Nav.php:207
+msgid "Account settings"
+msgstr "Account instellingen"
+
+#: view/theme/frio/theme.php:280 include/text.php:906 mod/viewcontacts.php:125
+#: mod/contacts.php:836 mod/contacts.php:905 src/Model/Profile.php:954
+#: src/Model/Profile.php:957 src/Content/Nav.php:147 src/Content/Nav.php:213
+msgid "Contacts"
+msgstr "Contacten"
+
+#: view/theme/frio/theme.php:280 src/Content/Nav.php:213
+msgid "Manage/edit friends and contacts"
+msgstr "Beheer/Wijzig vrienden en contacten"
+
+#: view/theme/frio/theme.php:367 include/conversation.php:866
+msgid "Follow Thread"
+msgstr "Gesprek volgen"
+
+#: view/theme/frio/php/Image.php:24
+msgid "Top Banner"
+msgstr "Banner Bovenaan"
+
+#: view/theme/frio/php/Image.php:24
+msgid ""
+"Resize image to the width of the screen and show background color below on "
+"long pages."
+msgstr "Pas het beeld aan aan de breedte van het scherm en toon achtergrondkleur onder lange pagina's"
+
+#: view/theme/frio/php/Image.php:25
+msgid "Full screen"
+msgstr "Volledig scherm"
+
+#: view/theme/frio/php/Image.php:25
+msgid ""
+"Resize image to fill entire screen, clipping either the right or the bottom."
+msgstr "Pas het beeld aan om het hele scherm te vullen, met ofwel de rechter- of de onderkant afgeknipt."
+
+#: view/theme/frio/php/Image.php:26
+msgid "Single row mosaic"
+msgstr "Enkele rij mozaïek"
+
+#: view/theme/frio/php/Image.php:26
+msgid ""
+"Resize image to repeat it on a single row, either vertical or horizontal."
+msgstr "Pas het beeld aan zodat het herhaald wordt op een enkele rij, ofwel vertikaal ofwel horizontaal"
+
+#: view/theme/frio/php/Image.php:27
+msgid "Mosaic"
+msgstr "Mozaïek"
+
+#: view/theme/frio/php/Image.php:27
+msgid "Repeat image to fill the screen."
+msgstr "Herhaal beeld om het scherm te vullen."
+
+#: update.php:194
+#, php-format
+msgid "%s: Updating author-id and owner-id in item and thread table. "
+msgstr "%s: author-id en owner-id in item en gesprekstabel aan het updaten."
+
+#: update.php:240
+#, php-format
+msgid "%s: Updating post-type."
+msgstr "%s: bericht-type bewerken"
+
+#: include/items.php:355 mod/display.php:70 mod/display.php:245
+#: mod/display.php:341 mod/admin.php:283 mod/admin.php:1963 mod/admin.php:2211
+#: mod/notice.php:22 mod/viewsrc.php:22
+msgid "Item not found."
+msgstr "Item niet gevonden."
+
+#: include/items.php:393
+msgid "Do you really want to delete this item?"
+msgstr "Wil je echt dit item verwijderen?"
+
+#: include/items.php:395 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/register.php:237
+#: mod/message.php:154 mod/suggest.php:40 mod/dfrn_request.php:645
+#: mod/api.php:110 mod/contacts.php:465 mod/follow.php:150
+#: mod/profiles.php:541 mod/profiles.php:544 mod/profiles.php:566
+msgid "Yes"
+msgstr "Ja"
+
+#: include/items.php:398 include/conversation.php:1179 mod/videos.php:146
+#: mod/settings.php:676 mod/settings.php:702 mod/unfollow.php:120
+#: mod/message.php:157 mod/tagrm.php:19 mod/tagrm.php:91 mod/suggest.php:43
+#: mod/dfrn_request.php:655 mod/editpost.php:140 mod/contacts.php:468
+#: mod/follow.php:161 mod/fbrowser.php:104 mod/fbrowser.php:135
+#: mod/photos.php:255 mod/photos.php:327
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: include/items.php:483 src/Content/Feature.php:96
+msgid "Archives"
+msgstr "Archieven"
+
+#: include/conversation.php:151 include/conversation.php:287
+#: include/text.php:1611
+msgid "event"
+msgstr "gebeurtenis"
+
+#: include/conversation.php:154 include/conversation.php:164
+#: include/conversation.php:290 include/conversation.php:299 mod/tagger.php:70
+#: mod/subthread.php:87
+msgid "status"
+msgstr "status"
+
+#: include/conversation.php:159 include/conversation.php:295
+#: include/text.php:1613 mod/tagger.php:70 mod/subthread.php:87
+msgid "photo"
+msgstr "foto"
+
+#: include/conversation.php:171
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "%1$s vindt het %3$s van %2$s leuk"
+
+#: include/conversation.php:173
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "%1$s vindt het %3$s van %2$s niet leuk"
+
+#: include/conversation.php:175
+#, php-format
+msgid "%1$s attends %2$s's %3$s"
+msgstr "%1$s neemt deel aan %2$ss %3$s deel"
+
+#: include/conversation.php:177
+#, php-format
+msgid "%1$s doesn't attend %2$s's %3$s"
+msgstr "%1$s neemt niet deel aan %2$ss %3$s"
+
+#: include/conversation.php:179
+#, php-format
+msgid "%1$s attends maybe %2$s's %3$s"
+msgstr "%1$s neemt misschien deel aan %2$ss %3$s"
+
+#: include/conversation.php:214
+#, php-format
+msgid "%1$s is now friends with %2$s"
+msgstr "%1$s is nu bevriend met %2$s"
+
+#: include/conversation.php:255
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr "%1$s porde %2$s aan"
+
+#: include/conversation.php:309 mod/tagger.php:108
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s labelde %3$s van %2$s met %4$s"
+
+#: include/conversation.php:331
+msgid "post/item"
+msgstr "bericht/item"
+
+#: include/conversation.php:332
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
+msgstr "%1$s markeerde %2$s's %3$s als favoriet"
+
+#: include/conversation.php:545 mod/profiles.php:352 mod/photos.php:1507
+msgid "Likes"
+msgstr "Houdt van"
+
+#: include/conversation.php:545 mod/profiles.php:356 mod/photos.php:1507
+msgid "Dislikes"
+msgstr "Houdt niet van"
+
+#: include/conversation.php:546 include/conversation.php:1492
+#: mod/photos.php:1508
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] "Neemt deel"
+msgstr[1] "Nemen deel"
+
+#: include/conversation.php:546 mod/photos.php:1508
+msgid "Not attending"
+msgstr "Nemen niet deel"
+
+#: include/conversation.php:546 mod/photos.php:1508
+msgid "Might attend"
+msgstr "Nemen misschien deel"
+
+#: include/conversation.php:626 mod/photos.php:1564 src/Object/Post.php:195
+msgid "Select"
+msgstr "Kies"
+
+#: include/conversation.php:627 mod/settings.php:736 mod/admin.php:1906
+#: mod/contacts.php:852 mod/contacts.php:1130 mod/photos.php:1565
+msgid "Delete"
+msgstr "Verwijder"
+
+#: include/conversation.php:661 src/Object/Post.php:362
+#: src/Object/Post.php:363
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Bekijk het profiel van %s @ %s"
+
+#: include/conversation.php:673 src/Object/Post.php:350
+msgid "Categories:"
+msgstr "Categorieën:"
+
+#: include/conversation.php:674 src/Object/Post.php:351
+msgid "Filed under:"
+msgstr "Bewaard onder:"
+
+#: include/conversation.php:681 src/Object/Post.php:376
+#, php-format
+msgid "%s from %s"
+msgstr "%s van %s"
+
+#: include/conversation.php:696
+msgid "View in context"
+msgstr "In context bekijken"
+
+#: include/conversation.php:698 include/conversation.php:1160
+#: mod/wallmessage.php:145 mod/message.php:263 mod/message.php:431
+#: mod/editpost.php:115 mod/photos.php:1480 src/Object/Post.php:401
+msgid "Please wait"
+msgstr "Even geduld"
+
+#: include/conversation.php:762
+msgid "remove"
+msgstr "verwijder"
+
+#: include/conversation.php:766
+msgid "Delete Selected Items"
+msgstr "Geselecteerde items verwijderen"
+
+#: include/conversation.php:867 src/Model/Contact.php:937
+msgid "View Status"
+msgstr "Bekijk status"
+
+#: include/conversation.php:868 include/conversation.php:884
+#: mod/dirfind.php:230 mod/directory.php:164 mod/match.php:89
+#: mod/suggest.php:85 mod/allfriends.php:75 src/Model/Contact.php:877
+#: src/Model/Contact.php:930 src/Model/Contact.php:938
+msgid "View Profile"
+msgstr "Bekijk profiel"
+
+#: include/conversation.php:869 src/Model/Contact.php:939
+msgid "View Photos"
+msgstr "Bekijk foto's"
+
+#: include/conversation.php:870 src/Model/Contact.php:931
+#: src/Model/Contact.php:940
+msgid "Network Posts"
+msgstr "Netwerkberichten"
+
+#: include/conversation.php:871 src/Model/Contact.php:932
+#: src/Model/Contact.php:941
+msgid "View Contact"
+msgstr "Bekijk contact"
+
+#: include/conversation.php:872 src/Model/Contact.php:943
+msgid "Send PM"
+msgstr "Stuur een privébericht"
+
+#: include/conversation.php:876 src/Model/Contact.php:944
+msgid "Poke"
+msgstr "Porren"
+
+#: include/conversation.php:999
+#, php-format
+msgid "%s likes this."
+msgstr "%s vindt dit leuk."
+
+#: include/conversation.php:1002
+#, php-format
+msgid "%s doesn't like this."
+msgstr "%s vindt dit niet leuk."
+
+#: include/conversation.php:1005
+#, php-format
+msgid "%s attends."
+msgstr "%s neemt deel"
+
+#: include/conversation.php:1008
+#, php-format
+msgid "%s doesn't attend."
+msgstr "%s neemt niet deel"
+
+#: include/conversation.php:1011
+#, php-format
+msgid "%s attends maybe."
+msgstr "%s neemt misschien deel"
+
+#: include/conversation.php:1022
+msgid "and"
+msgstr "en"
+
+#: include/conversation.php:1028
+#, php-format
+msgid "and %d other people"
+msgstr "en %d anderen"
+
+#: include/conversation.php:1037
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this"
+msgstr "<span  %1$s>%2$d mensen</span> vinden dit leuk"
+
+#: include/conversation.php:1038
+#, php-format
+msgid "%s like this."
+msgstr "%s vinden dit leuk."
+
+#: include/conversation.php:1041
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this"
+msgstr "<span  %1$s>%2$d people</span> vinden dit niet leuk"
+
+#: include/conversation.php:1042
+#, php-format
+msgid "%s don't like this."
+msgstr "%s vinden dit niet leuk."
+
+#: include/conversation.php:1045
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend"
+msgstr "<span %1$s>%2$d mensen</span> nemen deel"
+
+#: include/conversation.php:1046
+#, php-format
+msgid "%s attend."
+msgstr "%s nemen deel."
+
+#: include/conversation.php:1049
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't attend"
+msgstr "<span %1$s>%2$d mensen</span> nemen niet deel"
+
+#: include/conversation.php:1050
+#, php-format
+msgid "%s don't attend."
+msgstr "%s nemen niet deel."
+
+#: include/conversation.php:1053
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend maybe"
+msgstr "<span %1$s>%2$d mensen</span> nemen misschien deel"
+
+#: include/conversation.php:1054
+#, php-format
+msgid "%s attend maybe."
+msgstr "%s neemt misschien deel."
+
+#: include/conversation.php:1084 include/conversation.php:1100
+msgid "Visible to <strong>everybody</strong>"
+msgstr "Zichtbaar voor <strong>iedereen</strong>"
+
+#: include/conversation.php:1085 include/conversation.php:1101
+#: mod/wallmessage.php:120 mod/wallmessage.php:127 mod/message.php:199
+#: mod/message.php:206 mod/message.php:344 mod/message.php:351
+msgid "Please enter a link URL:"
+msgstr "Vul een internetadres/URL in:"
+
+#: include/conversation.php:1086 include/conversation.php:1102
+msgid "Please enter a video link/URL:"
+msgstr "Vul een videolink/URL in:"
+
+#: include/conversation.php:1087 include/conversation.php:1103
+msgid "Please enter an audio link/URL:"
+msgstr "Vul een audiolink/URL in:"
+
+#: include/conversation.php:1088 include/conversation.php:1104
+msgid "Tag term:"
+msgstr "Label:"
+
+#: include/conversation.php:1089 include/conversation.php:1105
+#: mod/filer.php:34
+msgid "Save to Folder:"
+msgstr "Bewaren in map:"
+
+#: include/conversation.php:1090 include/conversation.php:1106
+msgid "Where are you right now?"
+msgstr "Waar ben je nu?"
+
+#: include/conversation.php:1091
+msgid "Delete item(s)?"
+msgstr "Item(s) verwijderen?"
+
+#: include/conversation.php:1138
+msgid "New Post"
+msgstr "Nieuw bericht"
+
+#: include/conversation.php:1141
+msgid "Share"
+msgstr "Delen"
+
+#: include/conversation.php:1142 mod/wallmessage.php:143 mod/message.php:261
+#: mod/message.php:428 mod/editpost.php:101
+msgid "Upload photo"
+msgstr "Foto uploaden"
+
+#: include/conversation.php:1143 mod/editpost.php:102
+msgid "upload photo"
+msgstr "Foto uploaden"
+
+#: include/conversation.php:1144 mod/editpost.php:103
+msgid "Attach file"
+msgstr "Bestand bijvoegen"
+
+#: include/conversation.php:1145 mod/editpost.php:104
+msgid "attach file"
+msgstr "bestand bijvoegen"
+
+#: include/conversation.php:1146 mod/wallmessage.php:144 mod/message.php:262
+#: mod/message.php:429 mod/editpost.php:105
+msgid "Insert web link"
+msgstr "Voeg een webadres in"
+
+#: include/conversation.php:1147 mod/editpost.php:106
+msgid "web link"
+msgstr "webadres"
+
+#: include/conversation.php:1148 mod/editpost.php:107
+msgid "Insert video link"
+msgstr "Voeg video toe"
+
+#: include/conversation.php:1149 mod/editpost.php:108
+msgid "video link"
+msgstr "video adres"
+
+#: include/conversation.php:1150 mod/editpost.php:109
+msgid "Insert audio link"
+msgstr "Voeg audio adres toe"
+
+#: include/conversation.php:1151 mod/editpost.php:110
+msgid "audio link"
+msgstr "audio adres"
+
+#: include/conversation.php:1152 mod/editpost.php:111
+msgid "Set your location"
+msgstr "Stel je locatie in"
+
+#: include/conversation.php:1153 mod/editpost.php:112
+msgid "set location"
+msgstr "Stel uw locatie in"
+
+#: include/conversation.php:1154 mod/editpost.php:113
+msgid "Clear browser location"
+msgstr "Verwijder locatie uit uw webbrowser"
+
+#: include/conversation.php:1155 mod/editpost.php:114
+msgid "clear location"
+msgstr "Verwijder locatie uit uw webbrowser"
+
+#: include/conversation.php:1157 mod/editpost.php:129
+msgid "Set title"
+msgstr "Titel plaatsen"
+
+#: include/conversation.php:1159 mod/editpost.php:131
+msgid "Categories (comma-separated list)"
+msgstr "Categorieën (komma-gescheiden lijst)"
+
+#: include/conversation.php:1161 mod/editpost.php:116
+msgid "Permission settings"
+msgstr "Instellingen van rechten"
+
+#: include/conversation.php:1162 mod/editpost.php:146
+msgid "permissions"
+msgstr "rechten"
+
+#: include/conversation.php:1171 mod/editpost.php:126
+msgid "Public post"
+msgstr "Openbare post"
+
+#: include/conversation.php:1175 mod/editpost.php:137 mod/events.php:531
+#: mod/photos.php:1498 mod/photos.php:1537 mod/photos.php:1597
+#: src/Object/Post.php:804
+msgid "Preview"
+msgstr "Voorvertoning"
+
+#: include/conversation.php:1184
+msgid "Post to Groups"
+msgstr "Verzenden naar Groepen"
+
+#: include/conversation.php:1185
+msgid "Post to Contacts"
+msgstr "Verzenden naar Contacten"
+
+#: include/conversation.php:1186
+msgid "Private post"
+msgstr "Privé verzending"
+
+#: include/conversation.php:1191 mod/editpost.php:144
+#: src/Model/Profile.php:344
+msgid "Message"
+msgstr "Bericht"
+
+#: include/conversation.php:1192 mod/editpost.php:145
+msgid "Browser"
+msgstr "Browser"
+
+#: include/conversation.php:1463
+msgid "View all"
+msgstr "Toon alles"
+
+#: include/conversation.php:1486
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "Houdt van"
+msgstr[1] "Houdt van"
+
+#: include/conversation.php:1489
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "Houdt niet van"
+msgstr[1] "Houdt niet van"
+
+#: include/conversation.php:1495
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] "Neemt niet deel"
+msgstr[1] "Nemen niet deel"
+
+#: include/conversation.php:1498 src/Content/ContactSelector.php:122
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] "Onbeslist"
+msgstr[1] "Onbeslist"
+
+#: include/security.php:83
+msgid "Welcome "
+msgstr "Welkom"
+
+#: include/security.php:84
+msgid "Please upload a profile photo."
+msgstr "Upload een profielfoto."
+
+#: include/security.php:86
+msgid "Welcome back "
+msgstr "Welkom terug "
+
+#: include/security.php:424
+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 "De beveiligingstoken van het formulier was foutief. Dit gebeurde waarschijnlijk omdat het formulier te lang (> 3 uur)  is blijven open staan voor het werd verstuurd."
+
+#: include/enotify.php:52
+msgid "Friendica Notification"
+msgstr "Friendica Notificatie"
+
+#: include/enotify.php:55
+msgid "Thank You,"
+msgstr "Bedankt"
+
+#: include/enotify.php:58
+#, php-format
+msgid "%1$s, %2$s Administrator"
+msgstr "%1$s, %2$s Beheerder"
+
+#: include/enotify.php:60
+#, php-format
+msgid "%s Administrator"
+msgstr "%s Beheerder"
+
+#: include/enotify.php:123
+#, php-format
+msgid "[Friendica:Notify] New mail received at %s"
+msgstr "[Friendica:Notificatie] Nieuw bericht ontvangen op %s"
+
+#: include/enotify.php:125
+#, php-format
+msgid "%1$s sent you a new private message at %2$s."
+msgstr "%1$s sent you a new private message at %2$s."
+
+#: include/enotify.php:126
+msgid "a private message"
+msgstr "een prive bericht"
+
+#: include/enotify.php:126
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s stuurde jou %2$s."
+
+#: include/enotify.php:128
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Bezoek %s om je privé-berichten te bekijken en/of te beantwoorden."
+
+#: include/enotify.php:161
+#, php-format
+msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
+msgstr "%1$s gaf een reactie op [url=%2$s]a %3$s[/url]"
+
+#: include/enotify.php:169
+#, php-format
+msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
+msgstr "%1$s gaf een reactie op [url=%2$s]%3$s's %4$s[/url]"
+
+#: include/enotify.php:179
+#, php-format
+msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
+msgstr "%1$s gaf een reactie op [url=%2$s]jouw %3$s[/url]"
+
+#: include/enotify.php:191
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Friendica:Notificatie] Reactie op gesprek #%1$d door %2$s"
+
+#: include/enotify.php:193
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
+msgstr "%s gaf een reactie op een bericht/gesprek die jij volgt."
+
+#: include/enotify.php:196 include/enotify.php:211 include/enotify.php:226
+#: include/enotify.php:241 include/enotify.php:260 include/enotify.php:276
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Bezoek %s om het gesprek te bekijken en/of te beantwoorden."
+
+#: include/enotify.php:203
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
+msgstr "[Friendica:Melding] %s plaatste een bericht op je tijdlijn"
+
+#: include/enotify.php:205
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
+msgstr "%1$splaatste een bericht op je tijdlijn op %2$s"
+
+#: include/enotify.php:206
+#, php-format
+msgid "%1$s posted to [url=%2$s]your wall[/url]"
+msgstr "%1$s schreef op [url=%2$s]jouw tijdlijn[/url]"
+
+#: include/enotify.php:218
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
+msgstr "[Friendica:Notificatie] %s heeft jou genoemd"
+
+#: include/enotify.php:220
+#, php-format
+msgid "%1$s tagged you at %2$s"
+msgstr "%1$s heeft jou in %2$s genoemd"
+
+#: include/enotify.php:221
+#, php-format
+msgid "%1$s [url=%2$s]tagged you[/url]."
+msgstr "%1$s [url=%2$s]heeft jou genoemd[/url]."
+
+#: include/enotify.php:233
+#, php-format
+msgid "[Friendica:Notify] %s shared a new post"
+msgstr "[Friendica:Melding] %s deelde een nieuw bericht"
+
+#: include/enotify.php:235
+#, php-format
+msgid "%1$s shared a new post at %2$s"
+msgstr "%1$s deelde een nieuw bericht op %2$s"
+
+#: include/enotify.php:236
+#, php-format
+msgid "%1$s [url=%2$s]shared a post[/url]."
+msgstr "%1$s [url=%2$s]deelde een bericht[/url]."
+
+#: include/enotify.php:248
+#, php-format
+msgid "[Friendica:Notify] %1$s poked you"
+msgstr "[Friendica:Melding] %1$s heeft jou gepord"
+
+#: include/enotify.php:250
+#, php-format
+msgid "%1$s poked you at %2$s"
+msgstr "%1$s heeft jou gepord op %2$s"
+
+#: include/enotify.php:251
+#, php-format
+msgid "%1$s [url=%2$s]poked you[/url]."
+msgstr "%1$s [url=%2$s]porde jou[/url]"
+
+#: include/enotify.php:268
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
+msgstr "[Friendica:Notificatie] %s heeft jouw bericht gelabeld"
+
+#: include/enotify.php:270
+#, php-format
+msgid "%1$s tagged your post at %2$s"
+msgstr "%1$s heeft jouw bericht gelabeld in %2$s"
+
+#: include/enotify.php:271
+#, php-format
+msgid "%1$s tagged [url=%2$s]your post[/url]"
+msgstr "%1$s labelde [url=%2$s]jouw bericht[/url]"
+
+#: include/enotify.php:283
+msgid "[Friendica:Notify] Introduction received"
+msgstr "[Friendica:Notificatie] Vriendschaps-/connectieverzoek ontvangen"
+
+#: include/enotify.php:285
+#, php-format
+msgid "You've received an introduction from '%1$s' at %2$s"
+msgstr "Je hebt een vriendschaps- of connectieverzoek ontvangen van '%1$s' om %2$s"
+
+#: include/enotify.php:286
+#, php-format
+msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+msgstr "Je ontving [url=%1$s]een vriendschaps- of connectieverzoek[/url] van %2$s."
+
+#: include/enotify.php:291 include/enotify.php:337
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Je kunt hun profiel bezoeken op %s"
+
+#: include/enotify.php:293
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr "Bezoek %s om het verzoek goed of af te keuren."
+
+#: include/enotify.php:300
+msgid "[Friendica:Notify] A new person is sharing with you"
+msgstr "[Friendica:Melding]  Iemand nieuw deelt met jou."
+
+#: include/enotify.php:302 include/enotify.php:303
+#, php-format
+msgid "%1$s is sharing with you at %2$s"
+msgstr "%1$s deelt met jou in %2$s"
+
+#: include/enotify.php:310
+msgid "[Friendica:Notify] You have a new follower"
+msgstr "[Friendica:Melding] Je hebt een nieuwe volger"
+
+#: include/enotify.php:312 include/enotify.php:313
+#, php-format
+msgid "You have a new follower at %2$s : %1$s"
+msgstr "Je hebt een nieuwe volger op %2$s: %1$s"
+
+#: include/enotify.php:326
+msgid "[Friendica:Notify] Friend suggestion received"
+msgstr "[Friendica:Melding] Vriendschapsvoorstel ontvangen"
+
+#: include/enotify.php:328
+#, php-format
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
+msgstr "Je kreeg een vriendschapssuggestie van '%1$s' op %2$s"
+
+#: include/enotify.php:329
+#, php-format
+msgid ""
+"You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
+msgstr "Je kreeg een [url=%1$s]vriendschapssuggestie[/url] voor %2$s op %3$s."
+
+#: include/enotify.php:335
+msgid "Name:"
+msgstr "Naam:"
+
+#: include/enotify.php:336
+msgid "Photo:"
+msgstr "Foto: "
+
+#: include/enotify.php:339
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Bezoek %s om de suggestie goed of af te keuren."
+
+#: include/enotify.php:347 include/enotify.php:362
+msgid "[Friendica:Notify] Connection accepted"
+msgstr "[Friendica:Melding] Verbinding aanvaard"
+
+#: include/enotify.php:349 include/enotify.php:364
+#, php-format
+msgid "'%1$s' has accepted your connection request at %2$s"
+msgstr "'%1$s' aanvaarde je contactaanvraag op %2$s"
+
+#: include/enotify.php:350 include/enotify.php:365
+#, php-format
+msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
+msgstr "%2$saanvaardde jouw [url=%1$s]contactaanvraag[/url]."
+
+#: include/enotify.php:355
+msgid ""
+"You are now mutual friends and may exchange status updates, photos, and "
+"email without restriction."
+msgstr "Jullie zijn nu in contact met elkaar en kunnen statusberichten, foto's en email delen zonder beperkingen."
+
+#: include/enotify.php:357
+#, php-format
+msgid "Please visit %s if you wish to make any changes to this relationship."
+msgstr "Bezoek alstublieft %s als je deze relatie wil wijzigen."
+
+#: include/enotify.php:370
+#, php-format
+msgid ""
+"'%1$s' has chosen to accept you a fan, which restricts some forms of "
+"communication - such as private messaging and some profile interactions. If "
+"this is a celebrity or community page, these settings were applied "
+"automatically."
+msgstr "'%1$s' koos om je te accepteren als fan, wat sommige communicatievormen beperkt - zoals privéberichten en sommige profielfuncties.  Als dit een beroemdheid- of groepspagina is, werd dit automatisch toegepast."
+
+#: include/enotify.php:372
+#, php-format
+msgid ""
+"'%1$s' may choose to extend this into a two-way or more permissive "
+"relationship in the future."
+msgstr "'%1$s' kan er later voor kiezen om deze beperkingen aan te passen."
+
+#: include/enotify.php:374
+#, php-format
+msgid "Please visit %s  if you wish to make any changes to this relationship."
+msgstr "Bezoek %s wanneer je deze relatie wil wijzigen."
+
+#: include/enotify.php:384 mod/removeme.php:47
+msgid "[Friendica System Notify]"
+msgstr "[Friendica systeem notificatie]"
+
+#: include/enotify.php:384
+msgid "registration request"
+msgstr "registratie verzoek"
+
+#: include/enotify.php:386
+#, php-format
+msgid "You've received a registration request from '%1$s' at %2$s"
+msgstr "Je kreeg een registratieaanvraag van '%1$s' op %2$s"
+
+#: include/enotify.php:387
+#, php-format
+msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
+msgstr "Je kreeg een [url=%1$s]registratieaanvraag[/url] van %2$s."
+
+#: include/enotify.php:392
+#, php-format
+msgid ""
+"Full Name:\t%s\n"
+"Site Location:\t%s\n"
+"Login Name:\t%s (%s)"
+msgstr "Volledige naam:\t%s\nAdres van de site:\t%s\nLoginnaam:\t%s (%s)"
+
+#: include/enotify.php:398
+#, php-format
+msgid "Please visit %s to approve or reject the request."
+msgstr "Bezoek %s om de aanvraag goed of af te keuren."
+
+#: include/text.php:302
+msgid "newer"
+msgstr "nieuwere berichten"
+
+#: include/text.php:303
+msgid "older"
+msgstr "oudere berichten"
+
+#: include/text.php:308
+msgid "first"
+msgstr "eerste"
+
+#: include/text.php:309
+msgid "prev"
+msgstr "vorige"
+
+#: include/text.php:343
+msgid "next"
+msgstr "volgende"
+
+#: include/text.php:344
+msgid "last"
+msgstr "laatste"
+
+#: include/text.php:398
+msgid "Loading more entries..."
+msgstr "Meer berichten aan het laden..."
+
+#: include/text.php:399
+msgid "The end"
+msgstr "Het einde"
+
+#: include/text.php:767
+msgid "No contacts"
+msgstr "Geen contacten"
+
+#: include/text.php:791
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] "%d contact"
+msgstr[1] "%d contacten"
+
+#: include/text.php:804
+msgid "View Contacts"
+msgstr "Bekijk contacten"
+
+#: include/text.php:889 mod/filer.php:35 mod/editpost.php:100 mod/notes.php:54
+msgid "Save"
+msgstr "Bewaren"
+
+#: include/text.php:889
+msgid "Follow"
+msgstr "Volg"
+
+#: include/text.php:895 mod/search.php:162 src/Content/Nav.php:142
+msgid "Search"
+msgstr "Zoeken"
+
+#: include/text.php:898 src/Content/Nav.php:58
+msgid "@name, !forum, #tags, content"
+msgstr "@naam, !forum, #labels, inhoud"
+
+#: include/text.php:904 src/Content/Nav.php:145
+msgid "Full Text"
+msgstr "Volledige tekst"
+
+#: include/text.php:905 src/Content/Nav.php:146
+#: src/Content/Widget/TagCloud.php:53
+msgid "Tags"
+msgstr "Labels"
+
+#: include/text.php:953
+msgid "poke"
+msgstr "por"
+
+#: include/text.php:953
+msgid "poked"
+msgstr "porde"
+
+#: include/text.php:954
+msgid "ping"
+msgstr "ping"
+
+#: include/text.php:954
+msgid "pinged"
+msgstr "gepingd"
+
+#: include/text.php:955
+msgid "prod"
+msgstr "porren"
+
+#: include/text.php:955
+msgid "prodded"
+msgstr "gepord"
+
+#: include/text.php:956
+msgid "slap"
+msgstr "slaan"
+
+#: include/text.php:956
+msgid "slapped"
+msgstr "geslagen"
+
+#: include/text.php:957
+msgid "finger"
+msgstr "finger"
+
+#: include/text.php:957
+msgid "fingered"
+msgstr "gerfingerd"
+
+#: include/text.php:958
+msgid "rebuff"
+msgstr "afpoeieren"
+
+#: include/text.php:958
+msgid "rebuffed"
+msgstr "afgepoeierd"
+
+#: include/text.php:972 mod/settings.php:941 src/Model/Event.php:388
+msgid "Monday"
+msgstr "Maandag"
+
+#: include/text.php:972 src/Model/Event.php:389
+msgid "Tuesday"
+msgstr "Dinsdag"
+
+#: include/text.php:972 src/Model/Event.php:390
+msgid "Wednesday"
+msgstr "Woensdag"
+
+#: include/text.php:972 src/Model/Event.php:391
+msgid "Thursday"
+msgstr "Donderdag"
+
+#: include/text.php:972 src/Model/Event.php:392
+msgid "Friday"
+msgstr "Vrijdag"
+
+#: include/text.php:972 src/Model/Event.php:393
+msgid "Saturday"
+msgstr "Zaterdag"
+
+#: include/text.php:972 mod/settings.php:941 src/Model/Event.php:387
+msgid "Sunday"
+msgstr "Zondag"
+
+#: include/text.php:976 src/Model/Event.php:408
+msgid "January"
+msgstr "Januari"
+
+#: include/text.php:976 src/Model/Event.php:409
+msgid "February"
+msgstr "Februari"
+
+#: include/text.php:976 src/Model/Event.php:410
+msgid "March"
+msgstr "Maart"
+
+#: include/text.php:976 src/Model/Event.php:411
+msgid "April"
+msgstr "April"
+
+#: include/text.php:976 include/text.php:993 src/Model/Event.php:399
+#: src/Model/Event.php:412
+msgid "May"
+msgstr "Mei"
+
+#: include/text.php:976 src/Model/Event.php:413
+msgid "June"
+msgstr "Juni"
+
+#: include/text.php:976 src/Model/Event.php:414
+msgid "July"
+msgstr "Juli"
+
+#: include/text.php:976 src/Model/Event.php:415
+msgid "August"
+msgstr "Augustus"
+
+#: include/text.php:976 src/Model/Event.php:416
+msgid "September"
+msgstr "September"
+
+#: include/text.php:976 src/Model/Event.php:417
+msgid "October"
+msgstr "Oktober"
+
+#: include/text.php:976 src/Model/Event.php:418
+msgid "November"
+msgstr "November"
+
+#: include/text.php:976 src/Model/Event.php:419
+msgid "December"
+msgstr "December"
+
+#: include/text.php:990 src/Model/Event.php:380
+msgid "Mon"
+msgstr "Maa"
+
+#: include/text.php:990 src/Model/Event.php:381
+msgid "Tue"
+msgstr "Din"
+
+#: include/text.php:990 src/Model/Event.php:382
+msgid "Wed"
+msgstr "Woe"
+
+#: include/text.php:990 src/Model/Event.php:383
+msgid "Thu"
+msgstr "Don"
+
+#: include/text.php:990 src/Model/Event.php:384
+msgid "Fri"
+msgstr "Vrij"
+
+#: include/text.php:990 src/Model/Event.php:385
+msgid "Sat"
+msgstr "Zat"
+
+#: include/text.php:990 src/Model/Event.php:379
+msgid "Sun"
+msgstr "Zon"
+
+#: include/text.php:993 src/Model/Event.php:395
+msgid "Jan"
+msgstr "Jan"
+
+#: include/text.php:993 src/Model/Event.php:396
+msgid "Feb"
+msgstr "Feb"
+
+#: include/text.php:993 src/Model/Event.php:397
+msgid "Mar"
+msgstr "Maa"
+
+#: include/text.php:993 src/Model/Event.php:398
+msgid "Apr"
+msgstr "Apr"
+
+#: include/text.php:993 src/Model/Event.php:401
+msgid "Jul"
+msgstr "Jul"
+
+#: include/text.php:993 src/Model/Event.php:402
+msgid "Aug"
+msgstr "Aug"
+
+#: include/text.php:993
+msgid "Sep"
+msgstr "Sep"
+
+#: include/text.php:993 src/Model/Event.php:404
+msgid "Oct"
+msgstr "Okt"
+
+#: include/text.php:993 src/Model/Event.php:405
+msgid "Nov"
+msgstr "Nov"
+
+#: include/text.php:993 src/Model/Event.php:406
+msgid "Dec"
+msgstr "Dec"
+
+#: include/text.php:1139
+#, php-format
+msgid "Content warning: %s"
+msgstr "Waarschuwing inhoud: %s"
+
+#: include/text.php:1204 mod/videos.php:375
+msgid "View Video"
+msgstr "Bekijk Video"
+
+#: include/text.php:1221
+msgid "bytes"
+msgstr "bytes"
+
+#: include/text.php:1254 include/text.php:1265 include/text.php:1300
+msgid "Click to open/close"
+msgstr "klik om te openen/sluiten"
+
+#: include/text.php:1415
+msgid "View on separate page"
+msgstr "Bekijk op aparte pagina"
+
+#: include/text.php:1416
+msgid "view on separate page"
+msgstr "bekijk op aparte pagina"
+
+#: include/text.php:1421 include/text.php:1428 src/Model/Event.php:609
+msgid "link to source"
+msgstr "Verwijzing naar bron"
+
+#: include/text.php:1615
+msgid "activity"
+msgstr "activiteit"
+
+#: include/text.php:1617 src/Object/Post.php:428 src/Object/Post.php:440
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "reactie"
+msgstr[1] "reacties"
+
+#: include/text.php:1620
+msgid "post"
+msgstr "bericht"
+
+#: include/text.php:1775
+msgid "Item filed"
+msgstr "Item bewaard"
+
 #: include/api.php:1138
 #, php-format
 msgid "Daily posting limit of %d post reached. The post was rejected."
@@ -49,4514 +1576,485 @@ msgstr[1] "De wekelijkse limiet van %d berichten is bereikt.  Dit bericht werd n
 msgid "Monthly posting limit of %d post reached. The post was rejected."
 msgstr "De maandelijkse limiet van %d berichten is bereikt.  Dit bericht werd niet aanvaard."
 
-#: include/api.php:4232 mod/photos.php:89 mod/photos.php:198
-#: mod/photos.php:717 mod/photos.php:1145 mod/photos.php:1162
-#: mod/photos.php:1648 mod/profile_photo.php:84 mod/profile_photo.php:93
+#: include/api.php:4233 mod/profile_photo.php:84 mod/profile_photo.php:93
 #: mod/profile_photo.php:102 mod/profile_photo.php:211
-#: mod/profile_photo.php:300 mod/profile_photo.php:310 src/Model/User.php:592
-#: src/Model/User.php:600 src/Model/User.php:608
+#: mod/profile_photo.php:300 mod/profile_photo.php:310 mod/photos.php:90
+#: mod/photos.php:198 mod/photos.php:735 mod/photos.php:1169
+#: mod/photos.php:1186 mod/photos.php:1678 src/Model/User.php:595
+#: src/Model/User.php:603 src/Model/User.php:611
 msgid "Profile Photos"
 msgstr "Profielfoto's"
 
-#: include/conversation.php:150 include/conversation.php:286
-#: include/text.php:1630
-msgid "event"
-msgstr "gebeurtenis"
-
-#: include/conversation.php:153 include/conversation.php:163
-#: include/conversation.php:289 include/conversation.php:298
-#: mod/subthread.php:97 mod/tagger.php:70
-msgid "status"
-msgstr "status"
-
-#: include/conversation.php:158 include/conversation.php:294
-#: include/text.php:1632 mod/subthread.php:97 mod/tagger.php:70
-msgid "photo"
-msgstr "foto"
-
-#: include/conversation.php:170
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s vindt het %3$s van %2$s leuk"
-
-#: include/conversation.php:172
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "%1$s vindt het %3$s van %2$s niet leuk"
-
-#: include/conversation.php:174
-#, php-format
-msgid "%1$s attends %2$s's %3$s"
-msgstr "%1$s neemt deel aan %2$ss %3$s deel"
-
-#: include/conversation.php:176
-#, php-format
-msgid "%1$s doesn't attend %2$s's %3$s"
-msgstr "%1$s neemt niet deel aan %2$ss %3$s"
-
-#: include/conversation.php:178
-#, php-format
-msgid "%1$s attends maybe %2$s's %3$s"
-msgstr "%1$s neemt misschien deel aan %2$ss %3$s"
-
-#: include/conversation.php:213
-#, php-format
-msgid "%1$s is now friends with %2$s"
-msgstr "%1$s is nu bevriend met %2$s"
-
-#: include/conversation.php:254
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s porde %2$s aan"
-
-#: include/conversation.php:308 mod/tagger.php:108
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s labelde %3$s van %2$s met %4$s"
-
-#: include/conversation.php:330
-msgid "post/item"
-msgstr "bericht/item"
-
-#: include/conversation.php:331
-#, php-format
-msgid "%1$s marked %2$s's %3$s as favorite"
-msgstr "%1$s markeerde %2$s's %3$s als favoriet"
-
-#: include/conversation.php:521 mod/photos.php:1477 mod/profiles.php:352
-msgid "Likes"
-msgstr "Houdt van"
-
-#: include/conversation.php:521 mod/photos.php:1477 mod/profiles.php:356
-msgid "Dislikes"
-msgstr "Houdt niet van"
-
-#: include/conversation.php:522 include/conversation.php:1481
-#: mod/photos.php:1478
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] "Neemt deel"
-msgstr[1] "Nemen deel"
-
-#: include/conversation.php:522 mod/photos.php:1478
-msgid "Not attending"
-msgstr "Nemen niet deel"
-
-#: include/conversation.php:522 mod/photos.php:1478
-msgid "Might attend"
-msgstr "Nemen misschien deel"
-
-#: include/conversation.php:612 mod/photos.php:1534 src/Object/Post.php:194
-msgid "Select"
-msgstr "Kies"
-
-#: include/conversation.php:613 mod/admin.php:1883 mod/contacts.php:831
-#: mod/contacts.php:1043 mod/photos.php:1535 mod/settings.php:736
-msgid "Delete"
-msgstr "Verwijder"
-
-#: include/conversation.php:647 src/Object/Post.php:361
-#: src/Object/Post.php:362
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "Bekijk het profiel van %s @ %s"
-
-#: include/conversation.php:659 src/Object/Post.php:349
-msgid "Categories:"
-msgstr "Categorieën:"
-
-#: include/conversation.php:660 src/Object/Post.php:350
-msgid "Filed under:"
-msgstr "Bewaard onder:"
-
-#: include/conversation.php:667 src/Object/Post.php:375
-#, php-format
-msgid "%s from %s"
-msgstr "%s van %s"
-
-#: include/conversation.php:682
-msgid "View in context"
-msgstr "In context bekijken"
-
-#: include/conversation.php:684 include/conversation.php:1155
-#: mod/editpost.php:115 mod/message.php:263 mod/message.php:431
-#: mod/photos.php:1450 mod/wallmessage.php:145 src/Object/Post.php:400
-msgid "Please wait"
-msgstr "Even geduld"
-
-#: include/conversation.php:757
-msgid "remove"
-msgstr "verwijder"
-
-#: include/conversation.php:761
-msgid "Delete Selected Items"
-msgstr "Geselecteerde items verwijderen"
-
-#: include/conversation.php:861 view/theme/frio/theme.php:357
-msgid "Follow Thread"
-msgstr "Gesprek volgen"
-
-#: include/conversation.php:862 src/Model/Contact.php:728
-msgid "View Status"
-msgstr "Bekijk status"
-
-#: include/conversation.php:863 include/conversation.php:879
-#: mod/allfriends.php:75 mod/directory.php:164 mod/dirfind.php:220
-#: mod/match.php:89 mod/suggest.php:84 src/Model/Contact.php:668
-#: src/Model/Contact.php:681 src/Model/Contact.php:729
-msgid "View Profile"
-msgstr "Bekijk profiel"
-
-#: include/conversation.php:864 src/Model/Contact.php:730
-msgid "View Photos"
-msgstr "Bekijk foto's"
-
-#: include/conversation.php:865 src/Model/Contact.php:731
-msgid "Network Posts"
-msgstr "Netwerkberichten"
-
-#: include/conversation.php:866 src/Model/Contact.php:732
-msgid "View Contact"
-msgstr "Bekijk contact"
-
-#: include/conversation.php:867 src/Model/Contact.php:734
-msgid "Send PM"
-msgstr "Stuur een privébericht"
-
-#: include/conversation.php:871 src/Model/Contact.php:735
-msgid "Poke"
-msgstr "Porren"
-
-#: include/conversation.php:876 mod/allfriends.php:76 mod/contacts.php:597
-#: mod/dirfind.php:221 mod/follow.php:144 mod/match.php:90 mod/suggest.php:85
-#: view/theme/vier/theme.php:199 src/Content/Widget.php:60
-#: src/Model/Contact.php:682
-msgid "Connect/Follow"
-msgstr "Verbind/Volg"
-
-#: include/conversation.php:994
-#, php-format
-msgid "%s likes this."
-msgstr "%s vindt dit leuk."
-
-#: include/conversation.php:997
-#, php-format
-msgid "%s doesn't like this."
-msgstr "%s vindt dit niet leuk."
-
-#: include/conversation.php:1000
-#, php-format
-msgid "%s attends."
-msgstr "%s neemt deel"
-
-#: include/conversation.php:1003
-#, php-format
-msgid "%s doesn't attend."
-msgstr "%s neemt niet deel"
-
-#: include/conversation.php:1006
-#, php-format
-msgid "%s attends maybe."
-msgstr "%s neemt misschien deel"
-
-#: include/conversation.php:1017
-msgid "and"
-msgstr "en"
-
-#: include/conversation.php:1023
-#, php-format
-msgid "and %d other people"
-msgstr "en %d anderen"
-
-#: include/conversation.php:1032
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this"
-msgstr "<span  %1$s>%2$d mensen</span> vinden dit leuk"
-
-#: include/conversation.php:1033
-#, php-format
-msgid "%s like this."
-msgstr "%s vinden dit leuk."
-
-#: include/conversation.php:1036
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this"
-msgstr "<span  %1$s>%2$d people</span> vinden dit niet leuk"
-
-#: include/conversation.php:1037
-#, php-format
-msgid "%s don't like this."
-msgstr "%s vinden dit niet leuk."
-
-#: include/conversation.php:1040
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend"
-msgstr "<span %1$s>%2$d mensen</span> nemen deel"
-
-#: include/conversation.php:1041
-#, php-format
-msgid "%s attend."
-msgstr "%s nemen deel."
-
-#: include/conversation.php:1044
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't attend"
-msgstr "<span %1$s>%2$d mensen</span> nemen niet deel"
-
-#: include/conversation.php:1045
-#, php-format
-msgid "%s don't attend."
-msgstr "%s nemen niet deel."
-
-#: include/conversation.php:1048
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend maybe"
-msgstr "<span %1$s>%2$d mensen</span> nemen misschien deel"
-
-#: include/conversation.php:1049
-#, php-format
-msgid "%s attend maybe."
-msgstr "%s neemt misschien deel."
-
-#: include/conversation.php:1079 include/conversation.php:1095
-msgid "Visible to <strong>everybody</strong>"
-msgstr "Zichtbaar voor <strong>iedereen</strong>"
-
-#: include/conversation.php:1080 include/conversation.php:1096
-#: mod/message.php:199 mod/message.php:206 mod/message.php:344
-#: mod/message.php:351 mod/wallmessage.php:120 mod/wallmessage.php:127
-msgid "Please enter a link URL:"
-msgstr "Vul een internetadres/URL in:"
-
-#: include/conversation.php:1081 include/conversation.php:1097
-msgid "Please enter a video link/URL:"
-msgstr "Vul een videolink/URL in:"
-
-#: include/conversation.php:1082 include/conversation.php:1098
-msgid "Please enter an audio link/URL:"
-msgstr "Vul een audiolink/URL in:"
-
-#: include/conversation.php:1083 include/conversation.php:1099
-msgid "Tag term:"
-msgstr "Label:"
-
-#: include/conversation.php:1084 include/conversation.php:1100
-#: mod/filer.php:34
-msgid "Save to Folder:"
-msgstr "Bewaren in map:"
-
-#: include/conversation.php:1085 include/conversation.php:1101
-msgid "Where are you right now?"
-msgstr "Waar ben je nu?"
-
-#: include/conversation.php:1086
-msgid "Delete item(s)?"
-msgstr "Item(s) verwijderen?"
-
-#: include/conversation.php:1133
-msgid "New Post"
-msgstr "Nieuw bericht"
-
-#: include/conversation.php:1136
-msgid "Share"
-msgstr "Delen"
-
-#: include/conversation.php:1137 mod/editpost.php:101 mod/message.php:261
-#: mod/message.php:428 mod/wallmessage.php:143
-msgid "Upload photo"
-msgstr "Foto uploaden"
-
-#: include/conversation.php:1138 mod/editpost.php:102
-msgid "upload photo"
-msgstr "Foto uploaden"
-
-#: include/conversation.php:1139 mod/editpost.php:103
-msgid "Attach file"
-msgstr "Bestand bijvoegen"
-
-#: include/conversation.php:1140 mod/editpost.php:104
-msgid "attach file"
-msgstr "bestand bijvoegen"
-
-#: include/conversation.php:1141 mod/editpost.php:105 mod/message.php:262
-#: mod/message.php:429 mod/wallmessage.php:144
-msgid "Insert web link"
-msgstr "Voeg een webadres in"
-
-#: include/conversation.php:1142 mod/editpost.php:106
-msgid "web link"
-msgstr "webadres"
-
-#: include/conversation.php:1143 mod/editpost.php:107
-msgid "Insert video link"
-msgstr "Voeg video toe"
-
-#: include/conversation.php:1144 mod/editpost.php:108
-msgid "video link"
-msgstr "video adres"
-
-#: include/conversation.php:1145 mod/editpost.php:109
-msgid "Insert audio link"
-msgstr "Voeg audio adres toe"
-
-#: include/conversation.php:1146 mod/editpost.php:110
-msgid "audio link"
-msgstr "audio adres"
-
-#: include/conversation.php:1147 mod/editpost.php:111
-msgid "Set your location"
-msgstr "Stel je locatie in"
-
-#: include/conversation.php:1148 mod/editpost.php:112
-msgid "set location"
-msgstr "Stel uw locatie in"
-
-#: include/conversation.php:1149 mod/editpost.php:113
-msgid "Clear browser location"
-msgstr "Verwijder locatie uit uw webbrowser"
-
-#: include/conversation.php:1150 mod/editpost.php:114
-msgid "clear location"
-msgstr "Verwijder locatie uit uw webbrowser"
-
-#: include/conversation.php:1152 mod/editpost.php:129
-msgid "Set title"
-msgstr "Titel plaatsen"
-
-#: include/conversation.php:1154 mod/editpost.php:131
-msgid "Categories (comma-separated list)"
-msgstr "Categorieën (komma-gescheiden lijst)"
-
-#: include/conversation.php:1156 mod/editpost.php:116
-msgid "Permission settings"
-msgstr "Instellingen van rechten"
-
-#: include/conversation.php:1157 mod/editpost.php:146
-msgid "permissions"
-msgstr "rechten"
-
-#: include/conversation.php:1166 mod/editpost.php:126
-msgid "Public post"
-msgstr "Openbare post"
-
-#: include/conversation.php:1170 mod/editpost.php:137 mod/events.php:530
-#: mod/photos.php:1468 mod/photos.php:1507 mod/photos.php:1567
-#: src/Object/Post.php:803
-msgid "Preview"
-msgstr "Voorvertoning"
-
-#: include/conversation.php:1174 include/items.php:401 mod/contacts.php:474
-#: mod/dfrn_request.php:654 mod/editpost.php:140 mod/fbrowser.php:104
-#: mod/fbrowser.php:135 mod/follow.php:162 mod/message.php:157
-#: mod/photos.php:254 mod/photos.php:323 mod/settings.php:676
-#: mod/settings.php:702 mod/suggest.php:42 mod/tagrm.php:19 mod/tagrm.php:91
-#: mod/unfollow.php:118 mod/videos.php:146
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: include/conversation.php:1179
-msgid "Post to Groups"
-msgstr "Verzenden naar Groepen"
-
-#: include/conversation.php:1180
-msgid "Post to Contacts"
-msgstr "Verzenden naar Contacten"
-
-#: include/conversation.php:1181
-msgid "Private post"
-msgstr "Privé verzending"
-
-#: include/conversation.php:1186 mod/editpost.php:144
-#: src/Model/Profile.php:340
-msgid "Message"
-msgstr "Bericht"
-
-#: include/conversation.php:1187 mod/editpost.php:145
-msgid "Browser"
-msgstr "Browser"
-
-#: include/conversation.php:1452
-msgid "View all"
-msgstr "Toon alles"
-
-#: include/conversation.php:1475
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "Houdt van"
-msgstr[1] "Houdt van"
-
-#: include/conversation.php:1478
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] "Houdt niet van"
-msgstr[1] "Houdt niet van"
-
-#: include/conversation.php:1484
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] "Neemt niet deel"
-msgstr[1] "Nemen niet deel"
-
-#: include/conversation.php:1487 src/Content/ContactSelector.php:123
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] "Onbeslist"
-msgstr[1] "Onbeslist"
-
-#: include/enotify.php:38
-msgid "Friendica Notification"
-msgstr "Friendica Notificatie"
-
-#: include/enotify.php:41
-msgid "Thank You,"
-msgstr "Bedankt"
-
-#: include/enotify.php:44
-#, php-format
-msgid "%1$s, %2$s Administrator"
-msgstr "%1$s, %2$s Beheerder"
-
-#: include/enotify.php:46
-#, php-format
-msgid "%s Administrator"
-msgstr "%s Beheerder"
-
-#: include/enotify.php:109
-#, php-format
-msgid "[Friendica:Notify] New mail received at %s"
-msgstr "[Friendica:Notificatie] Nieuw bericht ontvangen op %s"
-
-#: include/enotify.php:111
-#, php-format
-msgid "%1$s sent you a new private message at %2$s."
-msgstr "%1$s sent you a new private message at %2$s."
-
-#: include/enotify.php:112
-msgid "a private message"
-msgstr "een prive bericht"
-
-#: include/enotify.php:112
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s stuurde jou %2$s."
-
-#: include/enotify.php:114
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "Bezoek %s om je privé-berichten te bekijken en/of te beantwoorden."
-
-#: include/enotify.php:152
-#, php-format
-msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
-msgstr "%1$s gaf een reactie op [url=%2$s]a %3$s[/url]"
-
-#: include/enotify.php:160
-#, php-format
-msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
-msgstr "%1$s gaf een reactie op [url=%2$s]%3$s's %4$s[/url]"
-
-#: include/enotify.php:170
-#, php-format
-msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
-msgstr "%1$s gaf een reactie op [url=%2$s]jouw %3$s[/url]"
-
-#: include/enotify.php:182
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Friendica:Notificatie] Reactie op gesprek #%1$d door %2$s"
-
-#: include/enotify.php:184
-#, php-format
-msgid "%s commented on an item/conversation you have been following."
-msgstr "%s gaf een reactie op een bericht/gesprek die jij volgt."
-
-#: include/enotify.php:187 include/enotify.php:202 include/enotify.php:217
-#: include/enotify.php:232 include/enotify.php:251 include/enotify.php:267
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Bezoek %s om het gesprek te bekijken en/of te beantwoorden."
-
-#: include/enotify.php:194
-#, php-format
-msgid "[Friendica:Notify] %s posted to your profile wall"
-msgstr "[Friendica:Melding] %s plaatste een bericht op je tijdlijn"
-
-#: include/enotify.php:196
-#, php-format
-msgid "%1$s posted to your profile wall at %2$s"
-msgstr "%1$splaatste een bericht op je tijdlijn op %2$s"
-
-#: include/enotify.php:197
-#, php-format
-msgid "%1$s posted to [url=%2$s]your wall[/url]"
-msgstr "%1$s schreef op [url=%2$s]jouw tijdlijn[/url]"
-
-#: include/enotify.php:209
-#, php-format
-msgid "[Friendica:Notify] %s tagged you"
-msgstr "[Friendica:Notificatie] %s heeft jou genoemd"
-
-#: include/enotify.php:211
-#, php-format
-msgid "%1$s tagged you at %2$s"
-msgstr "%1$s heeft jou in %2$s genoemd"
-
-#: include/enotify.php:212
-#, php-format
-msgid "%1$s [url=%2$s]tagged you[/url]."
-msgstr "%1$s [url=%2$s]heeft jou genoemd[/url]."
-
-#: include/enotify.php:224
-#, php-format
-msgid "[Friendica:Notify] %s shared a new post"
-msgstr "[Friendica:Melding] %s deelde een nieuw bericht"
-
-#: include/enotify.php:226
-#, php-format
-msgid "%1$s shared a new post at %2$s"
-msgstr "%1$s deelde een nieuw bericht op %2$s"
-
-#: include/enotify.php:227
-#, php-format
-msgid "%1$s [url=%2$s]shared a post[/url]."
-msgstr "%1$s [url=%2$s]deelde een bericht[/url]."
-
-#: include/enotify.php:239
-#, php-format
-msgid "[Friendica:Notify] %1$s poked you"
-msgstr "[Friendica:Melding] %1$s heeft jou gepord"
-
-#: include/enotify.php:241
-#, php-format
-msgid "%1$s poked you at %2$s"
-msgstr "%1$s heeft jou gepord op %2$s"
-
-#: include/enotify.php:242
-#, php-format
-msgid "%1$s [url=%2$s]poked you[/url]."
-msgstr "%1$s [url=%2$s]porde jou[/url]"
-
-#: include/enotify.php:259
-#, php-format
-msgid "[Friendica:Notify] %s tagged your post"
-msgstr "[Friendica:Notificatie] %s heeft jouw bericht gelabeld"
-
-#: include/enotify.php:261
-#, php-format
-msgid "%1$s tagged your post at %2$s"
-msgstr "%1$s heeft jouw bericht gelabeld in %2$s"
-
-#: include/enotify.php:262
-#, php-format
-msgid "%1$s tagged [url=%2$s]your post[/url]"
-msgstr "%1$s labelde [url=%2$s]jouw bericht[/url]"
-
-#: include/enotify.php:274
-msgid "[Friendica:Notify] Introduction received"
-msgstr "[Friendica:Notificatie] Vriendschaps-/connectieverzoek ontvangen"
-
-#: include/enotify.php:276
-#, php-format
-msgid "You've received an introduction from '%1$s' at %2$s"
-msgstr "Je hebt een vriendschaps- of connectieverzoek ontvangen van '%1$s' om %2$s"
-
-#: include/enotify.php:277
-#, php-format
-msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
-msgstr "Je ontving [url=%1$s]een vriendschaps- of connectieverzoek[/url] van %2$s."
-
-#: include/enotify.php:282 include/enotify.php:328
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "Je kunt hun profiel bezoeken op %s"
-
-#: include/enotify.php:284
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
-msgstr "Bezoek %s om het verzoek goed of af te keuren."
-
-#: include/enotify.php:291
-msgid "[Friendica:Notify] A new person is sharing with you"
-msgstr "[Friendica:Melding]  Iemand nieuw deelt met jou."
-
-#: include/enotify.php:293 include/enotify.php:294
-#, php-format
-msgid "%1$s is sharing with you at %2$s"
-msgstr "%1$s deelt met jou in %2$s"
-
-#: include/enotify.php:301
-msgid "[Friendica:Notify] You have a new follower"
-msgstr "[Friendica:Melding] Je hebt een nieuwe volger"
-
-#: include/enotify.php:303 include/enotify.php:304
-#, php-format
-msgid "You have a new follower at %2$s : %1$s"
-msgstr "Je hebt een nieuwe volger op %2$s: %1$s"
-
-#: include/enotify.php:317
-msgid "[Friendica:Notify] Friend suggestion received"
-msgstr "[Friendica:Melding] Vriendschapsvoorstel ontvangen"
-
-#: include/enotify.php:319
-#, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
-msgstr "Je kreeg een vriendschapssuggestie van '%1$s' op %2$s"
-
-#: include/enotify.php:320
-#, php-format
-msgid ""
-"You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
-msgstr "Je kreeg een [url=%1$s]vriendschapssuggestie[/url] voor %2$s op %3$s."
-
-#: include/enotify.php:326
-msgid "Name:"
-msgstr "Naam:"
-
-#: include/enotify.php:327
-msgid "Photo:"
-msgstr "Foto: "
-
-#: include/enotify.php:330
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "Bezoek %s om de suggestie goed of af te keuren."
-
-#: include/enotify.php:338 include/enotify.php:353
-msgid "[Friendica:Notify] Connection accepted"
-msgstr "[Friendica:Melding] Verbinding aanvaard"
-
-#: include/enotify.php:340 include/enotify.php:355
-#, php-format
-msgid "'%1$s' has accepted your connection request at %2$s"
-msgstr "'%1$s' aanvaarde je contactaanvraag op %2$s"
-
-#: include/enotify.php:341 include/enotify.php:356
-#, php-format
-msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
-msgstr "%2$saanvaardde jouw [url=%1$s]contactaanvraag[/url]."
-
-#: include/enotify.php:346
-msgid ""
-"You are now mutual friends and may exchange status updates, photos, and "
-"email without restriction."
-msgstr "Jullie zijn nu in contact met elkaar en kunnen statusberichten, foto's en email delen zonder beperkingen."
-
-#: include/enotify.php:348
-#, php-format
-msgid "Please visit %s if you wish to make any changes to this relationship."
-msgstr "Bezoek alstublieft %s als je deze relatie wil wijzigen."
-
-#: include/enotify.php:361
-#, php-format
-msgid ""
-"'%1$s' has chosen to accept you a fan, which restricts some forms of "
-"communication - such as private messaging and some profile interactions. If "
-"this is a celebrity or community page, these settings were applied "
-"automatically."
-msgstr "'%1$s' koos om je te accepteren als fan, wat sommige communicatievormen beperkt - zoals privéberichten en sommige profielfuncties.  Als dit een beroemdheid- of groepspagina is, werd dit automatisch toegepast."
-
-#: include/enotify.php:363
-#, php-format
-msgid ""
-"'%1$s' may choose to extend this into a two-way or more permissive "
-"relationship in the future."
-msgstr "'%1$s' kan er later voor kiezen om deze beperkingen aan te passen."
-
-#: include/enotify.php:365
-#, php-format
-msgid "Please visit %s  if you wish to make any changes to this relationship."
-msgstr "Bezoek %s wanneer je deze relatie wil wijzigen."
-
-#: include/enotify.php:375 mod/removeme.php:47
-msgid "[Friendica System Notify]"
-msgstr "[Friendica systeem notificatie]"
-
-#: include/enotify.php:375
-msgid "registration request"
-msgstr "registratie verzoek"
-
-#: include/enotify.php:377
-#, php-format
-msgid "You've received a registration request from '%1$s' at %2$s"
-msgstr "Je kreeg een registratieaanvraag van '%1$s' op %2$s"
-
-#: include/enotify.php:378
-#, php-format
-msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
-msgstr "Je kreeg een [url=%1$s]registratieaanvraag[/url] van %2$s."
-
-#: include/enotify.php:383
-#, php-format
-msgid ""
-"Full Name:\t%s\n"
-"Site Location:\t%s\n"
-"Login Name:\t%s (%s)"
-msgstr "Volledige naam:\t%s\nAdres van de site:\t%s\nLoginnaam:\t%s (%s)"
-
-#: include/enotify.php:389
-#, php-format
-msgid "Please visit %s to approve or reject the request."
-msgstr "Bezoek %s om de aanvraag goed of af te keuren."
-
-#: include/items.php:358 mod/admin.php:282 mod/admin.php:1940
-#: mod/admin.php:2188 mod/display.php:70 mod/display.php:245
-#: mod/display.php:342 mod/notice.php:22 mod/viewsrc.php:22
-msgid "Item not found."
-msgstr "Item niet gevonden."
-
-#: include/items.php:396
-msgid "Do you really want to delete this item?"
-msgstr "Wil je echt dit item verwijderen?"
-
-#: include/items.php:398 mod/api.php:110 mod/contacts.php:471
-#: mod/dfrn_request.php:644 mod/follow.php:151 mod/message.php:154
-#: mod/profiles.php:541 mod/profiles.php:544 mod/profiles.php:566
-#: mod/register.php:237 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:39
-msgid "Yes"
-msgstr "Ja"
-
-#: include/items.php:415 mod/ostatus_subscribe.php:16 mod/uimport.php:28
-#: mod/allfriends.php:23 mod/api.php:35 mod/api.php:40 mod/attach.php:39
-#: mod/cal.php:306 mod/common.php:28 mod/contacts.php:385 mod/crepair.php:99
-#: mod/delegate.php:26 mod/delegate.php:44 mod/delegate.php:55
-#: mod/dfrn_confirm.php:65 mod/dirfind.php:26 mod/editpost.php:19
-#: mod/events.php:195 mod/follow.php:18 mod/follow.php:55 mod/follow.php:119
-#: mod/fsuggest.php:80 mod/group.php:26 mod/invite.php:21 mod/invite.php:112
-#: mod/item.php:165 mod/manage.php:131 mod/message.php:60 mod/message.php:105
-#: mod/network.php:33 mod/nogroup.php:23 mod/notes.php:32
-#: mod/notifications.php:66 mod/photos.php:183 mod/photos.php:1047
-#: mod/poke.php:145 mod/profile_photo.php:29 mod/profile_photo.php:176
-#: mod/profile_photo.php:198 mod/profiles.php:179 mod/profiles.php:511
-#: mod/register.php:53 mod/regmod.php:107 mod/repair_ostatus.php:15
-#: mod/settings.php:43 mod/settings.php:149 mod/settings.php:665
-#: mod/suggest.php:60 mod/unfollow.php:16 mod/unfollow.php:58
-#: mod/unfollow.php:91 mod/viewcontacts.php:59 mod/wall_attach.php:76
-#: mod/wall_attach.php:79 mod/wall_upload.php:104 mod/wall_upload.php:107
-#: mod/wallmessage.php:16 mod/wallmessage.php:40 mod/wallmessage.php:79
-#: mod/wallmessage.php:103 index.php:432
-msgid "Permission denied."
-msgstr "Toegang geweigerd"
-
-#: include/items.php:486 src/Content/Feature.php:96
-msgid "Archives"
-msgstr "Archieven"
-
-#: include/items.php:492 view/theme/vier/theme.php:256
-#: src/Content/ForumManager.php:130 src/Content/Widget.php:316
-#: src/Object/Post.php:428 src/App.php:784
-msgid "show more"
-msgstr "toon meer"
-
-#: include/security.php:83
-msgid "Welcome "
-msgstr "Welkom"
-
-#: include/security.php:84
-msgid "Please upload a profile photo."
-msgstr "Upload een profielfoto."
-
-#: include/security.php:86
-msgid "Welcome back "
-msgstr "Welkom terug "
-
-#: include/security.php:428
-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 "De beveiligingstoken van het formulier was foutief. Dit gebeurde waarschijnlijk omdat het formulier te lang (> 3 uur)  is blijven open staan voor het werd verstuurd."
-
-#: include/text.php:301
-msgid "newer"
-msgstr "nieuwere berichten"
-
-#: include/text.php:302
-msgid "older"
-msgstr "oudere berichten"
-
-#: include/text.php:307
-msgid "first"
-msgstr "eerste"
-
-#: include/text.php:308
-msgid "prev"
-msgstr "vorige"
-
-#: include/text.php:342
-msgid "next"
-msgstr "volgende"
-
-#: include/text.php:343
-msgid "last"
-msgstr "laatste"
-
-#: include/text.php:397
-msgid "Loading more entries..."
-msgstr "Meer berichten aan het laden..."
-
-#: include/text.php:398
-msgid "The end"
-msgstr "Het einde"
-
-#: include/text.php:766
-msgid "No contacts"
-msgstr "Geen contacten"
-
-#: include/text.php:790
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] "%d contact"
-msgstr[1] "%d contacten"
-
-#: include/text.php:803
-msgid "View Contacts"
-msgstr "Bekijk contacten"
-
-#: include/text.php:888 mod/filer.php:35 mod/editpost.php:100 mod/notes.php:54
-msgid "Save"
-msgstr "Bewaren"
-
-#: include/text.php:888
-msgid "Follow"
-msgstr "Volg"
-
-#: include/text.php:894 mod/search.php:162 src/Content/Nav.php:142
-msgid "Search"
-msgstr "Zoeken"
-
-#: include/text.php:897 src/Content/Nav.php:58
-msgid "@name, !forum, #tags, content"
-msgstr "@naam, !forum, #labels, inhoud"
-
-#: include/text.php:903 src/Content/Nav.php:145
-msgid "Full Text"
-msgstr "Volledige tekst"
-
-#: include/text.php:904 src/Content/Widget/TagCloud.php:53
-#: src/Content/Nav.php:146
-msgid "Tags"
-msgstr "Labels"
-
-#: include/text.php:905 mod/contacts.php:815 mod/contacts.php:876
-#: mod/viewcontacts.php:124 view/theme/frio/theme.php:270
-#: src/Content/Nav.php:147 src/Content/Nav.php:213 src/Model/Profile.php:963
-#: src/Model/Profile.php:966
-msgid "Contacts"
-msgstr "Contacten"
-
-#: include/text.php:908 view/theme/vier/theme.php:251
-#: src/Content/ForumManager.php:125 src/Content/Nav.php:151
-msgid "Forums"
-msgstr "Forums"
-
-#: include/text.php:952
-msgid "poke"
-msgstr "por"
-
-#: include/text.php:952
-msgid "poked"
-msgstr "porde"
-
-#: include/text.php:953
-msgid "ping"
-msgstr "ping"
-
-#: include/text.php:953
-msgid "pinged"
-msgstr "gepingd"
-
-#: include/text.php:954
-msgid "prod"
-msgstr "porren"
-
-#: include/text.php:954
-msgid "prodded"
-msgstr "gepord"
-
-#: include/text.php:955
-msgid "slap"
-msgstr "slaan"
-
-#: include/text.php:955
-msgid "slapped"
-msgstr "geslagen"
-
-#: include/text.php:956
-msgid "finger"
-msgstr "finger"
-
-#: include/text.php:956
-msgid "fingered"
-msgstr "gerfingerd"
-
-#: include/text.php:957
-msgid "rebuff"
-msgstr "afpoeieren"
-
-#: include/text.php:957
-msgid "rebuffed"
-msgstr "afgepoeierd"
-
-#: include/text.php:971 mod/settings.php:941 src/Model/Event.php:388
-msgid "Monday"
-msgstr "Maandag"
-
-#: include/text.php:971 src/Model/Event.php:389
-msgid "Tuesday"
-msgstr "Dinsdag"
-
-#: include/text.php:971 src/Model/Event.php:390
-msgid "Wednesday"
-msgstr "Woensdag"
-
-#: include/text.php:971 src/Model/Event.php:391
-msgid "Thursday"
-msgstr "Donderdag"
-
-#: include/text.php:971 src/Model/Event.php:392
-msgid "Friday"
-msgstr "Vrijdag"
-
-#: include/text.php:971 src/Model/Event.php:393
-msgid "Saturday"
-msgstr "Zaterdag"
-
-#: include/text.php:971 mod/settings.php:941 src/Model/Event.php:387
-msgid "Sunday"
-msgstr "Zondag"
-
-#: include/text.php:975 src/Model/Event.php:408
-msgid "January"
-msgstr "Januari"
-
-#: include/text.php:975 src/Model/Event.php:409
-msgid "February"
-msgstr "Februari"
-
-#: include/text.php:975 src/Model/Event.php:410
-msgid "March"
-msgstr "Maart"
-
-#: include/text.php:975 src/Model/Event.php:411
-msgid "April"
-msgstr "April"
-
-#: include/text.php:975 include/text.php:992 src/Model/Event.php:399
-#: src/Model/Event.php:412
-msgid "May"
-msgstr "Mei"
-
-#: include/text.php:975 src/Model/Event.php:413
-msgid "June"
-msgstr "Juni"
-
-#: include/text.php:975 src/Model/Event.php:414
-msgid "July"
-msgstr "Juli"
-
-#: include/text.php:975 src/Model/Event.php:415
-msgid "August"
-msgstr "Augustus"
-
-#: include/text.php:975 src/Model/Event.php:416
-msgid "September"
-msgstr "September"
-
-#: include/text.php:975 src/Model/Event.php:417
-msgid "October"
-msgstr "Oktober"
-
-#: include/text.php:975 src/Model/Event.php:418
-msgid "November"
-msgstr "November"
-
-#: include/text.php:975 src/Model/Event.php:419
-msgid "December"
-msgstr "December"
-
-#: include/text.php:989 src/Model/Event.php:380
-msgid "Mon"
-msgstr "Maa"
-
-#: include/text.php:989 src/Model/Event.php:381
-msgid "Tue"
-msgstr "Din"
-
-#: include/text.php:989 src/Model/Event.php:382
-msgid "Wed"
-msgstr "Woe"
-
-#: include/text.php:989 src/Model/Event.php:383
-msgid "Thu"
-msgstr "Don"
-
-#: include/text.php:989 src/Model/Event.php:384
-msgid "Fri"
-msgstr "Vrij"
-
-#: include/text.php:989 src/Model/Event.php:385
-msgid "Sat"
-msgstr "Zat"
-
-#: include/text.php:989 src/Model/Event.php:379
-msgid "Sun"
-msgstr "Zon"
-
-#: include/text.php:992 src/Model/Event.php:395
-msgid "Jan"
-msgstr "Jan"
-
-#: include/text.php:992 src/Model/Event.php:396
-msgid "Feb"
-msgstr "Feb"
-
-#: include/text.php:992 src/Model/Event.php:397
-msgid "Mar"
-msgstr "Maa"
-
-#: include/text.php:992 src/Model/Event.php:398
-msgid "Apr"
-msgstr "Apr"
-
-#: include/text.php:992 src/Model/Event.php:401
-msgid "Jul"
-msgstr "Jul"
-
-#: include/text.php:992 src/Model/Event.php:402
-msgid "Aug"
-msgstr "Aug"
-
-#: include/text.php:992
-msgid "Sep"
-msgstr "Sep"
-
-#: include/text.php:992 src/Model/Event.php:404
-msgid "Oct"
-msgstr "Okt"
-
-#: include/text.php:992 src/Model/Event.php:405
-msgid "Nov"
-msgstr "Nov"
-
-#: include/text.php:992 src/Model/Event.php:406
-msgid "Dec"
-msgstr "Dec"
-
-#: include/text.php:1138
-#, php-format
-msgid "Content warning: %s"
-msgstr "Waarschuwing inhoud: %s"
-
-#: include/text.php:1203 mod/videos.php:373
-msgid "View Video"
-msgstr "Bekijk Video"
-
-#: include/text.php:1220
-msgid "bytes"
-msgstr "bytes"
-
-#: include/text.php:1253 include/text.php:1264 include/text.php:1299
-msgid "Click to open/close"
-msgstr "klik om te openen/sluiten"
-
-#: include/text.php:1414
-msgid "View on separate page"
-msgstr "Bekijk op aparte pagina"
-
-#: include/text.php:1415
-msgid "view on separate page"
-msgstr "bekijk op aparte pagina"
-
-#: include/text.php:1420 include/text.php:1427 src/Model/Event.php:606
-msgid "link to source"
-msgstr "Verwijzing naar bron"
-
-#: include/text.php:1634
-msgid "activity"
-msgstr "activiteit"
-
-#: include/text.php:1636 src/Object/Post.php:427 src/Object/Post.php:439
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "reactie"
-msgstr[1] "reacties"
-
-#: include/text.php:1639
-msgid "post"
-msgstr "bericht"
-
-#: include/text.php:1794
-msgid "Item filed"
-msgstr "Item bewaard"
-
-#: mod/apps.php:14 index.php:261
-msgid "You must be logged in to use addons. "
-msgstr "Je moet ingelogd zijn om deze addons te kunnen gebruiken. "
-
-#: mod/apps.php:19
-msgid "Applications"
-msgstr "Toepassingen"
-
-#: mod/apps.php:22
-msgid "No installed applications."
-msgstr "Geen toepassingen geïnstalleerd"
-
-#: mod/credits.php:18
-msgid "Credits"
-msgstr "Credits"
-
-#: 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 "Friendica is een gemeenschapsproject dat niet mogelijk zou zijn zonder de hulp van vele mensen.  Hier is een lijst van alle mensen die aan de code of vertalingen van Friendica hebben meegewerkt.  Allen van harte bedankt!"
-
-#: mod/maintenance.php:24
-msgid "System down for maintenance"
-msgstr "Systeem onbeschikbaar wegens onderhoud"
-
-#: mod/newmember.php:11
-msgid "Welcome to Friendica"
-msgstr "Welkom bij Friendica"
-
-#: mod/newmember.php:12
-msgid "New Member Checklist"
-msgstr "Checklist voor nieuwe leden"
-
-#: 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 "We willen je een paar tips en verwijzingen aanreiken om je een aangename ervaring te bezorgen. Klik op een item om de relevante pagina's te bezoeken. Een verwijzing naar deze pagina zal twee weken lang na je registratie zichtbaar zijn op je tijdlijn. Daarna zal de verwijzing stilletjes verdwijnen."
-
-#: mod/newmember.php:15
-msgid "Getting Started"
-msgstr "Aan de slag"
-
-#: mod/newmember.php:17
-msgid "Friendica Walk-Through"
-msgstr "Doorloop Friendica"
-
-#: 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 "Op je <em>Snelstart</em> pagina kun je een korte inleiding vinden over je profiel en netwerk tabs, om enkele nieuwe connecties te leggen en groepen te vinden om lid van te worden."
-
-#: mod/newmember.php:19 mod/admin.php:1992 mod/admin.php:2262
-#: mod/settings.php:131 view/theme/frio/theme.php:269 src/Content/Nav.php:207
-msgid "Settings"
-msgstr "Instellingen"
-
-#: mod/newmember.php:21
-msgid "Go to Your Settings"
-msgstr "Ga naar je instellingen"
-
-#: 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 "Verander je initieel wachtwoord op je <em>instellingenpagina</em>. Noteer ook het adres van je identiteit. Dit ziet er uit als een e-mailadres - en zal nuttig zijn om vrienden te maken op het vrije sociale web."
-
-#: 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 "Controleer ook de andere instellingen, in het bijzonder de privacy-instellingen. Een niet-gepubliceerd adres is zoals een privé-telefoonnummer. In het algemeen wil je waarschijnlijk je adres publiceren - tenzij al je vrienden en mogelijke vrienden precies weten hoe je te vinden."
-
-#: mod/newmember.php:24 mod/contacts.php:672 mod/contacts.php:864
-#: mod/profperm.php:113 view/theme/frio/theme.php:260 src/Content/Nav.php:101
-#: src/Model/Profile.php:726 src/Model/Profile.php:859
-#: src/Model/Profile.php:892
-msgid "Profile"
-msgstr "Profiel"
-
-#: mod/newmember.php:26 mod/profile_photo.php:246 mod/profiles.php:598
-msgid "Upload Profile Photo"
-msgstr "Profielfoto uploaden"
-
-#: 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 "Upload een profielfoto, als je dat nog niet gedaan hebt. Studies tonen aan dat mensen met echte foto's van zichzelf tien keer gemakkelijker vrienden maken dan mensen die dat niet doen."
-
-#: mod/newmember.php:27
-msgid "Edit Your Profile"
-msgstr "Bewerk je profiel"
-
-#: 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 "Bewerk je <strong>standaard</strong> profiel zoals je wilt. Controleer de instellingen om je vriendenlijst te verbergen, en om je profiel voor ongekende bezoekers te verbergen."
-
-#: mod/newmember.php:28
-msgid "Profile Keywords"
-msgstr "Sleutelwoorden voor dit profiel"
-
-#: 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 "Stel enkele openbare sleutelwoorden in voor je standaard profiel die je interesses beschrijven. We kunnen dan misschien mensen vinden met gelijkaardige interesses, en vrienden voorstellen."
-
-#: mod/newmember.php:30
-msgid "Connecting"
-msgstr "Verbinding aan het maken"
-
-#: mod/newmember.php:36
-msgid "Importing Emails"
-msgstr "E-mails importeren"
-
-#: 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 "Vul je e-mailtoegangsinformatie in op je pagina met verbindingsinstellingen als je vrienden of mailinglijsten uit je e-mail-inbox wilt importeren, en met hen wilt communiceren"
-
-#: mod/newmember.php:39
-msgid "Go to Your Contacts Page"
-msgstr "Ga naar je contactenpagina"
-
-#: 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 "Je contactenpagina is jouw poort om vriendschappen te beheren en verbinding te leggen met vrienden op andere netwerken. Je kunt hun adres of URL toevoegen in de <em>Voeg nieuw contact toe</em> dialoog."
-
-#: mod/newmember.php:40
-msgid "Go to Your Site's Directory"
-msgstr "Ga naar de gids van je website"
-
-#: 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 "In de gids vind je andere mensen in dit netwerk of op andere federatieve sites. Zoek naar het woord <em>Connect</em> of <em>Follow</em> op hun profielpagina (meestal aan de linkerkant). Vul je eigen identiteitsadres in wanneer daar om wordt gevraagd."
-
-#: mod/newmember.php:41
-msgid "Finding New People"
-msgstr "Nieuwe mensen vinden"
-
-#: 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 "Op het zijpaneel van de Contacten pagina vind je verschillende tools om nieuwe vrienden te zoeken. We kunnen mensen op interesses matchen, mensen opzoeken op naam of hobby, en suggesties doen gebaseerd op netwerk-relaties. Op een nieuwe webstek beginnen vriendschapssuggesties meestal binnen de 24 uur beschikbaar te worden."
-
-#: mod/newmember.php:43 src/Model/Group.php:413
-msgid "Groups"
-msgstr "Groepen"
-
-#: mod/newmember.php:45
-msgid "Group Your Contacts"
-msgstr "Groepeer je contacten"
-
-#: 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 "Als je een aantal vrienden gemaakt hebt kun je ze in je eigen gespreksgroepen indelen vanuit de zijbalk van je 'Contacten' pagina, en dan kun je met elke groep apart contact houden op je Netwerk pagina. "
-
-#: mod/newmember.php:48
-msgid "Why Aren't My Posts Public?"
-msgstr "Waarom zijn mijn berichten niet openbaar?"
-
-#: 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 "Friendica respecteert je privacy. Standaard zullen je berichten alleen zichtbaar zijn voor personen die jij als vriend hebt toegevoegd. Lees de help (zie de verwijzing hierboven) voor meer informatie."
-
-#: mod/newmember.php:52
-msgid "Getting Help"
-msgstr "Hulp krijgen"
-
-#: mod/newmember.php:54
-msgid "Go to the Help Section"
-msgstr "Ga naar de help"
-
-#: mod/newmember.php:54
-msgid ""
-"Our <strong>help</strong> pages may be consulted for detail on other program"
-" features and resources."
-msgstr "Je kunt onze <strong>help</strong> pagina's raadplegen voor gedetailleerde informatie over andere functies van dit programma."
-
-#: mod/localtime.php:19 src/Model/Event.php:34 src/Model/Event.php:826
-msgid "l F d, Y \\@ g:i A"
-msgstr "l F d, Y \\@ g:i A"
-
-#: mod/localtime.php:33
-msgid "Time Conversion"
-msgstr "Tijdsconversie"
-
-#: mod/localtime.php:35
-msgid ""
-"Friendica provides this service for sharing events with other networks and "
-"friends in unknown timezones."
-msgstr "Friendica biedt deze dienst aan om gebeurtenissen te delen met andere netwerken en vrienden in onbekende tijdzones."
-
-#: mod/localtime.php:39
-#, php-format
-msgid "UTC time: %s"
-msgstr "UTC tijd: %s"
-
-#: mod/localtime.php:42
-#, php-format
-msgid "Current timezone: %s"
-msgstr "Huidige Tijdzone: %s"
-
-#: mod/localtime.php:46
-#, php-format
-msgid "Converted localtime: %s"
-msgstr "Omgerekende lokale tijd: %s"
-
-#: mod/localtime.php:52
-msgid "Please select your timezone:"
-msgstr "Selecteer je tijdzone:"
-
-#: mod/localtime.php:56 mod/contacts.php:611 mod/crepair.php:149
-#: mod/events.php:532 mod/fsuggest.php:114 mod/install.php:193
-#: mod/install.php:231 mod/invite.php:155 mod/manage.php:184
-#: mod/message.php:264 mod/message.php:430 mod/photos.php:1076
-#: mod/photos.php:1156 mod/photos.php:1422 mod/photos.php:1467
-#: mod/photos.php:1506 mod/photos.php:1566 mod/poke.php:195
-#: mod/profiles.php:577 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/Object/Post.php:794
-msgid "Submit"
-msgstr "Opslaan"
-
-#: mod/webfinger.php:16 mod/community.php:27 mod/dfrn_request.php:598
-#: mod/directory.php:42 mod/display.php:194 mod/photos.php:927
-#: mod/probe.php:13 mod/search.php:105 mod/search.php:111 mod/videos.php:198
-#: mod/viewcontacts.php:47
-msgid "Public access denied."
-msgstr "Niet vrij toegankelijk"
-
-#: mod/webfinger.php:17 mod/probe.php:14
-msgid "Only logged in users are permitted to perform a probing."
-msgstr "Alleen ingelogde gebruikers hebben toelating om aan probing te doen."
-
-#: mod/ostatus_subscribe.php:21
-msgid "Subscribing to OStatus contacts"
-msgstr "Inschrijven bij OStatus contacten"
-
-#: mod/ostatus_subscribe.php:33
-msgid "No contact provided."
-msgstr "Geen contact opgegeven."
-
-#: mod/ostatus_subscribe.php:40
-msgid "Couldn't fetch information for contact."
-msgstr "Kon de informatie voor het contact niet ophalen."
-
-#: mod/ostatus_subscribe.php:50
-msgid "Couldn't fetch friends for contact."
-msgstr "Kon de vrienden van contact niet ophalen."
-
-#: mod/ostatus_subscribe.php:64 mod/repair_ostatus.php:50
-msgid "Done"
-msgstr "Klaar"
-
-#: mod/ostatus_subscribe.php:78
-msgid "success"
-msgstr "Succesvol"
-
-#: mod/ostatus_subscribe.php:80
-msgid "failed"
-msgstr "Mislukt"
-
-#: mod/ostatus_subscribe.php:83 src/Object/Post.php:275
-msgid "ignored"
-msgstr "Verboden"
-
-#: mod/ostatus_subscribe.php:88 mod/repair_ostatus.php:56
-msgid "Keep this window open until done."
-msgstr "Houd dit scherm open tot het klaar is"
-
-#: mod/babel.php:22
-msgid "Source input"
-msgstr "Bron input"
-
-#: mod/babel.php:28
-msgid "BBCode::toPlaintext"
-msgstr "BBCode::toPlaintext"
-
-#: mod/babel.php:34
-msgid "BBCode::convert (raw HTML)"
-msgstr "BBCode::convert (raw HTML)"
-
-#: mod/babel.php:39
-msgid "BBCode::convert"
-msgstr "BBCode::convert"
-
-#: mod/babel.php:45
-msgid "BBCode::convert => HTML::toBBCode"
-msgstr "BBCode::convert => HTML::toBBCode"
-
-#: mod/babel.php:51
-msgid "BBCode::toMarkdown"
-msgstr "BBCode::toMarkdown"
-
-#: mod/babel.php:57
-msgid "BBCode::toMarkdown => Markdown::convert"
-msgstr "BBCode::toMarkdown => Markdown::convert"
-
-#: mod/babel.php:63
-msgid "BBCode::toMarkdown => Markdown::toBBCode"
-msgstr "BBCode::toMarkdown => Markdown::toBBCode"
-
-#: mod/babel.php:69
-msgid "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"
-msgstr "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"
-
-#: mod/babel.php:76
-msgid "Source input \\x28Diaspora format\\x29"
-msgstr "Bron input \\x28Diaspora formaat\\x29"
-
-#: mod/babel.php:82
-msgid "Markdown::toBBCode"
-msgstr "Markdown::toBBCode"
-
-#: mod/babel.php:89
-msgid "Raw HTML input"
-msgstr "Onverwerkte HTML input"
-
-#: mod/babel.php:94
-msgid "HTML Input"
-msgstr "HTML Input"
-
-#: mod/babel.php:100
-msgid "HTML::toBBCode"
-msgstr "HTML::toBBCode"
-
-#: mod/babel.php:106
-msgid "HTML::toPlaintext"
-msgstr "HTML::toPlaintext"
-
-#: mod/babel.php:114
-msgid "Source text"
-msgstr "Brontekst"
-
-#: mod/babel.php:115
-msgid "BBCode"
-msgstr "BBCode"
-
-#: mod/babel.php:116
-msgid "Markdown"
-msgstr "Markdown"
-
-#: mod/babel.php:117
-msgid "HTML"
-msgstr "HTML"
-
-#: mod/update_community.php:23 mod/update_display.php:24
-#: mod/update_network.php:29 mod/update_notes.php:36 mod/update_profile.php:35
-msgid "[Embedded content - reload page to view]"
-msgstr "[Ingebedde inhoud - herlaad pagina om het te bekijken]"
-
-#: mod/bookmarklet.php:24 src/Content/Nav.php:114 src/Module/Login.php:312
-msgid "Login"
-msgstr "Login"
-
-#: mod/bookmarklet.php:52
-msgid "The post was created"
-msgstr "Het bericht is aangemaakt"
-
-#: mod/filer.php:34
-msgid "- select -"
-msgstr "- Kies -"
-
-#: mod/help.php:49
-msgid "Help:"
-msgstr "Help:"
-
-#: mod/help.php:56 view/theme/vier/theme.php:295 src/Content/Nav.php:134
-msgid "Help"
-msgstr "Help"
-
-#: mod/help.php:62 mod/fetch.php:19 mod/fetch.php:46 mod/fetch.php:53
-#: index.php:308
-msgid "Not Found"
-msgstr "Niet gevonden"
-
-#: mod/help.php:65 index.php:313
-msgid "Page not found."
-msgstr "Pagina niet gevonden"
-
-#: mod/home.php:39
-#, php-format
-msgid "Welcome to %s"
-msgstr "Welkom op %s"
-
-#: mod/uimport.php:55 mod/register.php:191
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr "Deze website heeft het toegelaten dagelijkse aantal registraties overschreden. Probeer morgen opnieuw."
-
-#: mod/uimport.php:70 mod/register.php:287
-msgid "Import"
-msgstr "Importeren"
-
-#: mod/uimport.php:72
-msgid "Move account"
-msgstr "Account verplaatsen"
-
-#: mod/uimport.php:73
-msgid "You can import an account from another Friendica server."
-msgstr "Je kunt een account van een andere Friendica server importeren."
-
-#: mod/uimport.php:74
-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 "Je moet je account bij de oude server exporteren, en hier uploaden. We zullen je oude account hier opnieuw aanmaken, met al je contacten. We zullen ook proberen om je vrienden in te lichten dat je naar hier verhuisd bent."
-
-#: mod/uimport.php:75
-msgid ""
-"This feature is experimental. We can't import contacts from the OStatus "
-"network (GNU Social/Statusnet) or from Diaspora"
-msgstr "Dit feature is experimenteel. We kunnen contacten van het OStatus netwerk (GNU Social/Statusnet) of van Diaspora niet importeren."
-
-#: mod/uimport.php:76
-msgid "Account file"
-msgstr "Account bestand"
-
-#: mod/uimport.php:76
-msgid ""
-"To export your account, go to \"Settings->Export your personal data\" and "
-"select \"Export account\""
-msgstr "Om je account te exporteren, ga naar \"Instellingen->Exporteer je persoonlijke data\" en selecteer \"Exporteer account\""
-
-#: mod/admin.php:108
-msgid "Theme settings updated."
-msgstr "Thema-instellingen opgeslagen"
-
-#: mod/admin.php:181 src/Content/Nav.php:175
-msgid "Information"
-msgstr "Informatie"
-
-#: mod/admin.php:182
-msgid "Overview"
-msgstr "Overzicht"
-
-#: mod/admin.php:183 mod/admin.php:722
-msgid "Federation Statistics"
-msgstr "Federatie Statistieken"
-
-#: mod/admin.php:184
-msgid "Configuration"
-msgstr "Configuratie"
-
-#: mod/admin.php:185 mod/admin.php:1405
-msgid "Site"
-msgstr "Website"
-
-#: mod/admin.php:186 mod/admin.php:1334 mod/admin.php:1873 mod/admin.php:1890
-msgid "Users"
-msgstr "Gebruiker"
-
-#: mod/admin.php:187 mod/admin.php:1990 mod/admin.php:2050 mod/settings.php:94
-msgid "Addons"
-msgstr "Addons"
-
-#: mod/admin.php:188 mod/admin.php:2260 mod/admin.php:2304
-msgid "Themes"
-msgstr "Thema's"
-
-#: mod/admin.php:189 mod/settings.php:72
-msgid "Additional features"
-msgstr "Extra functies"
-
-#: mod/admin.php:190 mod/admin.php:309 mod/register.php:290
-#: src/Content/Nav.php:178 src/Module/Tos.php:70
-msgid "Terms of Service"
-msgstr "Gebruiksvoorwaarden"
-
-#: mod/admin.php:191
-msgid "Database"
-msgstr "Database"
-
-#: mod/admin.php:192
-msgid "DB updates"
-msgstr "DB aanpassingen"
-
-#: mod/admin.php:193 mod/admin.php:757
-msgid "Inspect Queue"
-msgstr "Wachtrij Inspecteren"
-
-#: mod/admin.php:194
-msgid "Inspect worker Queue"
-msgstr "Taakwachtrij inspecteren"
-
-#: mod/admin.php:195
-msgid "Tools"
-msgstr "Hulpmiddelen"
-
-#: mod/admin.php:196
-msgid "Contact Blocklist"
-msgstr "Contact Blokkeerlijst"
-
-#: mod/admin.php:197 mod/admin.php:371
-msgid "Server Blocklist"
-msgstr "Server Blokkeerlijst"
-
-#: mod/admin.php:198 mod/admin.php:530
-msgid "Delete Item"
-msgstr "Verwijder Item"
-
-#: mod/admin.php:199 mod/admin.php:200 mod/admin.php:2379
-msgid "Logs"
-msgstr "Logs"
-
-#: mod/admin.php:201 mod/admin.php:2446
-msgid "View Logs"
-msgstr "Bekijk Logs"
-
-#: mod/admin.php:203
-msgid "Diagnostics"
-msgstr "Diagnostiek"
-
-#: mod/admin.php:204
-msgid "PHP Info"
-msgstr "PHP Info"
-
-#: mod/admin.php:205
-msgid "probe address"
-msgstr "probe adres"
-
-#: mod/admin.php:206
-msgid "check webfinger"
-msgstr "check webfinger"
-
-#: mod/admin.php:225 src/Content/Nav.php:218
-msgid "Admin"
-msgstr "Beheer"
-
-#: mod/admin.php:226
-msgid "Addon Features"
-msgstr "Addon Features"
-
-#: mod/admin.php:227
-msgid "User registrations waiting for confirmation"
-msgstr "Gebruikersregistraties wachten op bevestiging"
-
-#: mod/admin.php:308 mod/admin.php:370 mod/admin.php:487 mod/admin.php:529
-#: mod/admin.php:721 mod/admin.php:756 mod/admin.php:794 mod/admin.php:894
-#: mod/admin.php:1404 mod/admin.php:1872 mod/admin.php:1989 mod/admin.php:2049
-#: mod/admin.php:2259 mod/admin.php:2303 mod/admin.php:2378 mod/admin.php:2445
-msgid "Administration"
-msgstr "Beheer"
-
-#: mod/admin.php:310
-msgid "Display Terms of Service"
-msgstr "Toon Gebruiksvoorwaarden"
-
-#: mod/admin.php:310
-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 "Activeer de Gebruiksvoorwaarden pagina. Als deze geactiveerd is, dan zal er een link naar de voorwaarden toegevoegd worden aan het registratie formulier en de algemene informatie pagina."
-
-#: mod/admin.php:311
-msgid "Display Privacy Statement"
-msgstr "Toon Privacy Verklaring"
-
-#: mod/admin.php:311
-#, 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 "Toon wat inlichtigen over de nodige informatite om de node te beheren in overeenstemming met bvb. de <a href=\"%s\" target=\"_blank\">EU-GDPR</a> (EU-AVG)."
-
-#: mod/admin.php:312
-msgid "Privacy Statement Preview"
-msgstr "Privacy Verklaring Voorbeeldweergave"
-
-#: mod/admin.php:314
-msgid "The Terms of Service"
-msgstr "De Gebruiksvoorwaarden"
-
-#: mod/admin.php:314
-msgid ""
-"Enter the Terms of Service for your node here. You can use BBCode. Headers "
-"of sections should be [h2] and below."
-msgstr "Geef hier de Gebruiksvoorwaarden van je node op. Je kan BBCode gebruiken. Sectie headers moeten [h2] zijn of lager."
-
-#: mod/admin.php:316 mod/admin.php:1406 mod/admin.php:2051 mod/admin.php:2305
-#: mod/admin.php:2380 mod/admin.php:2527 mod/delegate.php:169
-#: mod/settings.php:675 mod/settings.php:782 mod/settings.php:870
-#: mod/settings.php:959 mod/settings.php:1189
-msgid "Save Settings"
-msgstr "Instellingen opslaan"
-
-#: mod/admin.php:362 mod/admin.php:380 mod/dfrn_request.php:344
-#: mod/friendica.php:130 src/Model/Contact.php:1338
-msgid "Blocked domain"
-msgstr "Domein geblokeerd"
-
-#: mod/admin.php:362
-msgid "The blocked domain"
-msgstr "Het geblokkeerde domein"
-
-#: mod/admin.php:363 mod/admin.php:381 mod/friendica.php:130
-msgid "Reason for the block"
-msgstr "Reden van de blokkering"
-
-#: mod/admin.php:363 mod/admin.php:376
-msgid "The reason why you blocked this domain."
-msgstr "De reden waarom je dit domein geblokkeerd hebt."
-
-#: mod/admin.php:364
-msgid "Delete domain"
-msgstr "Verwijder domein"
-
-#: mod/admin.php:364
-msgid "Check to delete this entry from the blocklist"
-msgstr "Vink aan om dit item van de blokkeerlijst te verwijderen"
-
-#: mod/admin.php:372
-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 "Deze pagina kan je gebruiken om een zwarte lijst van servers aan te leggen van het gefedereerde netwerk die niet met jouw node mogen interageren. Voor alle domeine die je opgeeft moet je ook een reden geven waarom je die remote server geblokkeerd hebt."
-
-#: mod/admin.php:373
-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 "De lijst van geblokkeerde servers zal publiek beschikbaar gemaakt worden op de /friendica pagina zodat je gebruikers en personen die communicatie problemen onderzoeken gemakkelijk de reden kunnen vinden."
-
-#: mod/admin.php:374
-msgid "Add new entry to block list"
-msgstr "Voeg nieuw item toe aan de blokkeerlijst"
-
-#: mod/admin.php:375
-msgid "Server Domain"
-msgstr "Server Domein"
-
-#: mod/admin.php:375
-msgid ""
-"The domain of the new server to add to the block list. Do not include the "
-"protocol."
-msgstr "Het domein van de nieuwe server om toe te voegen aan de blokkeerlijst. Laat het protocol weg."
-
-#: mod/admin.php:376
-msgid "Block reason"
-msgstr "Reden voor blokkering"
-
-#: mod/admin.php:377
-msgid "Add Entry"
-msgstr "Voeg Item toe"
-
-#: mod/admin.php:378
-msgid "Save changes to the blocklist"
-msgstr "Sla veranderingen in de blokkeerlijst op"
-
-#: mod/admin.php:379
-msgid "Current Entries in the Blocklist"
-msgstr "Huidige Items in de blokkeerlijst"
-
-#: mod/admin.php:382
-msgid "Delete entry from blocklist"
-msgstr "Verwijder item uit de blokkeerlijst"
-
-#: mod/admin.php:385
-msgid "Delete entry from blocklist?"
-msgstr "Item verwijderen uit de blokkeerlijst?"
-
-#: mod/admin.php:411
-msgid "Server added to blocklist."
-msgstr "Server toegevoegd aan blokkeerlijst."
-
-#: mod/admin.php:427
-msgid "Site blocklist updated."
-msgstr "Site blokkeerlijst opgeslagen"
-
-#: mod/admin.php:450 src/Core/Console/GlobalCommunityBlock.php:68
-msgid "The contact has been blocked from the node"
-msgstr "Het contact is geblokkeerd van deze node"
-
-#: mod/admin.php:452 src/Core/Console/GlobalCommunityBlock.php:65
-#, php-format
-msgid "Could not find any contact entry for this URL (%s)"
-msgstr "Kon geen contact vinden op deze URL (%s)"
-
-#: mod/admin.php:459
-#, php-format
-msgid "%s contact unblocked"
-msgid_plural "%s contacts unblocked"
-msgstr[0] "%s contact is niet langer geblokkeerd"
-msgstr[1] "%s contacten zijn niet langer geblokkeerd"
-
-#: mod/admin.php:488
-msgid "Remote Contact Blocklist"
-msgstr "Remote Contact Blokkeerlijst"
-
-#: mod/admin.php:489
-msgid ""
-"This page allows you to prevent any message from a remote contact to reach "
-"your node."
-msgstr "De pagina laat je toe om te vermijden dat boodschappen van een remote contact je node bereiken."
-
-#: mod/admin.php:490
-msgid "Block Remote Contact"
-msgstr "Blokkeer Remote Contact"
-
-#: mod/admin.php:491 mod/admin.php:1875
-msgid "select all"
-msgstr "Alles selecteren"
-
-#: mod/admin.php:492
-msgid "select none"
-msgstr "selecteer geen"
-
-#: mod/admin.php:493 mod/admin.php:1884 mod/contacts.php:638
-#: mod/contacts.php:828 mod/contacts.php:1019
-msgid "Block"
-msgstr "Blokkeren"
-
-#: mod/admin.php:494 mod/admin.php:1886 mod/contacts.php:638
-#: mod/contacts.php:828 mod/contacts.php:1019
-msgid "Unblock"
-msgstr "Blokkering opheffen"
-
-#: mod/admin.php:495
-msgid "No remote contact is blocked from this node."
-msgstr "Geen enkel remote contact is geblokkeerd van deze node."
-
-#: mod/admin.php:497
-msgid "Blocked Remote Contacts"
-msgstr "Geblokkeerde Remote Contacts"
-
-#: mod/admin.php:498
-msgid "Block New Remote Contact"
-msgstr "Blokkeer Nieuwe Remote Contacten"
-
-#: mod/admin.php:499
-msgid "Photo"
-msgstr "Foto"
-
-#: mod/admin.php:499 mod/admin.php:1867 mod/admin.php:1878 mod/admin.php:1892
-#: mod/admin.php:1908 mod/crepair.php:159 mod/settings.php:677
-#: mod/settings.php:703
-msgid "Name"
-msgstr "Naam"
-
-#: mod/admin.php:499 mod/profiles.php:391
-msgid "Address"
-msgstr "Adres"
-
-#: mod/admin.php:499 mod/admin.php:509 mod/contacts.php:657 mod/follow.php:167
-#: mod/notifications.php:169 mod/notifications.php:258 mod/unfollow.php:123
-msgid "Profile URL"
-msgstr "Profiel url"
-
-#: mod/admin.php:507
-#, php-format
-msgid "%s total blocked contact"
-msgid_plural "%s total blocked contacts"
-msgstr[0] "%s geblokkeerde contacten in totaal"
-msgstr[1] "%s geblokkeerde contacten in totaal"
-
-#: mod/admin.php:509
-msgid "URL of the remote contact to block."
-msgstr "URL van de remote contact die je wil blokkeren."
-
-#: mod/admin.php:531
-msgid "Delete this Item"
-msgstr "Verwijder dit Item"
-
-#: mod/admin.php:532
-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 "Op deze pagina kan je een item van je node verwijderen. Als het item een bericht is op het eerste niveau, dan zal de hele gesprek verwijderd worden."
-
-#: mod/admin.php:533
-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 "Je moet de GUID van het item kennen. Je kan het terugvinden bvb. door te kijken naar de getoonde URL. Het laatste deel van http://example.com/display/123456 is de GUID, hier 123456."
-
-#: mod/admin.php:534
-msgid "GUID"
-msgstr "GUID"
-
-#: mod/admin.php:534
-msgid "The GUID of the item you want to delete."
-msgstr "De GUID van het item dat je wil verwijderen."
-
-#: mod/admin.php:568
-msgid "Item marked for deletion."
-msgstr "Item gemarkeerd om te verwijderen."
-
-#: mod/admin.php:639
-msgid "unknown"
-msgstr "onbekend"
-
-#: mod/admin.php:715
-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 "Deze pagina toont je statistieken van het gekende deel van het gefedereerde sociale netwerk waarvan je Friendica node deel uitmaakt. Deze statistieken zijn niet volledig maar reflecteren het deel van het network dat jouw node kent."
-
-#: mod/admin.php:716
-msgid ""
-"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
-"will improve the data displayed here."
-msgstr "Het <em>Automatisch Achterhaalde Contact Gids</em> feature is niet geactiveerd, het zal de hier getoonde informatie verbeteren."
-
-#: mod/admin.php:728
-#, php-format
-msgid ""
-"Currently this node is aware of %d nodes with %d registered users from the "
-"following platforms:"
-msgstr "Op dit moment kent deze node %d nodes met %d geregistreerde gebruikers op basis van de volgende patformen:"
-
-#: mod/admin.php:759 mod/admin.php:797
-msgid "ID"
-msgstr "ID"
-
-#: mod/admin.php:760
-msgid "Recipient Name"
-msgstr "Naam van de Ontvanger"
-
-#: mod/admin.php:761
-msgid "Recipient Profile"
-msgstr "Profiel van de Ontvanger"
-
-#: mod/admin.php:762 view/theme/frio/theme.php:266
-#: src/Core/NotificationsManager.php:176 src/Content/Nav.php:183
-msgid "Network"
-msgstr "Netwerk"
-
-#: mod/admin.php:763 mod/admin.php:799
-msgid "Created"
-msgstr "Aangemaakt"
-
-#: mod/admin.php:764
-msgid "Last Tried"
-msgstr "Laatste poging"
-
-#: mod/admin.php:765
-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 "Deze pagina lijst de inhoud van de wachtrij op voor uitgaande berichten. Dit zijn berichten waarvoor de initiële aflevering faalde. Ze zullen later opnieuw verzonden worden en uiteindelijk verwijderd worden als de aflevering permanent faalt."
-
-#: mod/admin.php:795
-msgid "Inspect Worker Queue"
-msgstr "Taakwachtrij inspecteren"
-
-#: mod/admin.php:798
-msgid "Job Parameters"
-msgstr "Taak parameters"
-
-#: mod/admin.php:800
-msgid "Priority"
-msgstr "Prioriteit"
-
-#: mod/admin.php:801
-msgid ""
-"This page lists the currently queued worker jobs. These jobs are handled by "
-"the worker cronjob you've set up during install."
-msgstr "Deze pagina toont alle taken in de wachtrij. Deze taken worden behandeld door de geplande taak die je hebt ingesteld tijdens installatie."
-
-#: mod/admin.php:825
-#, php-format
-msgid ""
-"Your DB still runs with MyISAM tables. You should change the engine type to "
-"InnoDB. As Friendica will use InnoDB only features in the future, you should"
-" change this! See <a href=\"%s\">here</a> for a guide that may be helpful "
-"converting the table engines. You may also use the command <tt>php "
-"bin/console.php dbstructure toinnodb</tt> of your Friendica installation for"
-" an automatic conversion.<br />"
-msgstr "Je DB opereert nog met MyISAM tabellen. Best is van engine te veranderen naar InnoDB. Aangezien Friendica in de toekomst gebruik zal maken van InnoDB features, zou je dit best aanpassen! Zie <a href=\"%s\">hier</a> voor een gids die je kan helpen om de tabel engines te converteren. Je kan ook het commando<tt>php bin/console.php dbstructure toinnodb</tt> van je Friendica installatie gebruiken voor een automatische conversie.<br />"
-
-#: mod/admin.php:832
-#, 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 "Er is een nieuwe versie van Friendica beschikbaar om te downloaden. Je huidige versie is %1$s, upstream versie is %2$s"
-
-#: mod/admin.php:842
-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 "Database update is mislukt. Gelieve  \"php bin/console.php dbstructure update\" vanaf de command line uit te voeren en de foutmeldingen die zouden kunnen verschijnen na te kijken."
-
-#: mod/admin.php:848
-msgid "The worker was never executed. Please check your database structure!"
-msgstr "De worker werd nooit uitgevoerd. Best je database structuur eens nakijken!"
-
-#: mod/admin.php:851
-#, php-format
-msgid ""
-"The last worker execution was on %s UTC. This is older than one hour. Please"
-" check your crontab settings."
-msgstr "De laatste worker uitvoering was op %s UTC. Dit is langer dan 1 uur geleden. Best je crontab instellingen nakijken."
-
-#: mod/admin.php:857
-#, php-format
-msgid ""
-"Friendica's configuration now is stored in config/local.ini.php, please copy"
-" config/local-sample.ini.php and move your config from "
-"<code>.htconfig.php</code>. See <a href=\"%s\">the Config help page</a> for "
-"help with the transition."
-msgstr "Het configuratiebestand bevind zich nu in config/local.ini.php. Kopieer het bestand config/local-sample.ini.php en verplaats je configuratie uit <code>.htconfig.php</code>. Ga naar de<a href=\"%s\">configuratie help pagina</a> voor hulp bij transitie."
-
-#: mod/admin.php:862
-msgid "Normal Account"
-msgstr "Normaal account"
-
-#: mod/admin.php:863
-msgid "Automatic Follower Account"
-msgstr "Automatische Volger Account"
-
-#: mod/admin.php:864
-msgid "Public Forum Account"
-msgstr "Publiek Forum account"
-
-#: mod/admin.php:865
-msgid "Automatic Friend Account"
-msgstr "Automatisch Vriendschapsaccount"
-
-#: mod/admin.php:866
-msgid "Blog Account"
-msgstr "Blog Account"
-
-#: mod/admin.php:867
-msgid "Private Forum Account"
-msgstr "Privé Forum Account"
-
-#: mod/admin.php:889
-msgid "Message queues"
-msgstr "Bericht-wachtrijen"
-
-#: mod/admin.php:895
-msgid "Summary"
-msgstr "Samenvatting"
-
-#: mod/admin.php:897
-msgid "Registered users"
-msgstr "Geregistreerde gebruikers"
-
-#: mod/admin.php:899
-msgid "Pending registrations"
-msgstr "Registraties die in de wacht staan"
-
-#: mod/admin.php:900
-msgid "Version"
-msgstr "Versie"
-
-#: mod/admin.php:905
-msgid "Active addons"
-msgstr "Actieve addons"
-
-#: mod/admin.php:936
-msgid "Can not parse base url. Must have at least <scheme>://<domain>"
-msgstr "Kan de basis url niet verwerken. Moet minstens zijn <scheme>://<domain>"
-
-#: mod/admin.php:1269
-msgid "Site settings updated."
-msgstr "Site instellingen opgeslagen"
-
-#: mod/admin.php:1296 mod/settings.php:903
-msgid "No special theme for mobile devices"
-msgstr "Geen speciaal thema voor mobiele apparaten"
-
-#: mod/admin.php:1325
-msgid "No community page for local users"
-msgstr "Geen groepspagina voor lokale gebruikers"
-
-#: mod/admin.php:1326
-msgid "No community page"
-msgstr "Geen groepspagina"
-
-#: mod/admin.php:1327
-msgid "Public postings from users of this site"
-msgstr "Publieke berichten van gebruikers van deze site"
-
-#: mod/admin.php:1328
-msgid "Public postings from the federated network"
-msgstr "Publieke berichten van het gefedereerde netwerk"
-
-#: mod/admin.php:1329
-msgid "Public postings from local users and the federated network"
-msgstr "Publieke berichten van lokale gebruikers en van het gefedereerde netwerk"
-
-#: mod/admin.php:1333 mod/admin.php:1500 mod/admin.php:1510
-#: mod/contacts.php:573
-msgid "Disabled"
-msgstr "Uitgeschakeld"
-
-#: mod/admin.php:1335
-msgid "Users, Global Contacts"
-msgstr "Gebruikers, Globale contacten"
-
-#: mod/admin.php:1336
-msgid "Users, Global Contacts/fallback"
-msgstr "Gebruikers, Globale Contacten/noodoplossing"
-
-#: mod/admin.php:1340
-msgid "One month"
-msgstr "Een maand"
-
-#: mod/admin.php:1341
-msgid "Three months"
-msgstr "Drie maanden"
-
-#: mod/admin.php:1342
-msgid "Half a year"
-msgstr "Een half jaar"
-
-#: mod/admin.php:1343
-msgid "One year"
-msgstr "Een jaar"
-
-#: mod/admin.php:1348
-msgid "Multi user instance"
-msgstr "Server voor meerdere gebruikers"
-
-#: mod/admin.php:1374
-msgid "Closed"
-msgstr "Gesloten"
-
-#: mod/admin.php:1375
-msgid "Requires approval"
-msgstr "Toestemming vereist"
-
-#: mod/admin.php:1376
-msgid "Open"
-msgstr "Open"
-
-#: mod/admin.php:1380
-msgid "No SSL policy, links will track page SSL state"
-msgstr "Geen SSL beleid, links zullen SSL status van pagina volgen"
-
-#: mod/admin.php:1381
-msgid "Force all links to use SSL"
-msgstr "Verplicht alle links om SSL te gebruiken"
-
-#: mod/admin.php:1382
-msgid "Self-signed certificate, use SSL for local links only (discouraged)"
-msgstr "Zelf-ondertekend certificaat, gebruik SSL alleen voor lokale links (afgeraden)"
-
-#: mod/admin.php:1386
-msgid "Don't check"
-msgstr "Geen rekening mee houden"
-
-#: mod/admin.php:1387
-msgid "check the stable version"
-msgstr "Neem de stabiele versie in rekening"
-
-#: mod/admin.php:1388
-msgid "check the development version"
-msgstr "Neem de ontwikkel versie in rekening"
-
-#: mod/admin.php:1407
-msgid "Republish users to directory"
-msgstr "Opnieuw de gebruikers naar de gids publiceren"
-
-#: mod/admin.php:1408 mod/register.php:266
-msgid "Registration"
-msgstr "Registratie"
-
-#: mod/admin.php:1409
-msgid "File upload"
-msgstr "Uploaden bestand"
-
-#: mod/admin.php:1410
-msgid "Policies"
-msgstr "Beleid"
-
-#: mod/admin.php:1411 mod/contacts.php:896 mod/events.php:534
-#: src/Model/Profile.php:861
-msgid "Advanced"
-msgstr "Geavanceerd"
-
-#: mod/admin.php:1412
-msgid "Auto Discovered Contact Directory"
-msgstr "Automatisch Achterhaalde Contact Gids"
-
-#: mod/admin.php:1413
-msgid "Performance"
-msgstr "Performantie"
-
-#: mod/admin.php:1414
-msgid "Worker"
-msgstr "Worker"
-
-#: mod/admin.php:1415
-msgid "Message Relay"
-msgstr "Boodschap Relais"
-
-#: mod/admin.php:1416
-msgid ""
-"Relocate - WARNING: advanced function. Could make this server unreachable."
-msgstr "Verhuizen - WAARSCHUWING: geavanceerde functie. Zou deze server onbereikbaar kunnen maken."
-
-#: mod/admin.php:1419
-msgid "Site name"
-msgstr "Site naam"
-
-#: mod/admin.php:1420
-msgid "Host name"
-msgstr "Host naam"
-
-#: mod/admin.php:1421
-msgid "Sender Email"
-msgstr "Verzender Email"
-
-#: mod/admin.php:1421
-msgid ""
-"The email address your server shall use to send notification emails from."
-msgstr "Het email adres als afzender van notificatie emails."
-
-#: mod/admin.php:1422
-msgid "Banner/Logo"
-msgstr "Banner/Logo"
-
-#: mod/admin.php:1423
-msgid "Shortcut icon"
-msgstr "Snelkoppeling icoon"
-
-#: mod/admin.php:1423
-msgid "Link to an icon that will be used for browsers."
-msgstr "Link naar een icoon dat zal gebruikt worden voor browsers."
-
-#: mod/admin.php:1424
-msgid "Touch icon"
-msgstr "Pictogram voor smartphones"
-
-#: mod/admin.php:1424
-msgid "Link to an icon that will be used for tablets and mobiles."
-msgstr "Link naar een icoon dat zal gebruikt worden voor tablets en mobiele telefoons."
-
-#: mod/admin.php:1425
-msgid "Additional Info"
-msgstr "Bijkomende Info"
-
-#: mod/admin.php:1425
-#, php-format
-msgid ""
-"For public servers: you can add additional information here that will be "
-"listed at %s/servers."
-msgstr "Voor publieke servers: je kan bijkomende informatie hier toevoegen die zal opgelijst zijn op %s/servers."
-
-#: mod/admin.php:1426
-msgid "System language"
-msgstr "Systeemtaal"
-
-#: mod/admin.php:1427
-msgid "System theme"
-msgstr "Systeem thema"
-
-#: mod/admin.php:1427
-msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href='#' "
-"id='cnftheme'>change theme settings</a>"
-msgstr "Standaard systeem thema - kan door gebruikersprofielen veranderd worden - <a href='#' id='cnftheme'>verander thema instellingen</a>"
-
-#: mod/admin.php:1428
-msgid "Mobile system theme"
-msgstr "Mobiel systeem thema"
-
-#: mod/admin.php:1428
-msgid "Theme for mobile devices"
-msgstr "Thema voor mobiele apparaten"
-
-#: mod/admin.php:1429
-msgid "SSL link policy"
-msgstr "Beleid SSL-links"
-
-#: mod/admin.php:1429
-msgid "Determines whether generated links should be forced to use SSL"
-msgstr "Bepaald of gegenereerde verwijzingen verplicht SSL moeten gebruiken"
-
-#: mod/admin.php:1430
-msgid "Force SSL"
-msgstr "Dwing SSL af"
-
-#: mod/admin.php:1430
-msgid ""
-"Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
-" to endless loops."
-msgstr "Forceer alle Niet-SSL aanvragen naar SSL - Pas op: dit kan op sommige systeem resulteren in oneindige lussen."
-
-#: mod/admin.php:1431
-msgid "Hide help entry from navigation menu"
-msgstr "Verberg de 'help' uit het navigatiemenu"
-
-#: mod/admin.php:1431
-msgid ""
-"Hides the menu entry for the Help pages from the navigation menu. You can "
-"still access it calling /help directly."
-msgstr "Verbergt het menu-item voor de Help pagina's uit het navigatiemenu. Je kunt ze nog altijd vinden door /help direct in te geven."
-
-#: mod/admin.php:1432
-msgid "Single user instance"
-msgstr "Server voor één gebruiker"
-
-#: mod/admin.php:1432
-msgid "Make this instance multi-user or single-user for the named user"
-msgstr "Stel deze server in voor meerdere gebruikers, of enkel voor de geselecteerde gebruiker."
-
-#: mod/admin.php:1433
-msgid "Maximum image size"
-msgstr "Maximum afbeeldingsgrootte"
-
-#: mod/admin.php:1433
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
-msgstr "Maximum afmeting in bytes van afbeeldingen. Standaard is 0, dus geen beperking."
-
-#: mod/admin.php:1434
-msgid "Maximum image length"
-msgstr "Maximum afbeeldingslengte"
-
-#: mod/admin.php:1434
-msgid ""
-"Maximum length in pixels of the longest side of uploaded images. Default is "
-"-1, which means no limits."
-msgstr "Maximum lengte in pixels van de langste kant van afbeeldingen. Standaard is -1, dus geen beperkingen."
-
-#: mod/admin.php:1435
-msgid "JPEG image quality"
-msgstr "JPEG afbeeldingskwaliteit"
-
-#: mod/admin.php:1435
-msgid ""
-"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
-"100, which is full quality."
-msgstr "JPEGS zullen met deze kwaliteitsinstelling bewaard worden [0-100]. Standaard is 100, dit is volledige kwaliteit."
-
-#: mod/admin.php:1437
-msgid "Register policy"
-msgstr "Registratiebeleid"
-
-#: mod/admin.php:1438
-msgid "Maximum Daily Registrations"
-msgstr "Maximum aantal registraties per dag"
-
-#: mod/admin.php:1438
-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 "Als registratie hierboven is toegelaten, zet dit het maximum aantal registraties van nieuwe gebruikers per dag. Als registratie niet is toegelaten heeft deze instelling geen effect."
-
-#: mod/admin.php:1439
-msgid "Register text"
-msgstr "Registratietekst"
-
-#: mod/admin.php:1439
-msgid ""
-"Will be displayed prominently on the registration page. You can use BBCode "
-"here."
-msgstr "Zal prominent op de registratie pagina getoond worden. Je kan hierin BBCode gebruiken."
-
-#: mod/admin.php:1440
-msgid "Forbidden Nicknames"
-msgstr "Verboden bijnamen"
-
-#: mod/admin.php:1440
-msgid ""
-"Comma separated list of nicknames that are forbidden from registration. "
-"Preset is a list of role names according RFC 2142."
-msgstr "Kommagescheiden lijst van bijnamen die verboden zijn voor registratie. De lijst uit RFC2142 is op voorhand ingesteld."
-
-#: mod/admin.php:1441
-msgid "Accounts abandoned after x days"
-msgstr "Verlaten accounts na x dagen"
-
-#: mod/admin.php:1441
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
-msgstr "Dit zal geen systeembronnen verspillen aan het nakijken van externe sites voor verlaten accounts. Geef 0 is voor geen tijdslimiet."
-
-#: mod/admin.php:1442
-msgid "Allowed friend domains"
-msgstr "Toegelaten vriend domeinen"
-
-#: mod/admin.php:1442
-msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
-msgstr "Komma-gescheiden lijst van domeinen die een vriendschapsband met deze website mogen aangaan. Jokers zijn toegelaten. Laat leeg om alle domeinen toe te laten."
-
-#: mod/admin.php:1443
-msgid "Allowed email domains"
-msgstr "Toegelaten e-mail domeinen"
-
-#: mod/admin.php:1443
-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 "Door komma's gescheiden lijst met e-maildomeinen die op deze website mogen registeren. Wildcards zijn toegestaan.\nLeeg laten om alle domeinen toe te staan."
-
-#: mod/admin.php:1444
-msgid "No OEmbed rich content"
-msgstr "Geen OEmbed richt content"
-
-#: mod/admin.php:1444
-msgid ""
-"Don't show the rich content (e.g. embedded PDF), except from the domains "
-"listed below."
-msgstr "Toon geen rich content (bvb. embedded PDF), behalve van domeinen hieronder opgelijst."
-
-#: mod/admin.php:1445
-msgid "Allowed OEmbed domains"
-msgstr "Sta OEmbed domeinen toe"
-
-#: mod/admin.php:1445
-msgid ""
-"Comma separated list of domains which oembed content is allowed to be "
-"displayed. Wildcards are accepted."
-msgstr "Met komma's gescheiden lijst van domeinen waarvoor oembed content mag getoond worden. Wildcards zijn toegelaten."
-
-#: mod/admin.php:1446
-msgid "Block public"
-msgstr "Openbare toegang blokkeren"
-
-#: mod/admin.php:1446
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently logged in."
-msgstr "Kruis dit aan om alle openbare persoonlijke pagina's alleen toegankelijk te maken voor ingelogde gebruikers."
-
-#: mod/admin.php:1447
-msgid "Force publish"
-msgstr "Dwing publiceren af"
-
-#: mod/admin.php:1447
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr "Kruis dit aan om af te dwingen dat alle profielen op deze website in de gids van deze website gepubliceerd worden."
-
-#: mod/admin.php:1447
-msgid "Enabling this may violate privacy laws like the GDPR"
-msgstr "Dit activeren zou privacy wetten zoals GDPR (AVG) kunnen overtreden"
-
-#: mod/admin.php:1448
-msgid "Global directory URL"
-msgstr "Algemene gids URL"
-
-#: mod/admin.php:1448
-msgid ""
-"URL to the global directory. If this is not set, the global directory is "
-"completely unavailable to the application."
-msgstr "URL naar de globale gids. Als dit niet geconfigureerd is, dan zal de globale gids volledig onbeschikbaar zijn voor de applicatie."
-
-#: mod/admin.php:1449
-msgid "Private posts by default for new users"
-msgstr "Privéberichten als standaard voor nieuwe gebruikers"
-
-#: mod/admin.php:1449
-msgid ""
-"Set default post permissions for all new members to the default privacy "
-"group rather than public."
-msgstr "Stel de standaardrechten van berichten voor nieuwe leden op de standaard privacygroep in, in plaats van openbaar."
-
-#: mod/admin.php:1450
-msgid "Don't include post content in email notifications"
-msgstr "De inhoud van het bericht niet insluiten bij e-mailnotificaties"
-
-#: mod/admin.php:1450
-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 "De inhoud van berichten/commentaar/privéberichten/enzovoort  niet insluiten in e-mailnotificaties die door deze website verzonden worden, voor de bescherming van je privacy."
-
-#: mod/admin.php:1451
-msgid "Disallow public access to addons listed in the apps menu."
-msgstr "Publieke toegang ontzeggen tot addons die opgelijst zijn in het applicatie menu."
-
-#: mod/admin.php:1451
-msgid ""
-"Checking this box will restrict addons listed in the apps menu to members "
-"only."
-msgstr "Dit vakje aanvinken zal de lijst van addons in het applicatie menu beperken tot alleen leden."
-
-#: mod/admin.php:1452
-msgid "Don't embed private images in posts"
-msgstr "Privé beelden in berichten niet inwerken"
-
-#: mod/admin.php:1452
-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 "Vervang lokaal gehoste privé foto's in berichten niet door een ingewerkte kopie van het beeld. Dit betekent dat contacten die berichten krijgen met privé foto's zullen moeten authentificeren en elk beeld apart laden, wat een tijdje kan duren."
-
-#: mod/admin.php:1453
-msgid "Explicit Content"
-msgstr "Expliciete inhoud"
-
-#: mod/admin.php:1453
-msgid ""
-"Set this to announce that your node is used mostly for explicit content that"
-" might not be suited for minors. This information will be published in the "
-"node information and might be used, e.g. by the global directory, to filter "
-"your node from listings of nodes to join. Additionally a note about this "
-"will be shown at the user registration page."
-msgstr "Vink dit aan om aan te duiden dat deze node veel expliciet materiaal verspreid en niet bedoeld is voor minderjarigen. Deze info zal gepubliceert worden bij de node-info en kan vb. gebruikt worden voor een filter in de globale lijst. Dit word ook getoont naar de gebruiker op de registratie pagina."
-
-#: mod/admin.php:1454
-msgid "Allow Users to set remote_self"
-msgstr "Sta Gebruikers toe om remote_self te configureren"
-
-#: mod/admin.php:1454
-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 "Als je dit aanvinkt, dan mag elke gebruiker elke contact als remote_self aanduiden in de 'herstel contact' dialoog. Deze vlag aanzetten voor een contact zorgt ervoor dat elke bericht van dit contact gespiegeld wordt in de gebruiker zijn of haar stroom. "
-
-#: mod/admin.php:1455
-msgid "Block multiple registrations"
-msgstr "Blokkeer meerdere registraties"
-
-#: mod/admin.php:1455
-msgid "Disallow users to register additional accounts for use as pages."
-msgstr "Laat niet toe dat gebruikers meerdere accounts aanmaken."
-
-#: mod/admin.php:1456
-msgid "OpenID support"
-msgstr "OpenID ondersteuning"
-
-#: mod/admin.php:1456
-msgid "OpenID support for registration and logins."
-msgstr "OpenID ondersteuning voor registraties en logins."
-
-#: mod/admin.php:1457
-msgid "Fullname check"
-msgstr "Controleer volledige naam"
-
-#: mod/admin.php:1457
-msgid ""
-"Force users to register with a space between firstname and lastname in Full "
-"name, as an antispam measure"
-msgstr "Verplicht gebruikers om zich te registreren met een spatie tussen voornaam en achternaam, als anti-spam maatregel"
-
-#: mod/admin.php:1458
-msgid "Community pages for visitors"
-msgstr "Groepspagina voor bezoekers"
-
-#: mod/admin.php:1458
-msgid ""
-"Which community pages should be available for visitors. Local users always "
-"see both pages."
-msgstr "Welke groepspagina's moeten beschikbaar zijn voor bezoekers. Lokale gebruikers zien altijd beide pagina's."
-
-#: mod/admin.php:1459
-msgid "Posts per user on community page"
-msgstr "Berichten per gebruiker op de groepspagina"
-
-#: mod/admin.php:1459
-msgid ""
-"The maximum number of posts per user on the community page. (Not valid for "
-"'Global Community')"
-msgstr "Het maximum aantal berichten per gebruiker op de groepspagina. (Niet geldig voor 'Globale Gemeenschap')"
-
-#: mod/admin.php:1460
-msgid "Enable OStatus support"
-msgstr "OStatus ondersteuning activeren"
-
-#: mod/admin.php:1460
-msgid ""
-"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
-"communications in OStatus are public, so privacy warnings will be "
-"occasionally displayed."
-msgstr "Verschaf ingebouwde OStatus (StatusNet, GNU Social enz.) compatibiliteit. Alle communicatie in OStatus is publiek, dus privacy waarschuwingen zullen occasioneel getoond worden."
-
-#: mod/admin.php:1461
-msgid "Only import OStatus threads from our contacts"
-msgstr "Alleen OStatus gesprekken importeren van onze contacten"
-
-#: mod/admin.php:1461
-msgid ""
-"Normally we import every content from our OStatus contacts. With this option"
-" we only store threads that are started by a contact that is known on our "
-"system."
-msgstr "Normaalgezien importeren we alle content van onze OStatus contacten. Met deze optie slaan we alleen gesprekken op die gestart zijn door een contact dat gekend is in ons systeem."
-
-#: mod/admin.php:1462
-msgid "OStatus support can only be enabled if threading is enabled."
-msgstr "OStatus ondersteuning kan alleen geactiveerd worden als de gespreksstroom geactiveerd is."
-
-#: mod/admin.php:1464
-msgid ""
-"Diaspora support can't be enabled because Friendica was installed into a sub"
-" directory."
-msgstr "Diaspora ondersteuning is niet mogelijk omdat Friendica in een sub folder geïnstalleerd is."
-
-#: mod/admin.php:1465
-msgid "Enable Diaspora support"
-msgstr "Diaspora ondersteuning activeren"
-
-#: mod/admin.php:1465
-msgid "Provide built-in Diaspora network compatibility."
-msgstr "Bied ingebouwde ondersteuning voor het Diaspora netwerk."
-
-#: mod/admin.php:1466
-msgid "Only allow Friendica contacts"
-msgstr "Laat alleen Friendica contacten toe"
-
-#: mod/admin.php:1466
-msgid ""
-"All contacts must use Friendica protocols. All other built-in communication "
-"protocols disabled."
-msgstr "Alle contacten moeten een Friendica protocol gebruiken. Alle andere ingebouwde communicatieprotocols worden uitgeschakeld."
-
-#: mod/admin.php:1467
-msgid "Verify SSL"
-msgstr "Controleer SSL"
-
-#: mod/admin.php:1467
-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 "Als je wilt kun je striktere certificaat controle activeren. Dit betekent dat je (totaal) niet kunt connecteren met sites die zelf-ondertekende SSL certificaten gebruiken."
-
-#: mod/admin.php:1468
-msgid "Proxy user"
-msgstr "Proxy-gebruiker"
-
-#: mod/admin.php:1469
-msgid "Proxy URL"
-msgstr "Proxy-URL"
-
-#: mod/admin.php:1470
-msgid "Network timeout"
-msgstr "Netwerk timeout"
-
-#: mod/admin.php:1470
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr "Waarde is in seconden. Zet op 0 voor onbeperkt (niet aanbevolen)."
-
-#: mod/admin.php:1471
-msgid "Maximum Load Average"
-msgstr "Maximum gemiddelde belasting"
-
-#: mod/admin.php:1471
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
-msgstr "Maximum systeembelasting voordat aflever- en poll-processen uitgesteld worden - standaard 50."
-
-#: mod/admin.php:1472
-msgid "Maximum Load Average (Frontend)"
-msgstr "Maximum Gemiddelde Belasting (Frontend)"
-
-#: mod/admin.php:1472
-msgid "Maximum system load before the frontend quits service - default 50."
-msgstr "Maximum systeem belasting wanneer de frontend ermee ophoudt - standaard waarde 50."
-
-#: mod/admin.php:1473
-msgid "Minimal Memory"
-msgstr "Minimaal Geheugen"
-
-#: mod/admin.php:1473
-msgid ""
-"Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
-"default 0 (deactivated)."
-msgstr "Minimum vrij geheugen in MB voor de worker. Toegang nodig tot /proc/meminfo - standaard waarde 0 (gedeactiveerd)."
-
-#: mod/admin.php:1474
-msgid "Maximum table size for optimization"
-msgstr "Maximum tabel grootte voor optimisatie"
-
-#: mod/admin.php:1474
-msgid ""
-"Maximum table size (in MB) for the automatic optimization. Enter -1 to "
-"disable it."
-msgstr "Maximum tabel grootte (in MB) voor de automatisch optimisatie. Geef -1 op om dit te deactiveren."
-
-#: mod/admin.php:1475
-msgid "Minimum level of fragmentation"
-msgstr "Minimum niveau van fragmentatie"
-
-#: mod/admin.php:1475
-msgid ""
-"Minimum fragmenation level to start the automatic optimization - default "
-"value is 30%."
-msgstr "Minimum fragmentatie niveau om de automatische optimisatie te starten - standaard waarde is 30%."
-
-#: mod/admin.php:1477
-msgid "Periodical check of global contacts"
-msgstr "Regematige controle van de globale contacten"
-
-#: mod/admin.php:1477
-msgid ""
-"If enabled, the global contacts are checked periodically for missing or "
-"outdated data and the vitality of the contacts and servers."
-msgstr "Als dit geactiveerd is, dan worden de globale contacten regelmatig gecheckt naar ontbrekende of verlopen data and the vitaliteit van de contacten en servers."
-
-#: mod/admin.php:1478
-msgid "Days between requery"
-msgstr "Dagen tussen herbevraging"
-
-#: mod/admin.php:1478
-msgid "Number of days after which a server is requeried for his contacts."
-msgstr "Aantal dagen waarna de server opnieuw bevraagd wordt naar zijn contacten."
-
-#: mod/admin.php:1479
-msgid "Discover contacts from other servers"
-msgstr "Ontdek contacten van andere servers"
-
-#: mod/admin.php:1479
-msgid ""
-"Periodically query other servers for contacts. You can choose between "
-"'users': the users on the remote system, 'Global Contacts': active contacts "
-"that are known on the system. The fallback is meant for Redmatrix servers "
-"and older friendica servers, where global contacts weren't available. The "
-"fallback increases the server load, so the recommened setting is 'Users, "
-"Global Contacts'."
-msgstr "Bevraag andere servers regelmatig naar contacten. Je kan kiezen tussen 'gebruikers': de gebruikers op het remote systeem, 'Globale contacten': actieve contacten die gekend zijn op het systeem. De noodoplossing is bedoeld voor Redmatrix servers en oude Friendica servers, waarop globale contacten niet bestonden. De noodoplossing veroorzaakt meer belasting van de server, dus de aanbevolen configuratie is 'Gebruikers, Globale contacten'."
-
-#: mod/admin.php:1480
-msgid "Timeframe for fetching global contacts"
-msgstr "Tijdspanne voor het ophalen van globale contacten"
-
-#: mod/admin.php:1480
-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 "Wanneer ontdekking is geactiveerd, dan definieert deze waarde de tijdspanne voor de activiteit van globale contacten die opgehaald worden van andere servers."
-
-#: mod/admin.php:1481
-msgid "Search the local directory"
-msgstr "Doorzoek de lokale gids"
-
-#: mod/admin.php:1481
-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 "Doorzoek de lokale gids in plaats van de globale gids. Bij lokale doorzoeking wordt elke opzoeking in de globale gids op de achtergrond uitgevoerd. Dit verbetert de zoekresultaten wanneer de zoekopdracht herhaald wordt."
-
-#: mod/admin.php:1483
-msgid "Publish server information"
-msgstr "Publiceer server informatie"
-
-#: mod/admin.php:1483
-msgid ""
-"If enabled, general server and usage data will be published. The data "
-"contains the name and version of the server, number of users with public "
-"profiles, number of posts and the activated protocols and connectors. See <a"
-" href='http://the-federation.info/'>the-federation.info</a> for details."
-msgstr "Als deze optie geactiveerd is, dan zal algemene server en gebruiksdata gepubliceerd worden. De data bevat de naam en versie van de server, het aantal gebruikers met publieke profielen, het aantal berichten en de geactiveerd protocollen en connectoren. Zie <a href='http://the-federation.info/'>the-federation.info</a> voor details."
-
-#: mod/admin.php:1485
-msgid "Check upstream version"
-msgstr "Controleer upstream versie"
-
-#: mod/admin.php:1485
-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 "Activeer het controleren op nieuwe versies van Friendica bij github. Als er een nieuwe versie is, dan word je geïnformeerd in the administratie paneel."
-
-#: mod/admin.php:1486
-msgid "Suppress Tags"
-msgstr "Onderdruk Tags"
-
-#: mod/admin.php:1486
-msgid "Suppress showing a list of hashtags at the end of the posting."
-msgstr "Onderdruk het tonen van een lijst van hastags op het einde van het bericht."
-
-#: mod/admin.php:1487
-msgid "Clean database"
-msgstr "Database opruimen"
-
-#: mod/admin.php:1487
-msgid ""
-"Remove old remote items, orphaned database records and old content from some"
-" other helper tables."
-msgstr "Verwijder oude remote items, database weesrecords en oude content van andere helper tabellen."
-
-#: mod/admin.php:1488
-msgid "Lifespan of remote items"
-msgstr "Levensduur van remote items"
-
-#: mod/admin.php:1488
-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 "Als de database opruiming is geactiveerd, dan definieert dit na hoeveel dagen remote items verwijderd zullen worden. Eigen items, en gemarkeerde of opgeslagen items worden altijd behouden. 0 deactiveert dit gedrag."
-
-#: mod/admin.php:1489
-msgid "Lifespan of unclaimed items"
-msgstr "Levensduur van niet geclaimde items"
-
-#: mod/admin.php:1489
-msgid ""
-"When the database cleanup is enabled, this defines the days after which "
-"unclaimed remote items (mostly content from the relay) will be deleted. "
-"Default value is 90 days. Defaults to the general lifespan value of remote "
-"items if set to 0."
-msgstr "Als de database opruiming geactiveerd is, dan definieert dit na hoeveel dagen ongeclaimde remote items (meestal content van een relais) zal verwijderd worden. Standaard waarde is 90 dagen. Als de waarde 0 is, dan is de waarde gelijk aan de algemene levensduur van remote items."
-
-#: mod/admin.php:1490
-msgid "Path to item cache"
-msgstr "Pad naar cache voor items"
-
-#: mod/admin.php:1490
-msgid "The item caches buffers generated bbcode and external images."
-msgstr "Item caches bufferen gegenereerde bbcodes en externe beelden."
-
-#: mod/admin.php:1491
-msgid "Cache duration in seconds"
-msgstr "Cache tijdsduur in seconden"
-
-#: mod/admin.php:1491
-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 "Hoe lang moeten de cache bestanden bijgehouden worden? Standaard waarde is 86400 seconden (een dag). Zet de waarde op -1 om de item cache te deactiveren."
-
-#: mod/admin.php:1492
-msgid "Maximum numbers of comments per post"
-msgstr "Maximum aantal reacties per bericht"
-
-#: mod/admin.php:1492
-msgid "How much comments should be shown for each post? Default value is 100."
-msgstr "Hoeveel reacties moeten getoond worden per bericht? Standaard waarde is 100."
-
-#: mod/admin.php:1493
-msgid "Temp path"
-msgstr "Tijdelijk pad"
-
-#: mod/admin.php:1493
-msgid ""
-"If you have a restricted system where the webserver can't access the system "
-"temp path, enter another path here."
-msgstr "Als je een systeem met restricties hebt waarbij de webserver geen toegang heeft tot het systeem pad, geef hier dan een ander pad in. "
-
-#: mod/admin.php:1494
-msgid "Base path to installation"
-msgstr "Basispad voor installatie"
-
-#: mod/admin.php:1494
-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 "Als het systeem het correcte pad naar je installatie niet kan detecteren, geef hier dan het correcte pad in. Deze instelling zou alleen geconfigureerd moeten worden als je een systeem met restricties hebt en symbolische links naar je webroot."
-
-#: mod/admin.php:1495
-msgid "Disable picture proxy"
-msgstr "Schakel beeld proxy uit"
-
-#: mod/admin.php:1495
-msgid ""
-"The picture proxy increases performance and privacy. It shouldn't be used on"
-" systems with very low bandwidth."
-msgstr "De beeld proxy verhoogt de performantie en privacy. Gebruik dit niet op systemen met erg lage bandbreedte."
-
-#: mod/admin.php:1496
-msgid "Only search in tags"
-msgstr "Zoek alleen in tags"
-
-#: mod/admin.php:1496
-msgid "On large systems the text search can slow down the system extremely."
-msgstr "Het opzoeken van tekst kan grote systemen extreem vertragen."
-
-#: mod/admin.php:1498
-msgid "New base url"
-msgstr "Nieuwe basis url"
-
-#: mod/admin.php:1498
-msgid ""
-"Change base url for this server. Sends relocate message to all Friendica and"
-" Diaspora* contacts of all users."
-msgstr "Verander de basis url voor deze server. Stuurt een verhuis boodschap naar all Friendica en Diaspora* contacten."
-
-#: mod/admin.php:1500
-msgid "RINO Encryption"
-msgstr "RINO encryptie"
-
-#: mod/admin.php:1500
-msgid "Encryption layer between nodes."
-msgstr "Encryptie laag tussen nodes."
-
-#: mod/admin.php:1500
-msgid "Enabled"
-msgstr "Geactiveerd"
-
-#: mod/admin.php:1502
-msgid "Maximum number of parallel workers"
-msgstr "Maximum aantal parallelle workers"
-
-#: mod/admin.php:1502
-#, php-format
-msgid ""
-"On shared hosters set this to %d. On larger systems, values of %d are great."
-" Default value is %d."
-msgstr "Op gedeelde hosts zet dit op %d. Op grotere systemen, waarden als %d zijn goed. standaard waarde is %d"
-
-#: mod/admin.php:1503
-msgid "Don't use 'proc_open' with the worker"
-msgstr "Gebruik 'proc_open' niet met de worker"
-
-#: mod/admin.php:1503
-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 "Activeer dit als je systeem het gebruik van 'proc_open' niet toelaat. Dit kan het geval zijn op gedeelde hosts. Als dit geactiveerd is, dan verhoog je best ook de frequentie van de oproepen naar de workers in je crontab."
-
-#: mod/admin.php:1504
-msgid "Enable fastlane"
-msgstr "Activeer fastlane"
-
-#: mod/admin.php:1504
-msgid ""
-"When enabed, the fastlane mechanism starts an additional worker if processes"
-" with higher priority are blocked by processes of lower priority."
-msgstr "Als deze parameter geactiveerd is, dan start het fastlane mechanisme een bijkomende worker als processen met hogere prioriteit geblokkeerd worden door processen met een lagere prioriteit."
-
-#: mod/admin.php:1505
-msgid "Enable frontend worker"
-msgstr "Activeer frontend worker"
-
-#: mod/admin.php:1505
-#, php-format
-msgid ""
-"When enabled the Worker process is triggered when backend access is "
-"performed \\x28e.g. messages being delivered\\x29. On smaller sites you "
-"might want to call %s/worker on a regular basis via an external cron job. "
-"You should only enable this option if you cannot utilize cron/scheduled jobs"
-" on your server."
-msgstr "Als deze parameter geactiveerd is, dan wordt het Worker proces getriggerd wanneer toegang wordt verkregen tot de backend \\x28bvb. boodschappen die geleverd worden\\x29. Op kleinere sites zal je mogelijks opteren om %s/worker op regelmatige basis via een externe geplande taak op te roepen. Activeer deze optie alleen als je cron/geplande taken op je server niet kan gebruiken."
-
-#: mod/admin.php:1507
-msgid "Subscribe to relay"
-msgstr "Schrijf in op relais"
-
-#: mod/admin.php:1507
-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 "Activeert het ontvangen van publieke berichten vanwege de relais. Ze zullen inbegrepen zijn in de zoekresultaten, tags waarop je ingeschreven bent en op de globale groepspagina."
-
-#: mod/admin.php:1508
-msgid "Relay server"
-msgstr "Relais server"
-
-#: mod/admin.php:1508
-msgid ""
-"Address of the relay server where public posts should be send to. For "
-"example https://relay.diasp.org"
-msgstr "Adres van de relais server waar publieke berichten naartoe moeten gezonden worden. Bijvoorbeeld https://relay.diasp.org"
-
-#: mod/admin.php:1509
-msgid "Direct relay transfer"
-msgstr "Directe relais transfer"
-
-#: mod/admin.php:1509
-msgid ""
-"Enables the direct transfer to other servers without using the relay servers"
-msgstr "Activeert directe relais transfer naar andere servers zonder gebruik van relais servers"
-
-#: mod/admin.php:1510
-msgid "Relay scope"
-msgstr "Scope van de relais"
-
-#: mod/admin.php:1510
-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 "Kan 'alle' of 'tags' zijn. 'alle' betekent dat elk publiek bericht ontvangen moet worden. 'tags' betekent dat alleen berichten met geselecteerde tags moeten ontvangen worden."
-
-#: mod/admin.php:1510
-msgid "all"
-msgstr "alle"
-
-#: mod/admin.php:1510
-msgid "tags"
-msgstr "tags"
-
-#: mod/admin.php:1511
-msgid "Server tags"
-msgstr "Server tags"
-
-#: mod/admin.php:1511
-msgid "Comma separated list of tags for the 'tags' subscription."
-msgstr "Door komma's gescheiden lijst van tags voor de 'tags' inschrijving."
-
-#: mod/admin.php:1512
-msgid "Allow user tags"
-msgstr "Sta gebruiker tags toe."
-
-#: mod/admin.php:1512
-msgid ""
-"If enabled, the tags from the saved searches will used for the 'tags' "
-"subscription in addition to the 'relay_server_tags'."
-msgstr "Als deze parameter geactiveerd is, dan zullen de tags uit de opgeslagen zoekresultaten gebruikt worden voor de 'tags' inschrijving bovenop de 'relais_server_tags'."
-
-#: mod/admin.php:1515
-msgid "Start Relocation"
-msgstr "Start verhuis"
-
-#: mod/admin.php:1541
-msgid "Update has been marked successful"
-msgstr "Wijziging succesvol gemarkeerd "
-
-#: mod/admin.php:1548
-#, php-format
-msgid "Database structure update %s was successfully applied."
-msgstr "Database structuur update %s werd met succes toegepast."
-
-#: mod/admin.php:1551
-#, php-format
-msgid "Executing of database structure update %s failed with error: %s"
-msgstr "Uitvoering van de database structuur update %s is mislukt met fout: %s"
-
-#: mod/admin.php:1567
-#, php-format
-msgid "Executing %s failed with error: %s"
-msgstr "Uitvoering van %s mislukt met fout: %s"
-
-#: mod/admin.php:1569
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr "Wijziging %s geslaagd."
-
-#: mod/admin.php:1572
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr "Wijziging %s gaf geen status terug. We weten niet of de wijziging geslaagd is."
-
-#: mod/admin.php:1575
-#, php-format
-msgid "There was no additional update function %s that needed to be called."
-msgstr "Er was geen bijkomende update functie %s die moest opgeroepen worden."
-
-#: mod/admin.php:1598
-msgid "No failed updates."
-msgstr "Geen mislukte wijzigingen"
-
-#: mod/admin.php:1599
-msgid "Check database structure"
-msgstr "Controleer de database structuur"
-
-#: mod/admin.php:1604
-msgid "Failed Updates"
-msgstr "Mislukte wijzigingen"
-
-#: mod/admin.php:1605
-msgid ""
-"This does not include updates prior to 1139, which did not return a status."
-msgstr "Dit is zonder de wijzigingen voor 1139, welke geen status teruggaven."
-
-#: mod/admin.php:1606
-msgid "Mark success (if update was manually applied)"
-msgstr "Markeren als succes (als aanpassing manueel doorgevoerd werd)"
-
-#: mod/admin.php:1607
-msgid "Attempt to execute this update step automatically"
-msgstr "Probeer deze stap automatisch uit te voeren"
-
-#: mod/admin.php:1646
-#, php-format
-msgid ""
-"\n"
-"\t\t\tDear %1$s,\n"
-"\t\t\t\tthe administrator of %2$s has set up an account for you."
-msgstr "\n\t\t\tBeste %1$s,\n\t\t\t\tde beheerder van %2$s heeft een account aangemaakt voor jou."
-
-#: mod/admin.php:1649
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe login details are as follows:\n"
-"\n"
-"\t\t\tSite Location:\t%1$s\n"
-"\t\t\tLogin Name:\t\t%2$s\n"
-"\t\t\tPassword:\t\t%3$s\n"
-"\n"
-"\t\t\tYou may change your password from your account \"Settings\" page after logging\n"
-"\t\t\tin.\n"
-"\n"
-"\t\t\tPlease take a few moments to review the other account settings on that page.\n"
-"\n"
-"\t\t\tYou may also wish to add some basic information to your default profile\n"
-"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
-"\n"
-"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
-"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
-"\t\t\tperhaps what country you live in; if you do not wish to be more specific\n"
-"\t\t\tthan that.\n"
-"\n"
-"\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
-"\t\t\tIf you are new and do not know anybody here, they may help\n"
-"\t\t\tyou to make some new and interesting friends.\n"
-"\n"
-"\t\t\tIf you ever want to delete your account, you can do so at %1$s/removeme\n"
-"\n"
-"\t\t\tThank you and welcome to %4$s."
-msgstr "\n\t\t\tDe login details zijn de volgende:\n\n\t\t\tSite Locatie:\t%1$s\n\t\t\tLogin Naam:\t\t%2$s\n\t\t\tPaswoord:\t\t%3$s\n\n\t\t\tJe kan je paswoord in je account \"Instellingen\" pagina aanpassen \nnadat je ingelogd bent\n\t\t\tNeem alstublieft een ogenblik om de andere account instellingen op die pagina na te kijken.\n\n\t\t\tMisschien wil je ook wat basis informatie toevoegen aan je standaard profiel\n\t\t\t(op de \"Profielen\" pagina) zodat anderen je gemakkelijk kunnen terugvinden.\n\n\t\t\tWe raden aan je volledige naam in te stellen, een profiel foto toe te voegen,\n\t\t\tenkele \"sleutelwoorden\" toe te voegen (zeer handig om nieuwe vrienden te maken) - en\n\t\t\tmisschien ook in welk land je woont; als je liever niet specifieker \nbent dan dat.\n\n\n\t\t\tWe respecteren ten volle je recht op privacy, en geen van deze items is verplicht.\n\t\t\tAls je nieuw bent hier en niemand kent, dan kunnen zij je mogelijks helpen\n\t\t\tom enkele nieuwe en interessante vrienden te leren kennen.\n\n\t\t\tAls je ooit je account wil verwijderen, dan kan dat via %1$s/removeme\n\n\t\t\tBedankt en welkom bij %4$s."
-
-#: mod/admin.php:1683 src/Model/User.php:702
-#, php-format
-msgid "Registration details for %s"
-msgstr "Registratie details voor %s"
-
-#: mod/admin.php:1693
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] "%s gebruiker geblokkeerd/niet geblokkeerd"
-msgstr[1] "%s gebruikers geblokkeerd/niet geblokkeerd"
-
-#: mod/admin.php:1699
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] "%s gebruiker verwijderd"
-msgstr[1] "%s gebruikers verwijderd"
-
-#: mod/admin.php:1746
-#, php-format
-msgid "User '%s' deleted"
-msgstr "Gebruiker '%s' verwijderd"
-
-#: mod/admin.php:1754
-#, php-format
-msgid "User '%s' unblocked"
-msgstr "Gebruiker '%s' niet meer geblokkeerd"
-
-#: mod/admin.php:1754
-#, php-format
-msgid "User '%s' blocked"
-msgstr "Gebruiker '%s' geblokkeerd"
-
-#: mod/admin.php:1811 mod/settings.php:1064
-msgid "Normal Account Page"
-msgstr "Normale accountpagina"
-
-#: mod/admin.php:1812 mod/settings.php:1068
-msgid "Soapbox Page"
-msgstr "Zeepkist-pagina"
-
-#: mod/admin.php:1813 mod/settings.php:1072
-msgid "Public Forum"
-msgstr "Publiek Forum"
-
-#: mod/admin.php:1814 mod/settings.php:1076
-msgid "Automatic Friend Page"
-msgstr "Automatisch Vriendschapspagina"
-
-#: mod/admin.php:1815
-msgid "Private Forum"
-msgstr "Privé Forum"
-
-#: mod/admin.php:1818 mod/settings.php:1048
-msgid "Personal Page"
-msgstr "Persoonlijke pagina"
-
-#: mod/admin.php:1819 mod/settings.php:1052
-msgid "Organisation Page"
-msgstr "Organisatie Pagina"
-
-#: mod/admin.php:1820 mod/settings.php:1056
-msgid "News Page"
-msgstr "Nieuws pagina"
-
-#: mod/admin.php:1821 mod/settings.php:1060
-msgid "Community Forum"
-msgstr "Groepsforum"
-
-#: mod/admin.php:1867 mod/admin.php:1878 mod/admin.php:1892 mod/admin.php:1910
-#: src/Content/ContactSelector.php:80
-msgid "Email"
-msgstr "E-mail"
-
-#: mod/admin.php:1867 mod/admin.php:1892
-msgid "Register date"
-msgstr "Registratiedatum"
-
-#: mod/admin.php:1867 mod/admin.php:1892
-msgid "Last login"
-msgstr "Laatste login"
-
-#: mod/admin.php:1867 mod/admin.php:1892
-msgid "Last item"
-msgstr "Laatste item"
-
-#: mod/admin.php:1867
-msgid "Type"
-msgstr "Type"
-
-#: mod/admin.php:1874
-msgid "Add User"
-msgstr "Gebruiker toevoegen"
-
-#: mod/admin.php:1876
-msgid "User registrations waiting for confirm"
-msgstr "Gebruikersregistraties wachten op een bevestiging"
-
-#: mod/admin.php:1877
-msgid "User waiting for permanent deletion"
-msgstr "Gebruiker wacht op permanente verwijdering"
-
-#: mod/admin.php:1878
-msgid "Request date"
-msgstr "Registratiedatum"
-
-#: mod/admin.php:1879
-msgid "No registrations."
-msgstr "Geen registraties."
-
-#: mod/admin.php:1880
-msgid "Note from the user"
-msgstr "Nota van de gebruiker"
-
-#: mod/admin.php:1881 mod/notifications.php:174 mod/notifications.php:264
-msgid "Approve"
-msgstr "Goedkeuren"
-
-#: mod/admin.php:1882
-msgid "Deny"
-msgstr "Weiger"
-
-#: mod/admin.php:1885
-msgid "User blocked"
-msgstr "Gebruiker geblokeerd"
-
-#: mod/admin.php:1887
-msgid "Site admin"
-msgstr "Sitebeheerder"
-
-#: mod/admin.php:1888
-msgid "Account expired"
-msgstr "Account verlopen"
-
-#: mod/admin.php:1891
-msgid "New User"
-msgstr "Nieuwe gebruiker"
-
-#: mod/admin.php:1892
-msgid "Deleted since"
-msgstr "Verwijderd sinds"
-
-#: mod/admin.php:1897
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Geselecteerde gebruikers zullen verwijderd worden!\\n\\nAlles wat deze gebruikers gepost hebben op deze website zal permanent verwijderd worden!\\n\\nBen je zeker?"
-
-#: mod/admin.php:1898
-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 "De gebruiker {0} zal verwijderd worden!\\n\\nAlles wat deze gebruiker gepost heeft op deze website zal permanent verwijderd worden!\\n\\nBen je zeker?"
-
-#: mod/admin.php:1908
-msgid "Name of the new user."
-msgstr "Naam van nieuwe gebruiker"
-
-#: mod/admin.php:1909
-msgid "Nickname"
-msgstr "Bijnaam"
-
-#: mod/admin.php:1909
-msgid "Nickname of the new user."
-msgstr "Bijnaam van nieuwe gebruiker"
-
-#: mod/admin.php:1910
-msgid "Email address of the new user."
-msgstr "E-mailadres van nieuwe gebruiker"
-
-#: mod/admin.php:1952
-#, php-format
-msgid "Addon %s disabled."
-msgstr "Addon %s gedeactiveerd"
-
-#: mod/admin.php:1956
-#, php-format
-msgid "Addon %s enabled."
-msgstr "Addon %s geactiveerd"
-
-#: mod/admin.php:1966 mod/admin.php:2215
-msgid "Disable"
-msgstr "Uitschakelen"
-
-#: mod/admin.php:1969 mod/admin.php:2218
-msgid "Enable"
-msgstr "Inschakelen"
-
-#: mod/admin.php:1991 mod/admin.php:2261
-msgid "Toggle"
-msgstr "Schakelaar"
-
-#: mod/admin.php:1999 mod/admin.php:2270
-msgid "Author: "
-msgstr "Auteur:"
-
-#: mod/admin.php:2000 mod/admin.php:2271
-msgid "Maintainer: "
-msgstr "Onderhoud:"
-
-#: mod/admin.php:2052
-msgid "Reload active addons"
-msgstr "Herlaad actieve addons"
-
-#: mod/admin.php:2057
-#, php-format
-msgid ""
-"There are currently no addons available on your node. You can find the "
-"official addon repository at %1$s and might find other interesting addons in"
-" the open addon registry at %2$s"
-msgstr "Er zijn op je node momenteel geen addons beschikbaar. Je kan de officiële addon repository vinden op %1$s en je kan mogelijks nog andere interessante addons vinden in de open addon registry op %2$s"
-
-#: mod/admin.php:2177
-msgid "No themes found."
-msgstr "Geen thema's gevonden."
-
-#: mod/admin.php:2252
-msgid "Screenshot"
-msgstr "Schermafdruk"
-
-#: mod/admin.php:2306
-msgid "Reload active themes"
-msgstr "Herlaad actieve thema's"
-
-#: mod/admin.php:2311
-#, php-format
-msgid "No themes found on the system. They should be placed in %1$s"
-msgstr "Geen thema's gevonden op het systeem. Ze zouden zich moeten bevinden in %1$s"
-
-#: mod/admin.php:2312
-msgid "[Experimental]"
-msgstr "[Experimenteel]"
-
-#: mod/admin.php:2313
-msgid "[Unsupported]"
-msgstr "[Niet ondersteund]"
-
-#: mod/admin.php:2337
-msgid "Log settings updated."
-msgstr "Log instellingen opgeslagen"
-
-#: mod/admin.php:2370
-msgid "PHP log currently enabled."
-msgstr "PHP log momenteel geactiveerd"
-
-#: mod/admin.php:2372
-msgid "PHP log currently disabled."
-msgstr "PHP log momenteel gedeactiveerd"
-
-#: mod/admin.php:2381
-msgid "Clear"
-msgstr "Wis"
-
-#: mod/admin.php:2385
-msgid "Enable Debugging"
-msgstr "Activeer Debugging"
-
-#: mod/admin.php:2386
-msgid "Log file"
-msgstr "Logbestand"
-
-#: mod/admin.php:2386
-msgid ""
-"Must be writable by web server. Relative to your Friendica top-level "
-"directory."
-msgstr "De webserver moet hier kunnen schrijven. Relatief t.o.v. de hoogste folder binnen je Friendica-installatie."
-
-#: mod/admin.php:2387
-msgid "Log level"
-msgstr "Log niveau"
-
-#: mod/admin.php:2389
-msgid "PHP logging"
-msgstr "PHP logging"
-
-#: mod/admin.php:2390
-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 "
-"the 'error_log' line is relative to the friendica top-level directory and "
-"must be writeable by the web server. The option '1' for 'log_errors' and "
-"'display_errors' is to enable these options, set to '0' to disable them."
-msgstr "Om logging van PHP fouten en waarschuwingen te activeren, kan je het volgende toevoegen aan het begin van je index.php bestand van je installatie. De naam van het bestand die ingesteld is in de 'error_log' lijn is relatief tegenover de friendica top-level folder en de server moet erin kunnen schrijven. De optie '1' voor 'log_errors' en 'display_errors' activeert deze opties, configureer '0' om ze te deactiveren. "
-
-#: mod/admin.php:2421
-#, 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 "Fout bij het openen van log file <strong>%1$s</strong> .\\r\\n<br/>Kijk na of bestand %1$s bestaat en mag gelezen worden."
-
-#: mod/admin.php:2425
-#, 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 "Kon log file <strong>%1$s</strong> niet openen.\\r\\n<br/>Kijk na of bestand %1$s mag gelezen worden."
-
-#: mod/admin.php:2516 mod/admin.php:2517 mod/settings.php:773
-msgid "Off"
-msgstr "Uit"
-
-#: mod/admin.php:2516 mod/admin.php:2517 mod/settings.php:773
-msgid "On"
-msgstr "Aan"
-
-#: mod/admin.php:2517
-#, php-format
-msgid "Lock feature %s"
-msgstr "Fixeer feature %s "
-
-#: mod/admin.php:2525
-msgid "Manage Additional Features"
-msgstr "Beheer Bijkomende Features"
-
-#: mod/allfriends.php:53
-msgid "No friends to display."
-msgstr "Geen vrienden om te laten zien."
-
-#: mod/allfriends.php:92 mod/dirfind.php:218 mod/match.php:105
-#: mod/suggest.php:103 src/Content/Widget.php:36 src/Model/Profile.php:293
-msgid "Connect"
-msgstr "Verbinden"
-
-#: mod/api.php:85 mod/api.php:107
-msgid "Authorize application connection"
-msgstr "Verbinding met de applicatie goedkeuren"
-
-#: mod/api.php:86
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Keer terug naar jouw app en voeg deze beveiligingscode in:"
-
-#: mod/api.php:95
-msgid "Please login to continue."
-msgstr "Log in om verder te gaan."
-
-#: mod/api.php:109
-msgid ""
-"Do you want to authorize this application to access your posts and contacts,"
-" and/or create new posts for you?"
-msgstr "Wil je deze toepassing toestemming geven om jouw berichten en contacten in te kijken, en/of nieuwe berichten in jouw plaats aan te maken?"
-
-#: mod/api.php:111 mod/dfrn_request.php:644 mod/follow.php:151
-#: mod/profiles.php:541 mod/profiles.php:545 mod/profiles.php:566
-#: mod/register.php:238 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 "Nee"
-
-#: mod/attach.php:16
-msgid "Item not available."
-msgstr "Item niet beschikbaar"
-
-#: mod/attach.php:26
-msgid "Item was not found."
-msgstr "Item niet gevonden"
-
-#: mod/cal.php:36 mod/community.php:34 mod/viewcontacts.php:23
-#: mod/viewsrc.php:13
-msgid "Access denied."
-msgstr "Toegang geweigerd"
-
-#: mod/cal.php:144 mod/display.php:303 mod/profile.php:175
-msgid "Access to this profile has been restricted."
-msgstr "Toegang tot dit profiel is beperkt."
-
-#: mod/cal.php:276 mod/events.php:392 view/theme/frio/theme.php:263
-#: view/theme/frio/theme.php:267 src/Content/Nav.php:104
-#: src/Content/Nav.php:170 src/Model/Profile.php:920 src/Model/Profile.php:931
-msgid "Events"
-msgstr "Gebeurtenissen"
-
-#: mod/cal.php:277 mod/events.php:393
-msgid "View"
-msgstr "Beeld"
-
-#: mod/cal.php:278 mod/events.php:395
-msgid "Previous"
-msgstr "Vorige"
-
-#: mod/cal.php:279 mod/events.php:396 mod/install.php:154
-msgid "Next"
-msgstr "Volgende"
-
-#: mod/cal.php:282 mod/events.php:401 src/Model/Event.php:421
-msgid "today"
-msgstr "vandaag"
-
-#: mod/cal.php:283 mod/events.php:402 src/Util/Temporal.php:304
-#: src/Model/Event.php:422
-msgid "month"
-msgstr "maand"
-
-#: mod/cal.php:284 mod/events.php:403 src/Util/Temporal.php:305
-#: src/Model/Event.php:423
-msgid "week"
-msgstr "week"
-
-#: mod/cal.php:285 mod/events.php:404 src/Util/Temporal.php:306
-#: src/Model/Event.php:424
-msgid "day"
-msgstr "dag"
-
-#: mod/cal.php:286 mod/events.php:405
-msgid "list"
-msgstr "lijst"
-
-#: mod/cal.php:299 src/Core/Console/NewPassword.php:68 src/Model/User.php:218
-msgid "User not found"
-msgstr "Gebruiker niet gevonden"
-
-#: mod/cal.php:315
-msgid "This calendar format is not supported"
-msgstr "Dit kalender formaat is niet ondersteund"
-
-#: mod/cal.php:317
-msgid "No exportable data found"
-msgstr "Geen exporteerbare data gevonden"
-
-#: mod/cal.php:334
-msgid "calendar"
-msgstr "kalender"
-
-#: mod/common.php:93
-msgid "No contacts in common."
-msgstr "Geen gedeelde contacten."
-
-#: mod/common.php:142 mod/contacts.php:887
-msgid "Common Friends"
-msgstr "Gedeelde Vrienden"
-
-#: mod/community.php:51
-msgid "Community option not available."
-msgstr "Groepsoptie niet beschikbaar"
-
-#: mod/community.php:68
-msgid "Not available."
-msgstr "Niet beschikbaar"
-
-#: mod/community.php:81
-msgid "Local Community"
-msgstr "Lokale Groep"
-
-#: mod/community.php:84
-msgid "Posts from local users on this server"
-msgstr "Berichten van lokale gebruikers op deze server"
-
-#: mod/community.php:92
-msgid "Global Community"
-msgstr "Globale gemeenschap"
-
-#: mod/community.php:95
-msgid "Posts from users of the whole federated network"
-msgstr "Berichten van gebruikers van het hele gefedereerde netwerk"
-
-#: mod/community.php:141 mod/search.php:240
-msgid "No results."
-msgstr "Geen resultaten."
-
-#: mod/community.php:185
-msgid ""
-"This community stream shows all public posts received by this node. They may"
-" not reflect the opinions of this node’s users."
-msgstr "Deze groepsstroom toont alle publieke berichten die deze node ontvangen heeft. Ze kunnen mogelijks niet de mening van de gebruikers van deze node weerspiegelen."
-
-#: mod/contacts.php:70 mod/notifications.php:261 src/Model/Profile.php:518
-msgid "Network:"
-msgstr "Netwerk:"
-
-#: mod/contacts.php:156
-#, php-format
-msgid "%d contact edited."
-msgid_plural "%d contacts edited."
-msgstr[0] "%d contact bewerkt."
-msgstr[1] "%d contacten bewerkt."
-
-#: mod/contacts.php:183 mod/contacts.php:399
-msgid "Could not access contact record."
-msgstr "Kon geen toegang krijgen tot de contactgegevens"
-
-#: mod/contacts.php:193
-msgid "Could not locate selected profile."
-msgstr "Kon het geselecteerde profiel niet vinden."
-
-#: mod/contacts.php:227
-msgid "Contact updated."
-msgstr "Contact opgeslagen"
-
-#: mod/contacts.php:229 mod/dfrn_request.php:411
-msgid "Failed to update contact record."
-msgstr "Ik kon de contactgegevens niet aanpassen."
-
-#: mod/contacts.php:420
-msgid "Contact has been blocked"
-msgstr "Contact is geblokkeerd"
-
-#: mod/contacts.php:420
-msgid "Contact has been unblocked"
-msgstr "Contact is gedeblokkeerd"
-
-#: mod/contacts.php:431
-msgid "Contact has been ignored"
-msgstr "Contact wordt genegeerd"
-
-#: mod/contacts.php:431
-msgid "Contact has been unignored"
-msgstr "Contact wordt niet meer genegeerd"
-
-#: mod/contacts.php:442
-msgid "Contact has been archived"
-msgstr "Contact is gearchiveerd"
-
-#: mod/contacts.php:442
-msgid "Contact has been unarchived"
-msgstr "Contact is niet meer gearchiveerd"
-
-#: mod/contacts.php:466
-msgid "Drop contact"
-msgstr "Contact vergeten"
-
-#: mod/contacts.php:469 mod/contacts.php:824
-msgid "Do you really want to delete this contact?"
-msgstr "Wil je echt dit contact verwijderen?"
-
-#: mod/contacts.php:487
-msgid "Contact has been removed."
-msgstr "Contact is verwijderd."
-
-#: mod/contacts.php:518
-#, php-format
-msgid "You are mutual friends with %s"
-msgstr "Je bent wederzijds bevriend met %s"
-
-#: mod/contacts.php:523
-#, php-format
-msgid "You are sharing with %s"
-msgstr "Je deelt met %s"
-
-#: mod/contacts.php:528
-#, php-format
-msgid "%s is sharing with you"
-msgstr "%s deelt met jou"
-
-#: mod/contacts.php:548
-msgid "Private communications are not available for this contact."
-msgstr "Privécommunicatie met dit contact is niet beschikbaar."
-
-#: mod/contacts.php:550
-msgid "Never"
-msgstr "Nooit"
-
-#: mod/contacts.php:553
-msgid "(Update was successful)"
-msgstr "(Wijziging is geslaagd)"
-
-#: mod/contacts.php:553
-msgid "(Update was not successful)"
-msgstr "(Wijziging is niet geslaagd)"
-
-#: mod/contacts.php:555 mod/contacts.php:1000
-msgid "Suggest friends"
-msgstr "Stel vrienden voor"
-
-#: mod/contacts.php:559
-#, php-format
-msgid "Network type: %s"
-msgstr "Netwerk type: %s"
-
-#: mod/contacts.php:564
-msgid "Communications lost with this contact!"
-msgstr "Communicatie met dit contact is verbroken!"
-
-#: mod/contacts.php:570
-msgid "Fetch further information for feeds"
-msgstr "Haal meer informatie op van de feeds"
-
-#: mod/contacts.php:572
-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 "Haal informatie op zoals preview beelden, titel en teaser van het feed item. Je kan dit activeren als de feed niet veel tekst bevat. Sleutelwoorden worden opgepikt uit de meta header in het feed item en worden gepost als hash tags."
-
-#: mod/contacts.php:574
-msgid "Fetch information"
-msgstr "Haal informatie op"
-
-#: mod/contacts.php:575
-msgid "Fetch keywords"
-msgstr "Haal sleutelwoorden op"
-
-#: mod/contacts.php:576
-msgid "Fetch information and keywords"
-msgstr "Haal informatie en sleutelwoorden op"
-
-#: mod/contacts.php:600 mod/unfollow.php:101
-msgid "Disconnect/Unfollow"
-msgstr "Disconnecteer/stop met volgen"
-
-#: mod/contacts.php:609
-msgid "Contact"
-msgstr "Contact"
-
-#: mod/contacts.php:612
-msgid "Profile Visibility"
-msgstr "Zichtbaarheid profiel"
-
-#: mod/contacts.php:613
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Kies het profiel dat getoond moet worden wanneer %s je profiel bezoekt. "
-
-#: mod/contacts.php:614
-msgid "Contact Information / Notes"
-msgstr "Contactinformatie / aantekeningen"
-
-#: mod/contacts.php:615
-msgid "Their personal note"
-msgstr "Hun persoonlijke nota"
-
-#: mod/contacts.php:617
-msgid "Edit contact notes"
-msgstr "Wijzig aantekeningen over dit contact"
-
-#: mod/contacts.php:620 mod/contacts.php:966 mod/viewcontacts.php:105
-#, php-format
-msgid "Visit %s's profile [%s]"
-msgstr "Bekijk het profiel van %s [%s]"
-
-#: mod/contacts.php:621
-msgid "Block/Unblock contact"
-msgstr "Blokkeer/deblokkeer contact"
-
-#: mod/contacts.php:622
-msgid "Ignore contact"
-msgstr "Negeer contact"
-
-#: mod/contacts.php:623
-msgid "Repair URL settings"
-msgstr "Repareer URL-instellingen"
-
-#: mod/contacts.php:624
-msgid "View conversations"
-msgstr "Toon gesprekken"
-
-#: mod/contacts.php:629
-msgid "Last update:"
-msgstr "Laatste wijziging:"
-
-#: mod/contacts.php:631
-msgid "Update public posts"
-msgstr "Openbare posts aanpassen"
-
-#: mod/contacts.php:633 mod/contacts.php:1010
-msgid "Update now"
-msgstr "Wijzig nu"
-
-#: mod/contacts.php:639 mod/contacts.php:829 mod/contacts.php:1027
-msgid "Unignore"
-msgstr "Negeer niet meer"
-
-#: mod/contacts.php:639 mod/contacts.php:829 mod/contacts.php:1027
-#: mod/notifications.php:56 mod/notifications.php:177
-#: mod/notifications.php:266
-msgid "Ignore"
-msgstr "Negeren"
-
-#: mod/contacts.php:643
-msgid "Currently blocked"
-msgstr "Op dit moment geblokkeerd"
-
-#: mod/contacts.php:644
-msgid "Currently ignored"
-msgstr "Op dit moment genegeerd"
-
-#: mod/contacts.php:645
-msgid "Currently archived"
-msgstr "Op dit moment gearchiveerd"
-
-#: mod/contacts.php:646
-msgid "Awaiting connection acknowledge"
-msgstr "Wait op bevestiging van de connectie"
-
-#: mod/contacts.php:647 mod/notifications.php:171 mod/notifications.php:255
-msgid "Hide this contact from others"
-msgstr "Verberg dit contact voor anderen"
-
-#: mod/contacts.php:647
-msgid ""
-"Replies/likes to your public posts <strong>may</strong> still be visible"
-msgstr "Antwoorden of 'vind ik leuk's op je openbare posts <strong>kunnen</strong> nog zichtbaar zijn"
-
-#: mod/contacts.php:648
-msgid "Notification for new posts"
-msgstr "Meldingen voor nieuwe berichten"
-
-#: mod/contacts.php:648
-msgid "Send a notification of every new post of this contact"
-msgstr "Stuur een notificatie voor elk bericht van dit contact"
-
-#: mod/contacts.php:651
-msgid "Blacklisted keywords"
-msgstr "Sleutelwoorden op de zwarte lijst"
-
-#: mod/contacts.php:651
-msgid ""
-"Comma separated list of keywords that should not be converted to hashtags, "
-"when \"Fetch information and keywords\" is selected"
-msgstr "Door komma's gescheiden lijst van sleutelwoorden die niet in hashtags mogen omgezet worden, wanneer \"Haal informatie en sleutelwoorden op\" is geselecteerd"
-
-#: mod/contacts.php:661 mod/directory.php:151 mod/events.php:520
-#: mod/notifications.php:248 src/Model/Event.php:66 src/Model/Event.php:93
-#: src/Model/Event.php:430 src/Model/Event.php:912 src/Model/Profile.php:415
-msgid "Location:"
-msgstr "Plaats:"
-
-#: mod/contacts.php:663 src/Model/Profile.php:422
-msgid "XMPP:"
-msgstr "XMPP:"
-
-#: mod/contacts.php:665 mod/directory.php:159 mod/notifications.php:250
-#: src/Model/Profile.php:421 src/Model/Profile.php:802
-msgid "About:"
-msgstr "Over:"
-
-#: mod/contacts.php:667 mod/follow.php:178 mod/notifications.php:252
-#: src/Model/Profile.php:790
-msgid "Tags:"
-msgstr "Labels:"
-
-#: mod/contacts.php:668
-msgid "Actions"
-msgstr "Acties"
-
-#: mod/contacts.php:670 mod/contacts.php:856 view/theme/frio/theme.php:259
-#: src/Content/Nav.php:100 src/Model/Profile.php:884
-msgid "Status"
-msgstr "Tijdlijn"
-
-#: mod/contacts.php:671
-msgid "Contact Settings"
-msgstr "Contact instellingen"
-
-#: mod/contacts.php:712
-msgid "Suggestions"
-msgstr "Voorstellen"
-
-#: mod/contacts.php:715
-msgid "Suggest potential friends"
-msgstr "Stel vrienden voor"
-
-#: mod/contacts.php:720 mod/group.php:246
-msgid "All Contacts"
-msgstr "Alle Contacten"
-
-#: mod/contacts.php:723
-msgid "Show all contacts"
-msgstr "Toon alle contacten"
-
-#: mod/contacts.php:728
-msgid "Unblocked"
-msgstr "Niet geblokkeerd"
-
-#: mod/contacts.php:731
-msgid "Only show unblocked contacts"
-msgstr "Toon alleen niet-geblokkeerde contacten"
-
-#: mod/contacts.php:736
-msgid "Blocked"
-msgstr "Geblokkeerd"
-
-#: mod/contacts.php:739
-msgid "Only show blocked contacts"
-msgstr "Toon alleen geblokkeerde contacten"
-
-#: mod/contacts.php:744
-msgid "Ignored"
-msgstr "Genegeerd"
-
-#: mod/contacts.php:747
-msgid "Only show ignored contacts"
-msgstr "Toon alleen genegeerde contacten"
-
-#: mod/contacts.php:752
-msgid "Archived"
-msgstr "Gearchiveerd"
-
-#: mod/contacts.php:755
-msgid "Only show archived contacts"
-msgstr "Toon alleen gearchiveerde contacten"
-
-#: mod/contacts.php:760
-msgid "Hidden"
-msgstr "Verborgen"
-
-#: mod/contacts.php:763
-msgid "Only show hidden contacts"
-msgstr "Toon alleen verborgen contacten"
-
-#: mod/contacts.php:819
-msgid "Search your contacts"
-msgstr "Doorzoek je contacten"
-
-#: mod/contacts.php:820 mod/search.php:248
-#, php-format
-msgid "Results for: %s"
-msgstr "Resultaten voor: %s"
-
-#: mod/contacts.php:821 mod/directory.php:214 view/theme/vier/theme.php:201
-#: src/Content/Widget.php:62
-msgid "Find"
-msgstr "Zoek"
-
-#: mod/contacts.php:827 mod/settings.php:176 mod/settings.php:701
-msgid "Update"
-msgstr "Wijzigen"
-
-#: mod/contacts.php:830 mod/contacts.php:1035
-msgid "Archive"
-msgstr "Archiveer"
-
-#: mod/contacts.php:830 mod/contacts.php:1035
-msgid "Unarchive"
-msgstr "Archiveer niet meer"
-
-#: mod/contacts.php:833
-msgid "Batch Actions"
-msgstr "Bulk Acties"
-
-#: mod/contacts.php:859 mod/follow.php:190 mod/unfollow.php:133
-#: src/Model/Profile.php:887
-msgid "Status Messages and Posts"
-msgstr "Berichten op jouw tijdlijn"
-
-#: mod/contacts.php:867 src/Model/Profile.php:895
-msgid "Profile Details"
-msgstr "Profieldetails"
-
-#: mod/contacts.php:879
-msgid "View all contacts"
-msgstr "Alle contacten zien"
-
-#: mod/contacts.php:890
-msgid "View all common friends"
-msgstr "Bekijk alle gemeenschappelijke vrienden"
-
-#: mod/contacts.php:899
-msgid "Advanced Contact Settings"
-msgstr "Geavanceerde instellingen voor contacten"
-
-#: mod/contacts.php:933
-msgid "Mutual Friendship"
-msgstr "Wederzijdse vriendschap"
-
-#: mod/contacts.php:938
-msgid "is a fan of yours"
-msgstr "Is een fan van jou"
-
-#: mod/contacts.php:943
-msgid "you are a fan of"
-msgstr "Jij bent een fan van"
-
-#: mod/contacts.php:960 mod/photos.php:1464 mod/photos.php:1503
-#: mod/photos.php:1563 src/Object/Post.php:791
-msgid "This is you"
-msgstr "Dit ben jij"
-
-#: mod/contacts.php:967
-msgid "Edit contact"
-msgstr "Contact bewerken"
-
-#: mod/contacts.php:1021
-msgid "Toggle Blocked status"
-msgstr "Schakel geblokkeerde status"
-
-#: mod/contacts.php:1029
-msgid "Toggle Ignored status"
-msgstr "Schakel negeerstatus"
-
-#: mod/contacts.php:1037
-msgid "Toggle Archive status"
-msgstr "Schakel archiveringsstatus"
-
-#: mod/contacts.php:1045
-msgid "Delete contact"
-msgstr "Verwijder contact"
-
-#: mod/crepair.php:88
+#: mod/crepair.php:89
 msgid "Contact settings applied."
 msgstr "Contactinstellingen toegepast."
 
-#: mod/crepair.php:90
+#: mod/crepair.php:91
 msgid "Contact update failed."
 msgstr "Aanpassen van contact mislukt."
 
-#: mod/crepair.php:111 mod/dfrn_confirm.php:126 mod/fsuggest.php:30
-#: mod/fsuggest.php:96 mod/redir.php:28 mod/redir.php:126
+#: mod/crepair.php:112 mod/redir.php:29 mod/redir.php:127
+#: mod/dfrn_confirm.php:127 mod/fsuggest.php:30 mod/fsuggest.php:96
 msgid "Contact not found."
 msgstr "Contact niet gevonden"
 
-#: mod/crepair.php:115
+#: mod/crepair.php:116
 msgid ""
 "<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
 " information your communications with this contact may stop working."
 msgstr "<strong>WAARSCHUWING: Dit is zeer geavanceerd</strong> en als je verkeerde informatie invult, zal je mogelijk niet meer kunnen communiceren met deze contactpersoon."
 
-#: mod/crepair.php:116
+#: mod/crepair.php:117
 msgid ""
 "Please use your browser 'Back' button <strong>now</strong> if you are "
 "uncertain what to do on this page."
 msgstr "Gebruik <strong>nu</strong> de \"terug\"-knop in je webbrowser wanneer je niet weet wat je op deze pagina moet doen."
 
-#: mod/crepair.php:130 mod/crepair.php:132
+#: mod/crepair.php:131 mod/crepair.php:133
 msgid "No mirroring"
 msgstr "Geen mirroring"
 
-#: mod/crepair.php:130
+#: mod/crepair.php:131
 msgid "Mirror as forwarded posting"
 msgstr "Spiegel als geforward bericht"
 
-#: mod/crepair.php:130 mod/crepair.php:132
+#: mod/crepair.php:131 mod/crepair.php:133
 msgid "Mirror as my own posting"
 msgstr "Spiegel als mijn eigen bericht"
 
-#: mod/crepair.php:145
+#: mod/crepair.php:146
 msgid "Return to contact editor"
 msgstr "Ga terug naar contactbewerker"
 
-#: mod/crepair.php:147
+#: mod/crepair.php:148
 msgid "Refetch contact data"
 msgstr "Contact data opnieuw ophalen"
 
-#: mod/crepair.php:150
+#: mod/crepair.php:151
 msgid "Remote Self"
 msgstr "Mijn identiteit elders"
 
-#: mod/crepair.php:153
+#: mod/crepair.php:154
 msgid "Mirror postings from this contact"
 msgstr "Berichten van dit contact spiegelen"
 
-#: mod/crepair.php:155
+#: mod/crepair.php:156
 msgid ""
 "Mark this contact as remote_self, this will cause friendica to repost new "
 "entries from this contact."
 msgstr "Markeer dit contact als remote_self, hierdoor zal friendica nieuwe berichten van dit contact opnieuw posten."
 
-#: mod/crepair.php:160
+#: mod/crepair.php:160 mod/settings.php:677 mod/settings.php:703
+#: mod/admin.php:500 mod/admin.php:1890 mod/admin.php:1901 mod/admin.php:1915
+#: mod/admin.php:1931
+msgid "Name"
+msgstr "Naam"
+
+#: mod/crepair.php:161
 msgid "Account Nickname"
 msgstr "Bijnaam account"
 
-#: mod/crepair.php:161
+#: mod/crepair.php:162
 msgid "@Tagname - overrides Name/Nickname"
 msgstr "@Labelnaam - krijgt voorrang op naam/bijnaam"
 
-#: mod/crepair.php:162
+#: mod/crepair.php:163
 msgid "Account URL"
 msgstr "URL account"
 
-#: mod/crepair.php:163
+#: mod/crepair.php:164
 msgid "Friend Request URL"
 msgstr "URL vriendschapsverzoek"
 
-#: mod/crepair.php:164
+#: mod/crepair.php:165
 msgid "Friend Confirm URL"
 msgstr "URL vriendschapsbevestiging"
 
-#: mod/crepair.php:165
+#: mod/crepair.php:166
 msgid "Notification Endpoint URL"
 msgstr "Notificatie Endpoint URL"
 
-#: mod/crepair.php:166
+#: mod/crepair.php:167
 msgid "Poll/Feed URL"
 msgstr "URL poll/feed"
 
-#: mod/crepair.php:167
+#: mod/crepair.php:168
 msgid "New photo from this URL"
 msgstr "Nieuwe foto van deze URL"
 
-#: mod/delegate.php:38
-msgid "Parent user not found."
-msgstr "Ouderlijke gebruiker niet gevonden."
+#: mod/wallmessage.php:49 mod/wallmessage.php:112
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr "Maximum aantal dagelijkse tijdlijn boodschappen van %s overschreden. Kon boodschap niet plaatsen."
 
-#: mod/delegate.php:145
-msgid "No parent user"
-msgstr "Ouderlijke gebruiker ontbreekt"
+#: mod/wallmessage.php:57 mod/message.php:74
+msgid "No recipient selected."
+msgstr "Geen ontvanger geselecteerd."
 
-#: mod/delegate.php:160
-msgid "Parent Password:"
-msgstr "Ouderlijk paswoord:"
+#: mod/wallmessage.php:60
+msgid "Unable to check your home location."
+msgstr "Niet in staat om je tijdlijn-locatie vast te stellen"
 
-#: mod/delegate.php:160
+#: mod/wallmessage.php:63 mod/message.php:81
+msgid "Message could not be sent."
+msgstr "Bericht kon niet verzonden worden."
+
+#: mod/wallmessage.php:66 mod/message.php:84
+msgid "Message collection failure."
+msgstr "Fout bij het verzamelen van berichten."
+
+#: mod/wallmessage.php:69 mod/message.php:87
+msgid "Message sent."
+msgstr "Bericht verzonden."
+
+#: mod/wallmessage.php:86 mod/wallmessage.php:95
+msgid "No recipient."
+msgstr "Geen ontvanger."
+
+#: mod/wallmessage.php:132 mod/message.php:249
+msgid "Send Private Message"
+msgstr "Verstuur privébericht"
+
+#: mod/wallmessage.php:133
+#, php-format
 msgid ""
-"Please enter the password of the parent account to legitimize your request."
-msgstr "Geef alstublieft het paswoord van het ouderlijke account om je verzoek te legitimeren."
+"If you wish for %s to respond, please check that the privacy settings on "
+"your site allow private mail from unknown senders."
+msgstr "Als je wilt dat %s antwoordt moet je nakijken dat de privacy-instellingen op jouw website privéberichten van onbekende afzenders toelaat."
 
-#: mod/delegate.php:165
-msgid "Parent User"
-msgstr "Ouderlijke gebruiker"
+#: mod/wallmessage.php:134 mod/message.php:250 mod/message.php:419
+msgid "To:"
+msgstr "Aan:"
 
-#: mod/delegate.php:168
+#: mod/wallmessage.php:135 mod/message.php:254 mod/message.php:421
+msgid "Subject:"
+msgstr "Onderwerp:"
+
+#: mod/wallmessage.php:141 mod/message.php:258 mod/message.php:424
+#: mod/invite.php:150
+msgid "Your message:"
+msgstr "Jouw bericht:"
+
+#: mod/lockview.php:42 mod/lockview.php:50
+msgid "Remote privacy information not available."
+msgstr "Privacyinformatie op afstand niet beschikbaar."
+
+#: mod/lockview.php:59
+msgid "Visible to:"
+msgstr "Zichtbaar voor:"
+
+#: mod/install.php:100
+msgid "Friendica Communications Server - Setup"
+msgstr "Friendica Communicatie Server - Setup"
+
+#: mod/install.php:106
+msgid "Could not connect to database."
+msgstr "Kon geen toegang krijgen tot de database."
+
+#: mod/install.php:110
+msgid "Could not create table."
+msgstr "Kon tabel niet aanmaken."
+
+#: mod/install.php:116
+msgid "Your Friendica site database has been installed."
+msgstr "De database van je Friendica-website is geïnstalleerd."
+
+#: mod/install.php:121
 msgid ""
-"Parent users have total control about this account, including the account "
-"settings. Please double check whom you give this access."
-msgstr "Ouderlijke gebruikers hebben totale controle over dit account, de account instellingen inbegrepen. Dubbel check dus alstublieft aan wie je deze toegang geeft."
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr "Het kan nodig zijn om het bestand \"database.sql\" manueel te importeren met phpmyadmin of mysql."
 
-#: mod/delegate.php:170 src/Content/Nav.php:205
-msgid "Delegate Page Management"
-msgstr "Paginabeheer uitbesteden"
+#: mod/install.php:122 mod/install.php:166 mod/install.php:274
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "Zie het bestand \"INSTALL.txt\"."
 
-#: mod/delegate.php:171
-msgid "Delegates"
-msgstr "Gemachtigden"
+#: mod/install.php:134
+msgid "Database already in use."
+msgstr "Database al in gebruik."
 
-#: mod/delegate.php:173
+#: mod/install.php:163
+msgid "System check"
+msgstr "Systeemcontrole"
+
+#: mod/install.php:167 mod/cal.php:279 mod/events.php:394
+msgid "Next"
+msgstr "Volgende"
+
+#: mod/install.php:168
+msgid "Check again"
+msgstr "Controleer opnieuw"
+
+#: mod/install.php:187
+msgid "Database connection"
+msgstr "Verbinding met database"
+
+#: mod/install.php:188
 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 "Personen waaraan het beheer is uitbesteed kunnen alle onderdelen van een account/pagina beheren, behalve de basisinstellingen van een account. Besteed je persoonlijke account daarom niet uit aan personen die je niet volledig vertrouwt."
+"In order to install Friendica we need to know how to connect to your "
+"database."
+msgstr "Om Friendica te kunnen installeren moet ik weten hoe ik jouw database kan bereiken."
 
-#: mod/delegate.php:174
-msgid "Existing Page Delegates"
-msgstr "Bestaande personen waaraan het paginabeheer is uitbesteed"
+#: mod/install.php:189
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Neem contact op met jouw hostingprovider of websitebeheerder, wanneer je vragen hebt over deze instellingen. "
 
-#: mod/delegate.php:176
-msgid "Potential Delegates"
-msgstr "Mogelijke personen waaraan het paginabeheer kan worden uitbesteed "
+#: mod/install.php:190
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "De database die je hier opgeeft zou al moeten bestaan. Maak anders de database aan voordat je verder gaat."
 
-#: mod/delegate.php:178 mod/tagrm.php:90
-msgid "Remove"
-msgstr "Verwijderen"
+#: mod/install.php:194
+msgid "Database Server Name"
+msgstr "Servernaam database"
 
-#: mod/delegate.php:179
-msgid "Add"
-msgstr "Toevoegen"
+#: mod/install.php:195
+msgid "Database Login Name"
+msgstr "Gebruikersnaam database"
 
-#: mod/delegate.php:180
-msgid "No entries."
-msgstr "Geen gegevens."
+#: mod/install.php:196
+msgid "Database Login Password"
+msgstr "Wachtwoord database"
 
-#: mod/dfrn_confirm.php:71 mod/profiles.php:38 mod/profiles.php:148
+#: mod/install.php:196
+msgid "For security reasons the password must not be empty"
+msgstr "Om veiligheidsreden mag het paswoord niet leeg zijn"
+
+#: mod/install.php:197
+msgid "Database Name"
+msgstr "Naam database"
+
+#: mod/install.php:198 mod/install.php:235
+msgid "Site administrator email address"
+msgstr "E-mailadres van de websitebeheerder"
+
+#: mod/install.php:198 mod/install.php:235
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "Het e-mailadres van je account moet hiermee overeenkomen om het administratiepaneel te kunnen gebruiken."
+
+#: mod/install.php:200 mod/install.php:238
+msgid "Please select a default timezone for your website"
+msgstr "Selecteer een standaard tijdzone voor je website"
+
+#: mod/install.php:225
+msgid "Site settings"
+msgstr "Website-instellingen"
+
+#: mod/install.php:239
+msgid "System Language:"
+msgstr "Systeem taal:"
+
+#: mod/install.php:239
+msgid ""
+"Set the default language for your Friendica installation interface and to "
+"send emails."
+msgstr "Stel de standaard taal in voor je Friendica installatie interface en emails."
+
+#: mod/install.php:255
+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 "Het databaseconfiguratiebestand \"config/local.ini.php\" kon niet worden weggeschreven. Je kunt de bijgevoegde tekst gebruiken om in een configuratiebestand aan te maken in de hoogste map van je webserver. "
+
+#: mod/install.php:272
+msgid "<h1>What next</h1>"
+msgstr "<h1>Wat nu</h1>"
+
+#: mod/install.php:273
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"worker."
+msgstr "BELANGRIJK: Je zal [manueel] een geplande taak moeten opzetten voor de worker."
+
+#: mod/install.php:276
+#, php-format
+msgid ""
+"Go to your new Friendica node <a href=\"%s/register\">registration page</a> "
+"and register as new user. Remember to use the same email you have entered as"
+" administrator email. This will allow you to enter the site admin panel."
+msgstr "Go naar je nieuwe Friendica node <a href=\"%s/register\">registratie pagina</a> en registeer als nieuwe gebruiker. Vergeet niet hetzelfde email adres te gebruiken als wat je opgegeven hebt als administrator email. Dit zal je toelaten om het site administratie paneel te openen."
+
+#: mod/dfrn_confirm.php:72 mod/profiles.php:38 mod/profiles.php:148
 #: mod/profiles.php:193 mod/profiles.php:523
 msgid "Profile not found."
 msgstr "Profiel niet gevonden"
 
-#: mod/dfrn_confirm.php:127
+#: mod/dfrn_confirm.php:128
 msgid ""
 "This may occasionally happen if contact was requested by both persons and it"
 " has already been approved."
 msgstr "Dit kan soms gebeuren als het contact door beide personen werd gevraagd, en het werd al goedgekeurd."
 
-#: mod/dfrn_confirm.php:237
+#: mod/dfrn_confirm.php:238
 msgid "Response from remote site was not understood."
 msgstr "Antwoord van de website op afstand werd niet begrepen."
 
-#: mod/dfrn_confirm.php:244 mod/dfrn_confirm.php:249
+#: mod/dfrn_confirm.php:245 mod/dfrn_confirm.php:251
 msgid "Unexpected response from remote site: "
 msgstr "Onverwacht antwoord van website op afstand:"
 
-#: mod/dfrn_confirm.php:258
+#: mod/dfrn_confirm.php:260
 msgid "Confirmation completed successfully."
 msgstr "Bevestiging werd correct voltooid."
 
-#: mod/dfrn_confirm.php:270
+#: mod/dfrn_confirm.php:272
 msgid "Temporary failure. Please wait and try again."
 msgstr "Tijdelijke fout. Wacht even en probeer opnieuw."
 
-#: mod/dfrn_confirm.php:273
+#: mod/dfrn_confirm.php:275
 msgid "Introduction failed or was revoked."
 msgstr "Verzoek mislukt of herroepen."
 
-#: mod/dfrn_confirm.php:278
+#: mod/dfrn_confirm.php:280
 msgid "Remote site reported: "
 msgstr "Website op afstand berichtte: "
 
-#: mod/dfrn_confirm.php:389
+#: mod/dfrn_confirm.php:392
 msgid "Unable to set contact photo."
 msgstr "Ik kan geen contact foto instellen."
 
-#: mod/dfrn_confirm.php:447
+#: mod/dfrn_confirm.php:450
 #, php-format
 msgid "No user record found for '%s' "
 msgstr "Geen gebruiker gevonden voor '%s'"
 
-#: mod/dfrn_confirm.php:457
+#: mod/dfrn_confirm.php:460
 msgid "Our site encryption key is apparently messed up."
 msgstr "De encryptie-sleutel van onze webstek is blijkbaar beschadigd."
 
-#: mod/dfrn_confirm.php:468
+#: mod/dfrn_confirm.php:471
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr "Er werd een lege URL gegeven, of de URL kon niet ontcijferd worden door ons."
 
-#: mod/dfrn_confirm.php:484
+#: mod/dfrn_confirm.php:487
 msgid "Contact record was not found for you on our site."
 msgstr "We vonden op onze webstek geen contactrecord voor jou."
 
-#: mod/dfrn_confirm.php:498
+#: mod/dfrn_confirm.php:501
 #, php-format
 msgid "Site public key not available in contact record for URL %s."
 msgstr "Publieke sleutel voor webstek niet beschikbaar in contactrecord voor URL %s."
 
-#: mod/dfrn_confirm.php:514
+#: mod/dfrn_confirm.php:517
 msgid ""
 "The ID provided by your system is a duplicate on our system. It should work "
 "if you try again."
 msgstr "Het ID dat jouw systeem aangeeft is een dubbel op ons systeem. Als je opnieuw probeert zou het moeten werken."
 
-#: mod/dfrn_confirm.php:525
+#: mod/dfrn_confirm.php:528
 msgid "Unable to set your contact credentials on our system."
 msgstr "Niet in staat om op dit systeem je contactreferenties in te stellen."
 
-#: mod/dfrn_confirm.php:580
+#: mod/dfrn_confirm.php:584
 msgid "Unable to update your contact profile details on our system"
 msgstr "Kan je contact profiel details op ons systeem niet aanpassen"
 
-#: mod/dfrn_confirm.php:610 mod/dfrn_request.php:560
-#: src/Model/Contact.php:1648
+#: mod/dfrn_confirm.php:614 mod/dfrn_request.php:561
+#: src/Model/Contact.php:1891
 msgid "[Name Withheld]"
 msgstr "[Naam achtergehouden]"
 
-#: mod/dfrn_poll.php:126 mod/dfrn_poll.php:543
+#: mod/dirfind.php:53
 #, php-format
-msgid "%1$s welcomes %2$s"
-msgstr "%1$s heet %2$s van harte welkom"
+msgid "People Search - %s"
+msgstr "Mensen Zoeken - %s"
 
-#: mod/dfrn_request.php:93
-msgid "This introduction has already been accepted."
-msgstr "Verzoek is al goedgekeurd"
-
-#: mod/dfrn_request.php:111 mod/dfrn_request.php:352
-msgid "Profile location is not valid or does not contain profile information."
-msgstr "Profiel is ongeldig of bevat geen informatie"
-
-#: mod/dfrn_request.php:115 mod/dfrn_request.php:356
-msgid "Warning: profile location has no identifiable owner name."
-msgstr "Waarschuwing: de profiellocatie heeft geen identificeerbare eigenaar."
-
-#: mod/dfrn_request.php:118 mod/dfrn_request.php:359
-msgid "Warning: profile location has no profile photo."
-msgstr "Waarschuwing: Profieladres heeft geen profielfoto."
-
-#: mod/dfrn_request.php:122 mod/dfrn_request.php:363
+#: mod/dirfind.php:64
 #, 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] "De %d vereiste parameter is niet op het gegeven adres gevonden"
-msgstr[1] "De %d vereiste parameters zijn niet op het gegeven adres gevonden"
+msgid "Forum Search - %s"
+msgstr "Forum doorzoeken - %s"
 
-#: mod/dfrn_request.php:160
-msgid "Introduction complete."
-msgstr "Verzoek voltooid."
+#: mod/dirfind.php:221 mod/match.php:105 mod/suggest.php:104
+#: mod/allfriends.php:92 src/Model/Profile.php:292 src/Content/Widget.php:37
+msgid "Connect"
+msgstr "Verbinden"
 
-#: mod/dfrn_request.php:196
-msgid "Unrecoverable protocol error."
-msgstr "Onherstelbare protocolfout. "
+#: mod/dirfind.php:265 mod/match.php:125
+msgid "No matches"
+msgstr "Geen resultaten"
 
-#: mod/dfrn_request.php:223
-msgid "Profile unavailable."
-msgstr "Profiel onbeschikbaar"
+#: mod/manage.php:180
+msgid "Manage Identities and/or Pages"
+msgstr "Beheer Identiteiten en/of Pagina's"
 
-#: mod/dfrn_request.php:245
-#, php-format
-msgid "%s has received too many connection requests today."
-msgstr "%s heeft te veel verzoeken gehad vandaag."
-
-#: mod/dfrn_request.php:246
-msgid "Spam protection measures have been invoked."
-msgstr "Beveiligingsmaatregelen tegen spam zijn in werking getreden."
-
-#: mod/dfrn_request.php:247
-msgid "Friends are advised to please try again in 24 hours."
-msgstr "Wij adviseren vrienden om het over 24 uur nog een keer te proberen."
-
-#: mod/dfrn_request.php:273
-msgid "Invalid locator"
-msgstr "Ongeldige plaatsbepaler"
-
-#: mod/dfrn_request.php:309
-msgid "You have already introduced yourself here."
-msgstr "Je hebt jezelf hier al voorgesteld."
-
-#: mod/dfrn_request.php:312
-#, php-format
-msgid "Apparently you are already friends with %s."
-msgstr "Blijkbaar ben je al bevriend met %s."
-
-#: mod/dfrn_request.php:332
-msgid "Invalid profile URL."
-msgstr "Ongeldig profiel adres."
-
-#: mod/dfrn_request.php:338 src/Model/Contact.php:1333
-msgid "Disallowed profile URL."
-msgstr "Niet toegelaten profiel adres."
-
-#: mod/dfrn_request.php:431
-msgid "Your introduction has been sent."
-msgstr "Je verzoek is verzonden."
-
-#: mod/dfrn_request.php:469
+#: mod/manage.php:181
 msgid ""
-"Remote subscription can't be done for your network. Please subscribe "
-"directly on your system."
-msgstr "Remote inschrijving kan niet op jouw netwerk. Gelieve direct op je systeem in te schrijven."
+"Toggle between different identities or community/group pages which share "
+"your account details or which you have been granted \"manage\" permissions"
+msgstr "Wissel tussen verschillende identiteiten of forum/groeppagina's die jouw accountdetails delen of waar je \"beheerdersrechten\" hebt gekregen."
 
-#: mod/dfrn_request.php:485
-msgid "Please login to confirm introduction."
-msgstr "Log in om je verzoek te bevestigen."
+#: mod/manage.php:182
+msgid "Select an identity to manage: "
+msgstr "Selecteer een identiteit om te beheren:"
 
-#: mod/dfrn_request.php:493
-msgid ""
-"Incorrect identity currently logged in. Please login to "
-"<strong>this</strong> profile."
-msgstr "Je huidige identiteit is niet de juiste. Log met <strong>dit</strong> profiel in."
+#: mod/videos.php:138
+msgid "Do you really want to delete this video?"
+msgstr "Wil je deze video echt verwijderen?"
 
-#: mod/dfrn_request.php:507 mod/dfrn_request.php:524
-msgid "Confirm"
-msgstr "Bevestig"
+#: mod/videos.php:143
+msgid "Delete Video"
+msgstr "Verwijder video"
 
-#: mod/dfrn_request.php:519
-msgid "Hide this contact"
-msgstr "Verberg dit contact"
+#: mod/videos.php:198 mod/webfinger.php:16 mod/directory.php:42
+#: mod/search.php:105 mod/search.php:111 mod/viewcontacts.php:48
+#: mod/display.php:194 mod/dfrn_request.php:599 mod/probe.php:13
+#: mod/community.php:28 mod/photos.php:945
+msgid "Public access denied."
+msgstr "Niet vrij toegankelijk"
 
-#: mod/dfrn_request.php:522
-#, php-format
-msgid "Welcome home %s."
-msgstr "Welkom terug %s."
+#: mod/videos.php:206
+msgid "No videos selected"
+msgstr "Geen video's geselecteerd"
 
-#: mod/dfrn_request.php:523
-#, php-format
-msgid "Please confirm your introduction/connection request to %s."
-msgstr "Bevestig je vriendschaps-/connectieverzoek voor %s."
+#: mod/videos.php:307 mod/photos.php:1050
+msgid "Access to this item is restricted."
+msgstr "Toegang tot dit item is beperkt."
 
-#: mod/dfrn_request.php:633
-msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"communications networks:"
-msgstr "Vul hier uw 'Identiteitsadres' in van een van de volgende ondersteunde communicatienetwerken:"
+#: mod/videos.php:382 mod/photos.php:1699
+msgid "View Album"
+msgstr "Album bekijken"
 
-#: mod/dfrn_request.php:636
-#, 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 "Als je nog geen lid bent van het vrije sociale web, <a href=\"%s\">volg dan deze link om een publieke Friendica site te vinden en vervoeg ons vandaag</a>"
+#: mod/videos.php:390
+msgid "Recent Videos"
+msgstr "Recente video's"
 
-#: mod/dfrn_request.php:641
-msgid "Friend/Connection Request"
-msgstr "Vriendschaps-/connectieverzoek"
+#: mod/videos.php:392
+msgid "Upload New Videos"
+msgstr "Nieuwe video's uploaden"
 
-#: mod/dfrn_request.php:642
-msgid ""
-"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
-"testuser@gnusocial.de"
-msgstr "Voorbeelden: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de"
+#: mod/webfinger.php:17 mod/probe.php:14
+msgid "Only logged in users are permitted to perform a probing."
+msgstr "Alleen ingelogde gebruikers hebben toelating om aan probing te doen."
 
-#: mod/dfrn_request.php:643 mod/follow.php:150
-msgid "Please answer the following:"
-msgstr "Beantwoord het volgende:"
+#: mod/directory.php:151 mod/notifications.php:253 mod/contacts.php:680
+#: mod/events.php:521 src/Model/Event.php:66 src/Model/Event.php:93
+#: src/Model/Event.php:430 src/Model/Event.php:915 src/Model/Profile.php:417
+msgid "Location:"
+msgstr "Plaats:"
 
-#: mod/dfrn_request.php:644 mod/follow.php:151
-#, php-format
-msgid "Does %s know you?"
-msgstr "Kent %s jou?"
-
-#: mod/dfrn_request.php:645 mod/follow.php:152
-msgid "Add a personal note:"
-msgstr "Voeg een persoonlijke opmerking toe:"
-
-#: mod/dfrn_request.php:647 src/Content/ContactSelector.php:77
-msgid "Friendica"
-msgstr "Friendica"
-
-#: mod/dfrn_request.php:648
-msgid "GNU Social (Pleroma, Mastodon)"
-msgstr "GNU Social (Pleroma, Mastodon)"
-
-#: mod/dfrn_request.php:649
-msgid "Diaspora (Socialhome, Hubzilla)"
-msgstr "Diaspora (Socialhome, Hubzilla)"
-
-#: mod/dfrn_request.php:650
-#, php-format
-msgid ""
-" - please do not use this form.  Instead, enter %s into your Diaspora search"
-" bar."
-msgstr "- Gebruik niet dit formulier. Vul %s in in je Diaspora zoekbalk."
-
-#: mod/dfrn_request.php:651 mod/follow.php:158 mod/unfollow.php:114
-msgid "Your Identity Address:"
-msgstr "Adres van je identiteit:"
-
-#: mod/dfrn_request.php:653 mod/follow.php:63 mod/unfollow.php:66
-msgid "Submit Request"
-msgstr "Aanvraag indienen"
-
-#: mod/directory.php:156 mod/notifications.php:254 src/Model/Profile.php:418
-#: src/Model/Profile.php:741
+#: mod/directory.php:156 mod/notifications.php:259 src/Model/Profile.php:420
+#: src/Model/Profile.php:732
 msgid "Gender:"
 msgstr "Geslacht:"
 
-#: mod/directory.php:157 src/Model/Profile.php:419 src/Model/Profile.php:765
+#: mod/directory.php:157 src/Model/Profile.php:421 src/Model/Profile.php:756
 msgid "Status:"
 msgstr "Tijdlijn:"
 
-#: mod/directory.php:158 src/Model/Profile.php:420 src/Model/Profile.php:782
+#: mod/directory.php:158 src/Model/Profile.php:422 src/Model/Profile.php:773
 msgid "Homepage:"
 msgstr "Website:"
 
-#: mod/directory.php:207 view/theme/vier/theme.php:206
-#: src/Content/Widget.php:67
-msgid "Global Directory"
-msgstr "Globale gids"
+#: mod/directory.php:159 mod/notifications.php:255 mod/contacts.php:684
+#: src/Model/Profile.php:423 src/Model/Profile.php:793
+msgid "About:"
+msgstr "Over:"
 
 #: mod/directory.php:209
 msgid "Find on this site"
@@ -4574,677 +2072,6 @@ msgstr "Websitegids"
 msgid "No entries (some entries may be hidden)."
 msgstr "Geen gegevens (sommige gegevens kunnen verborgen zijn)."
 
-#: mod/dirfind.php:52
-#, php-format
-msgid "People Search - %s"
-msgstr "Mensen Zoeken - %s"
-
-#: mod/dirfind.php:63
-#, php-format
-msgid "Forum Search - %s"
-msgstr "Forum doorzoeken - %s"
-
-#: mod/dirfind.php:256 mod/match.php:125
-msgid "No matches"
-msgstr "Geen resultaten"
-
-#: mod/editpost.php:26 mod/editpost.php:36
-msgid "Item not found"
-msgstr "Item niet gevonden"
-
-#: mod/editpost.php:43
-msgid "Edit post"
-msgstr "Bericht bewerken"
-
-#: mod/editpost.php:125 src/Core/ACL.php:305
-msgid "CC: email addresses"
-msgstr "CC: e-mailadressen"
-
-#: mod/editpost.php:132 src/Core/ACL.php:306
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Voorbeeld: bob@voorbeeld.nl, an@voorbeeld.be"
-
-#: mod/events.php:105 mod/events.php:107
-msgid "Event can not end before it has started."
-msgstr "Gebeurtenis kan niet eindigen voor het begin."
-
-#: mod/events.php:114 mod/events.php:116
-msgid "Event title and start time are required."
-msgstr "Titel en begintijd van de gebeurtenis zijn vereist."
-
-#: mod/events.php:394
-msgid "Create New Event"
-msgstr "Maak een nieuwe gebeurtenis"
-
-#: mod/events.php:508
-msgid "Event details"
-msgstr "Gebeurtenis details"
-
-#: mod/events.php:509
-msgid "Starting date and Title are required."
-msgstr "Start datum en Titel zijn verplicht."
-
-#: mod/events.php:510 mod/events.php:511
-msgid "Event Starts:"
-msgstr "Gebeurtenis begint:"
-
-#: mod/events.php:510 mod/events.php:522 mod/profiles.php:607
-msgid "Required"
-msgstr "Vereist"
-
-#: mod/events.php:512 mod/events.php:528
-msgid "Finish date/time is not known or not relevant"
-msgstr "Einddatum/tijd is niet gekend of niet relevant"
-
-#: mod/events.php:514 mod/events.php:515
-msgid "Event Finishes:"
-msgstr "Gebeurtenis eindigt:"
-
-#: mod/events.php:516 mod/events.php:529
-msgid "Adjust for viewer timezone"
-msgstr "Pas aan aan de tijdzone van de gebruiker"
-
-#: mod/events.php:518
-msgid "Description:"
-msgstr "Beschrijving:"
-
-#: mod/events.php:522 mod/events.php:524
-msgid "Title:"
-msgstr "Titel:"
-
-#: mod/events.php:525 mod/events.php:526
-msgid "Share this event"
-msgstr "Deel deze gebeurtenis"
-
-#: mod/events.php:533 src/Model/Profile.php:860
-msgid "Basic"
-msgstr "Basis"
-
-#: mod/events.php:535 mod/photos.php:1094 mod/photos.php:1418
-#: src/Core/ACL.php:308
-msgid "Permissions"
-msgstr "Rechten"
-
-#: mod/events.php:554
-msgid "Failed to remove event"
-msgstr "Kon remote event niet verwijderen"
-
-#: mod/events.php:556
-msgid "Event removed"
-msgstr "Gebeurtenis verwijderd"
-
-#: mod/fbrowser.php:35 view/theme/frio/theme.php:261 src/Content/Nav.php:102
-#: src/Model/Profile.php:900
-msgid "Photos"
-msgstr "Foto's"
-
-#: mod/fbrowser.php:44 mod/fbrowser.php:69 mod/photos.php:198
-#: mod/photos.php:1058 mod/photos.php:1145 mod/photos.php:1162
-#: mod/photos.php:1622 mod/photos.php:1637 src/Model/Photo.php:243
-#: src/Model/Photo.php:252
-msgid "Contact Photos"
-msgstr "Contactfoto's"
-
-#: mod/fbrowser.php:106 mod/fbrowser.php:137 mod/profile_photo.php:247
-msgid "Upload"
-msgstr "Uploaden"
-
-#: mod/fbrowser.php:132
-msgid "Files"
-msgstr "Bestanden"
-
-#: mod/feedtest.php:21
-msgid "You must be logged in to use this module"
-msgstr "Je moet ingelogd zijn om deze module te gebruiken"
-
-#: mod/feedtest.php:49
-msgid "Source URL"
-msgstr "Bron URL"
-
-#: mod/follow.php:46
-msgid "The contact could not be added."
-msgstr "Het contact kon niet toegevoegd worden."
-
-#: mod/follow.php:74
-msgid "You already added this contact."
-msgstr "Je hebt deze kontakt al toegevoegd"
-
-#: mod/follow.php:84
-msgid "Diaspora support isn't enabled. Contact can't be added."
-msgstr "Diaspora ondersteuning is niet geactiveerd. Contact kan niet toegevoegd worden."
-
-#: mod/follow.php:91
-msgid "OStatus support is disabled. Contact can't be added."
-msgstr "OStatus ondersteuning is niet geactiveerd. Contact kan niet toegevoegd woren."
-
-#: mod/follow.php:98
-msgid "The network type couldn't be detected. Contact can't be added."
-msgstr "Het type netwerk kon niet gedetecteerd worden. Contact kan niet toegevoegd worden."
-
-#: mod/fsuggest.php:72
-msgid "Friend suggestion sent."
-msgstr "Vriendschapsvoorstel verzonden."
-
-#: mod/fsuggest.php:101
-msgid "Suggest Friends"
-msgstr "Stel vrienden voor"
-
-#: mod/fsuggest.php:103
-#, php-format
-msgid "Suggest a friend for %s"
-msgstr "Stel een vriend voor aan %s"
-
-#: mod/group.php:36
-msgid "Group created."
-msgstr "Groep aangemaakt."
-
-#: mod/group.php:42
-msgid "Could not create group."
-msgstr "Kon de groep niet aanmaken."
-
-#: mod/group.php:56 mod/group.php:187
-msgid "Group not found."
-msgstr "Groep niet gevonden."
-
-#: mod/group.php:70
-msgid "Group name changed."
-msgstr "Groepsnaam gewijzigd."
-
-#: mod/group.php:83 mod/profperm.php:28 index.php:431
-msgid "Permission denied"
-msgstr "Toegang geweigerd"
-
-#: mod/group.php:101
-msgid "Save Group"
-msgstr "Bewaar groep"
-
-#: mod/group.php:102
-msgid "Filter"
-msgstr "filter"
-
-#: mod/group.php:107
-msgid "Create a group of contacts/friends."
-msgstr "Maak een groep contacten/vrienden aan."
-
-#: mod/group.php:108 mod/group.php:134 mod/group.php:229
-#: src/Model/Group.php:421
-msgid "Group Name: "
-msgstr "Groepsnaam:"
-
-#: mod/group.php:125 src/Model/Group.php:418
-msgid "Contacts not in any group"
-msgstr "Contacten bestaan in geen enkele groep"
-
-#: mod/group.php:157
-msgid "Group removed."
-msgstr "Groep verwijderd."
-
-#: mod/group.php:159
-msgid "Unable to remove group."
-msgstr "Niet in staat om groep te verwijderen."
-
-#: mod/group.php:222
-msgid "Delete Group"
-msgstr "Verwijder Groep"
-
-#: mod/group.php:233
-msgid "Edit Group Name"
-msgstr "Bewerk Groep Naam"
-
-#: mod/group.php:244
-msgid "Members"
-msgstr "Leden"
-
-#: mod/group.php:247 mod/network.php:638
-msgid "Group is empty"
-msgstr "De groep is leeg"
-
-#: mod/group.php:260
-msgid "Remove contact from group"
-msgstr "Verwijder contact uit de groep"
-
-#: mod/group.php:278 mod/profperm.php:115
-msgid "Click on a contact to add or remove."
-msgstr "Klik op een contact om het toe te voegen of te verwijderen."
-
-#: mod/group.php:292
-msgid "Add contact to group"
-msgstr "Voeg contact toe aan de groep"
-
-#: mod/hcard.php:19
-msgid "No profile"
-msgstr "Geen profiel"
-
-#: mod/install.php:87
-msgid "Friendica Communications Server - Setup"
-msgstr "Friendica Communicatie Server - Setup"
-
-#: mod/install.php:93
-msgid "Could not connect to database."
-msgstr "Kon geen toegang krijgen tot de database."
-
-#: mod/install.php:97
-msgid "Could not create table."
-msgstr "Kon tabel niet aanmaken."
-
-#: mod/install.php:103
-msgid "Your Friendica site database has been installed."
-msgstr "De database van je Friendica-website is geïnstalleerd."
-
-#: mod/install.php:108
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
-msgstr "Het kan nodig zijn om het bestand \"database.sql\" manueel te importeren met phpmyadmin of mysql."
-
-#: mod/install.php:109 mod/install.php:153 mod/install.php:261
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr "Zie het bestand \"INSTALL.txt\"."
-
-#: mod/install.php:121
-msgid "Database already in use."
-msgstr "Database al in gebruik."
-
-#: mod/install.php:150
-msgid "System check"
-msgstr "Systeemcontrole"
-
-#: mod/install.php:155
-msgid "Check again"
-msgstr "Controleer opnieuw"
-
-#: mod/install.php:174
-msgid "Database connection"
-msgstr "Verbinding met database"
-
-#: mod/install.php:175
-msgid ""
-"In order to install Friendica we need to know how to connect to your "
-"database."
-msgstr "Om Friendica te kunnen installeren moet ik weten hoe ik jouw database kan bereiken."
-
-#: mod/install.php:176
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Neem contact op met jouw hostingprovider of websitebeheerder, wanneer je vragen hebt over deze instellingen. "
-
-#: mod/install.php:177
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "De database die je hier opgeeft zou al moeten bestaan. Maak anders de database aan voordat je verder gaat."
-
-#: mod/install.php:181
-msgid "Database Server Name"
-msgstr "Servernaam database"
-
-#: mod/install.php:182
-msgid "Database Login Name"
-msgstr "Gebruikersnaam database"
-
-#: mod/install.php:183
-msgid "Database Login Password"
-msgstr "Wachtwoord database"
-
-#: mod/install.php:183
-msgid "For security reasons the password must not be empty"
-msgstr "Om veiligheidsreden mag het paswoord niet leeg zijn"
-
-#: mod/install.php:184
-msgid "Database Name"
-msgstr "Naam database"
-
-#: mod/install.php:185 mod/install.php:222
-msgid "Site administrator email address"
-msgstr "E-mailadres van de websitebeheerder"
-
-#: mod/install.php:185 mod/install.php:222
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr "Het e-mailadres van je account moet hiermee overeenkomen om het administratiepaneel te kunnen gebruiken."
-
-#: mod/install.php:187 mod/install.php:225
-msgid "Please select a default timezone for your website"
-msgstr "Selecteer een standaard tijdzone voor je website"
-
-#: mod/install.php:212
-msgid "Site settings"
-msgstr "Website-instellingen"
-
-#: mod/install.php:226
-msgid "System Language:"
-msgstr "Systeem taal:"
-
-#: mod/install.php:226
-msgid ""
-"Set the default language for your Friendica installation interface and to "
-"send emails."
-msgstr "Stel de standaard taal in voor je Friendica installatie interface en emails."
-
-#: mod/install.php:242
-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 "Het databaseconfiguratiebestand \"config/local.ini.php\" kon niet worden weggeschreven. Je kunt de bijgevoegde tekst gebruiken om in een configuratiebestand aan te maken in de hoogste map van je webserver. "
-
-#: mod/install.php:259
-msgid "<h1>What next</h1>"
-msgstr "<h1>Wat nu</h1>"
-
-#: mod/install.php:260
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"worker."
-msgstr "BELANGRIJK: Je zal [manueel] een geplande taak moeten opzetten voor de worker."
-
-#: mod/install.php:263
-#, php-format
-msgid ""
-"Go to your new Friendica node <a href=\"%s/register\">registration page</a> "
-"and register as new user. Remember to use the same email you have entered as"
-" administrator email. This will allow you to enter the site admin panel."
-msgstr "Go naar je nieuwe Friendica node <a href=\"%s/register\">registratie pagina</a> en registeer als nieuwe gebruiker. Vergeet niet hetzelfde email adres te gebruiken als wat je opgegeven hebt als administrator email. Dit zal je toelaten om het site administratie paneel te openen."
-
-#: mod/invite.php:34
-msgid "Total invitation limit exceeded."
-msgstr "Totale uitnodigingslimiet overschreden."
-
-#: mod/invite.php:56
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s: Geen geldig e-mailadres."
-
-#: mod/invite.php:88
-msgid "Please join us on Friendica"
-msgstr "Kom bij ons op Friendica"
-
-#: mod/invite.php:97
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Uitnodigingslimiet overschreden. Neem contact op met de beheerder van je website."
-
-#: mod/invite.php:101
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s : Aflevering van bericht mislukt."
-
-#: mod/invite.php:105
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d bericht verzonden."
-msgstr[1] "%d berichten verzonden."
-
-#: mod/invite.php:123
-msgid "You have no more invitations available"
-msgstr "Je kunt geen uitnodigingen meer sturen"
-
-#: mod/invite.php:131
-#, php-format
-msgid ""
-"Visit %s for a list of public sites that you can join. Friendica members on "
-"other sites can all connect with each other, as well as with members of many"
-" other social networks."
-msgstr "Bezoek %s voor een lijst van openbare sites waar je je kunt aansluiten. Friendica leden op andere sites kunnen allemaal met elkaar verbonden worden, en ook met leden van verschillende andere sociale netwerken."
-
-#: mod/invite.php:133
-#, php-format
-msgid ""
-"To accept this invitation, please visit and register at %s or any other "
-"public Friendica website."
-msgstr "Om deze uitnodiging te accepteren kan je je op %s registreren of op een andere vrij toegankelijke Friendica-website."
-
-#: mod/invite.php:134
-#, php-format
-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. See %s for a list of alternate Friendica "
-"sites you can join."
-msgstr "Friendica servers zijn allemaal onderling verbonden om een reusachtig sociaal web te maken met verbeterde privacy, dat eigendom is van en gecontroleerd door zijn leden. Ze kunnen ook verbindingen maken met verschillende traditionele sociale netwerken. Bekijk %s voor een lijst van alternatieve Friendica servers waar je aan kunt sluiten."
-
-#: mod/invite.php:138
-msgid ""
-"Our apologies. This system is not currently configured to connect with other"
-" public sites or invite members."
-msgstr "Onze verontschuldigingen. Dit systeem is momenteel niet ingesteld om verbinding te maken met andere openbare plaatsen of leden uit te nodigen."
-
-#: mod/invite.php:142
-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 "Friendica servers zijn allemaal onderling verbonden om een reusachtig sociaal web te maken met verbeterde privacy, dat eigendom is van en gecontroleerd door zijn leden. Ze kunnen ook verbindingen maken met verschillende traditionele sociale netwerken."
-
-#: mod/invite.php:141
-#, php-format
-msgid "To accept this invitation, please visit and register at %s."
-msgstr "Om deze uitnodiging te accepteren, ga naar en registreer op %s."
-
-#: mod/invite.php:148
-msgid "Send invitations"
-msgstr "Verstuur uitnodigingen"
-
-#: mod/invite.php:149
-msgid "Enter email addresses, one per line:"
-msgstr "Vul e-mailadressen in, één per lijn:"
-
-#: mod/invite.php:150 mod/message.php:258 mod/message.php:424
-#: mod/wallmessage.php:141
-msgid "Your message:"
-msgstr "Jouw bericht:"
-
-#: mod/invite.php:150
-msgid ""
-"You are cordially invited to join me and other close friends on Friendica - "
-"and help us to create a better social web."
-msgstr "Ik nodig je vriendelijk uit om bij mij en andere vrienden te komen op Friendica - en ons te helpen om een beter sociaal web te bouwen."
-
-#: mod/invite.php:152
-msgid "You will need to supply this invitation code: $invite_code"
-msgstr "Je zult deze uitnodigingscode moeten invullen: $invite_code"
-
-#: mod/invite.php:152
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
-msgstr "Eens je geregistreerd bent kun je contact leggen met mij via mijn profielpagina op:"
-
-#: mod/invite.php:154
-msgid ""
-"For more information about the Friendica project and why we feel it is "
-"important, please visit http://friendi.ca"
-msgstr "Voor meer informatie over het Friendica project en waarom wij denken dat het belangrijk is kun je http://friendi.ca/ bezoeken"
-
-#: mod/item.php:116
-msgid "Unable to locate original post."
-msgstr "Ik kan de originele post niet meer vinden."
-
-#: mod/item.php:284
-msgid "Empty post discarded."
-msgstr "Lege post weggegooid."
-
-#: mod/item.php:472 mod/wall_upload.php:240 src/Object/Image.php:966
-#: src/Object/Image.php:982 src/Object/Image.php:990 src/Object/Image.php:1015
-msgid "Wall Photos"
-msgstr "Tijdlijn foto's"
-
-#: mod/item.php:808
-#, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendica social "
-"network."
-msgstr "Dit bericht werd naar jou gestuurd door %s, een lid van het Friendica sociale netwerk."
-
-#: mod/item.php:810
-#, php-format
-msgid "You may visit them online at %s"
-msgstr "Je kunt ze online bezoeken op %s"
-
-#: mod/item.php:811
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
-msgstr "Contacteer de afzender door op dit bericht te antwoorden als je deze berichten niet wilt ontvangen."
-
-#: mod/item.php:815
-#, php-format
-msgid "%s posted an update."
-msgstr "%s heeft een wijziging geplaatst."
-
-#: mod/lockview.php:42 mod/lockview.php:50
-msgid "Remote privacy information not available."
-msgstr "Privacyinformatie op afstand niet beschikbaar."
-
-#: mod/lockview.php:59
-msgid "Visible to:"
-msgstr "Zichtbaar voor:"
-
-#: mod/lostpass.php:28
-msgid "No valid account found."
-msgstr "Geen geldige account gevonden."
-
-#: mod/lostpass.php:40
-msgid "Password reset request issued. Check your email."
-msgstr "Verzoek om wachtwoord opnieuw in te stellen werd verstuurd. Kijk uw e-mail na."
-
-#: mod/lostpass.php:46
-#, php-format
-msgid ""
-"\n"
-"\t\tDear %1$s,\n"
-"\t\t\tA request was recently received at \"%2$s\" to reset your account\n"
-"\t\tpassword. In order to confirm this request, please select the verification link\n"
-"\t\tbelow or paste it into your web browser address bar.\n"
-"\n"
-"\t\tIf you did NOT request this change, please DO NOT follow the link\n"
-"\t\tprovided and ignore and/or delete this email, the request will expire shortly.\n"
-"\n"
-"\t\tYour password will not be changed unless we can verify that you\n"
-"\t\tissued this request."
-msgstr "\n\t\tBeste %1$s,\n\t\t\tEr is recent om \"%2$s\" een verzoek gekomen om je paswoord te resetten.\n\t\tOm dit verzoek te bevestigen, gelieve de verificatie link hieronder te volgen of in je browser te kopiëren.\n\n\t\tAls je dit verzoek NIET hebt gedaan, volg deze link dan NIET en negeer \n\t\ten/of verwijder deze email, het verzoek zal binnenkort vanzelf ongeldig worden.\n\n\t\tJe paswoord zal niet aangepast worden tenzij we kunnen verifiëren\n\t\tdat je dit verzoek verzonden hebt."
-
-#: mod/lostpass.php:57
-#, php-format
-msgid ""
-"\n"
-"\t\tFollow this link soon to verify your identity:\n"
-"\n"
-"\t\t%1$s\n"
-"\n"
-"\t\tYou will then receive a follow-up message containing the new password.\n"
-"\t\tYou may change that password from your account settings page after logging in.\n"
-"\n"
-"\t\tThe login details are as follows:\n"
-"\n"
-"\t\tSite Location:\t%2$s\n"
-"\t\tLogin Name:\t%3$s"
-msgstr "\n\t\tVolg nu deze link om je identiteit te bevestigen:\n\n\t\t%1$s\n\n\t\tJe zal dan een boodschap krijgen met je nieuw paswoord.\n\t\tJe kunt je paswoord veranderen in je instelling pagina nadat je ingelogd bent.\n\n\t\tDe login details zijn de volgende:\n\n\t\tSite locatie:\t%2$s\n\t\tLogin naam:\t%3$s"
-
-#: mod/lostpass.php:74
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Op %s werd gevraagd je wachtwoord opnieuw in te stellen"
-
-#: mod/lostpass.php:90
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "Verzoek kon niet geverifieerd worden. (Misschien heb je het voordien al ingediend.) Wachtwoord niet opnieuw ingesteld."
-
-#: mod/lostpass.php:103
-msgid "Request has expired, please make a new one."
-msgstr "Aanvraag is verlopen, gelieve een nieuwe aan te maken."
-
-#: mod/lostpass.php:118
-msgid "Forgot your Password?"
-msgstr "Wachtwoord vergeten?"
-
-#: mod/lostpass.php:119
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Voer je e-mailadres in en verstuur het om je wachtwoord opnieuw in te stellen. Kijk dan je e-mail na voor verdere instructies."
-
-#: mod/lostpass.php:120 src/Module/Login.php:314
-msgid "Nickname or Email: "
-msgstr "Bijnaam of e-mail:"
-
-#: mod/lostpass.php:121
-msgid "Reset"
-msgstr "Opnieuw"
-
-#: mod/lostpass.php:137 src/Module/Login.php:326
-msgid "Password Reset"
-msgstr "Wachtwoord opnieuw instellen"
-
-#: mod/lostpass.php:138
-msgid "Your password has been reset as requested."
-msgstr "Je wachtwoord is opnieuw ingesteld zoals gevraagd."
-
-#: mod/lostpass.php:139
-msgid "Your new password is"
-msgstr "Je nieuwe wachtwoord is"
-
-#: mod/lostpass.php:140
-msgid "Save or copy your new password - and then"
-msgstr "Bewaar of kopieer je nieuw wachtwoord - en dan"
-
-#: mod/lostpass.php:141
-msgid "click here to login"
-msgstr "klik hier om in te loggen"
-
-#: mod/lostpass.php:142
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr "Je kunt dit wachtwoord veranderen nadat je bent ingelogd op de <em>Instellingen></em> pagina."
-
-#: mod/lostpass.php:150
-#, php-format
-msgid ""
-"\n"
-"\t\t\tDear %1$s,\n"
-"\t\t\t\tYour password has been changed as requested. Please retain this\n"
-"\t\t\tinformation for your records (or change your password immediately to\n"
-"\t\t\tsomething that you will remember).\n"
-"\t\t"
-msgstr "\n\t\t\tBeste %1$s,\n\t\t\t\tJe paswoord is aangepast zoals je gevraagd hebt. Hou deze informatie\n\t\t\talstublieft bij (of pas je paswoord onmiddellijk aan\n\t\t\tnaar iets wat je je kan herinneren).\n\t\t"
-
-#: mod/lostpass.php:156
-#, php-format
-msgid ""
-"\n"
-"\t\t\tYour login details are as follows:\n"
-"\n"
-"\t\t\tSite Location:\t%1$s\n"
-"\t\t\tLogin Name:\t%2$s\n"
-"\t\t\tPassword:\t%3$s\n"
-"\n"
-"\t\t\tYou may change that password from your account settings page after logging in.\n"
-"\t\t"
-msgstr "\n\t\t\tJe login details zijn de volgende:\n\n\t\t\tSite Locatie:\t%1$s\n\t\t\tLogin Naam:\t%2$s\n\t\t\tPaswoord:\t%3$s\n\n\t\t\tJe kan dit paswoord in het account instellingen aanpassen nadat je ingelogd bent.\n\t\t"
-
-#: mod/lostpass.php:170
-#, php-format
-msgid "Your password has been changed at %s"
-msgstr "Je wachtwoord is veranderd op %s"
-
-#: mod/manage.php:180
-msgid "Manage Identities and/or Pages"
-msgstr "Beheer Identiteiten en/of Pagina's"
-
-#: mod/manage.php:181
-msgid ""
-"Toggle between different identities or community/group pages which share "
-"your account details or which you have been granted \"manage\" permissions"
-msgstr "Wissel tussen verschillende identiteiten of forum/groeppagina's die jouw accountdetails delen of waar je \"beheerdersrechten\" hebt gekregen."
-
-#: mod/manage.php:182
-msgid "Select an identity to manage: "
-msgstr "Selecteer een identiteit om te beheren:"
-
 #: mod/match.php:48
 msgid "No keywords to match. Please add keywords to your default profile."
 msgstr "Geen sleutelwoorden om te zoeken. Voeg sleutelwoorden toe aan je standaard profiel."
@@ -5257,1181 +2084,22 @@ msgstr "Is geïnteresseerd in:"
 msgid "Profile Match"
 msgstr "Profielmatch"
 
-#: mod/message.php:31 mod/message.php:120 src/Content/Nav.php:199
-msgid "New Message"
-msgstr "Nieuw Bericht"
-
-#: mod/message.php:74 mod/wallmessage.php:57
-msgid "No recipient selected."
-msgstr "Geen ontvanger geselecteerd."
-
-#: mod/message.php:78
-msgid "Unable to locate contact information."
-msgstr "Ik kan geen contact informatie vinden."
-
-#: mod/message.php:81 mod/wallmessage.php:63
-msgid "Message could not be sent."
-msgstr "Bericht kon niet verzonden worden."
-
-#: mod/message.php:84 mod/wallmessage.php:66
-msgid "Message collection failure."
-msgstr "Fout bij het verzamelen van berichten."
-
-#: mod/message.php:87 mod/wallmessage.php:69
-msgid "Message sent."
-msgstr "Bericht verzonden."
-
-#: mod/message.php:114 mod/notifications.php:43 mod/notifications.php:178
-#: mod/notifications.php:230
-msgid "Discard"
-msgstr "Verwerpen"
-
-#: mod/message.php:127 view/theme/frio/theme.php:268 src/Content/Nav.php:196
-msgid "Messages"
-msgstr "Privéberichten"
-
-#: mod/message.php:152
-msgid "Do you really want to delete this message?"
-msgstr "Wil je echt dit bericht verwijderen?"
-
-#: mod/message.php:169
-msgid "Message deleted."
-msgstr "Bericht verwijderd."
-
-#: mod/message.php:184
-msgid "Conversation removed."
-msgstr "Gesprek verwijderd."
-
-#: mod/message.php:249 mod/wallmessage.php:132
-msgid "Send Private Message"
-msgstr "Verstuur privébericht"
-
-#: mod/message.php:250 mod/message.php:419 mod/wallmessage.php:134
-msgid "To:"
-msgstr "Aan:"
-
-#: mod/message.php:254 mod/message.php:421 mod/wallmessage.php:135
-msgid "Subject:"
-msgstr "Onderwerp:"
-
-#: mod/message.php:290
-msgid "No messages."
-msgstr "Geen berichten."
-
-#: mod/message.php:331
-msgid "Message not available."
-msgstr "Bericht niet beschikbaar."
-
-#: mod/message.php:395
-msgid "Delete message"
-msgstr "Verwijder bericht"
-
-#: mod/message.php:397 mod/message.php:498
-msgid "D, d M Y - g:i A"
-msgstr "D, d M Y - g:i A"
-
-#: mod/message.php:412 mod/message.php:495
-msgid "Delete conversation"
-msgstr "Verwijder gesprek"
-
-#: mod/message.php:414
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Geen beveiligde communicatie beschikbaar. Je kunt <strong>misschien</strong> antwoorden vanaf de profiel-pagina van de afzender."
-
-#: mod/message.php:418
-msgid "Send Reply"
-msgstr "Verstuur Antwoord"
-
-#: mod/message.php:469
-#, php-format
-msgid "Unknown sender - %s"
-msgstr "Onbekende afzender - %s"
-
-#: mod/message.php:471
-#, php-format
-msgid "You and %s"
-msgstr "Jij en %s"
-
-#: mod/message.php:473
-#, php-format
-msgid "%s and You"
-msgstr "%s en jij"
-
-#: mod/message.php:501
-#, php-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] "%d bericht"
-msgstr[1] "%d berichten"
-
-#: mod/network.php:193 mod/search.php:39
-msgid "Remove term"
-msgstr "Verwijder zoekterm"
-
-#: mod/network.php:200 mod/search.php:48 src/Content/Feature.php:100
-msgid "Saved Searches"
-msgstr "Opgeslagen zoekopdrachten"
-
-#: mod/network.php:201 src/Model/Group.php:412
-msgid "add"
-msgstr "toevoegen"
-
-#: mod/network.php:545
-#, php-format
-msgid ""
-"Warning: This group contains %s member from a network that doesn't allow non"
-" public messages."
-msgid_plural ""
-"Warning: This group contains %s members from a network that doesn't allow "
-"non public messages."
-msgstr[0] "Waarschuwing: Deze groep bevat %s lid van een netwerk dat geen niet-publieke boodschappen toelaat."
-msgstr[1] "Waarschuwing: Deze groep bevat %s leden van een netwerk dat geen niet-publieke boodschappen toelaat."
-
-#: mod/network.php:548
-msgid "Messages in this group won't be send to these receivers."
-msgstr "Boodschappen in deze groep zullen niet verzonden worden naar deze ontvangers."
-
-#: mod/network.php:617
-msgid "No such group"
-msgstr "Zo'n groep bestaat niet"
-
-#: mod/network.php:642
-#, php-format
-msgid "Group: %s"
-msgstr "Groep: %s"
-
-#: mod/network.php:668
-msgid "Private messages to this person are at risk of public disclosure."
-msgstr "Privéberichten naar deze persoon kunnen openbaar gemaakt worden."
-
-#: mod/network.php:671
-msgid "Invalid contact."
-msgstr "Ongeldig contact."
-
-#: mod/network.php:940
-msgid "Commented Order"
-msgstr "Nieuwe reacties bovenaan"
-
-#: mod/network.php:943
-msgid "Sort by Comment Date"
-msgstr "Berichten met nieuwe reacties bovenaan"
-
-#: mod/network.php:948
-msgid "Posted Order"
-msgstr "Nieuwe berichten bovenaan"
-
-#: mod/network.php:951
-msgid "Sort by Post Date"
-msgstr "Nieuwe berichten bovenaan"
-
-#: mod/network.php:959 mod/profiles.php:594
-#: src/Core/NotificationsManager.php:183
-msgid "Personal"
-msgstr "Persoonlijk"
-
-#: mod/network.php:962
-msgid "Posts that mention or involve you"
-msgstr "Alleen berichten die jou vermelden of op jou betrekking hebben"
-
-#: mod/network.php:970
-msgid "New"
-msgstr "Nieuw"
-
-#: mod/network.php:973
-msgid "Activity Stream - by date"
-msgstr "Activiteitenstroom - volgens datum"
-
-#: mod/network.php:981
-msgid "Shared Links"
-msgstr "Gedeelde links"
-
-#: mod/network.php:984
-msgid "Interesting Links"
-msgstr "Interessante links"
-
-#: mod/network.php:992
-msgid "Starred"
-msgstr "Met ster"
-
-#: mod/network.php:995
-msgid "Favourite Posts"
-msgstr "Favoriete berichten"
-
-#: mod/notes.php:42 src/Model/Profile.php:942
-msgid "Personal Notes"
-msgstr "Persoonlijke Nota's"
-
-#: mod/notifications.php:34
-msgid "Invalid request identifier."
-msgstr "Ongeldige <em>request identifier</em>."
-
-#: mod/notifications.php:92 src/Content/Nav.php:191
-msgid "Notifications"
-msgstr "Notificaties"
-
-#: mod/notifications.php:100
-msgid "Network Notifications"
-msgstr "Netwerknotificaties"
-
-#: mod/notifications.php:105 mod/notify.php:81
-msgid "System Notifications"
-msgstr "Systeemnotificaties"
-
-#: mod/notifications.php:110
-msgid "Personal Notifications"
-msgstr "Persoonlijke notificaties"
-
-#: mod/notifications.php:115
-msgid "Home Notifications"
-msgstr "Tijdlijn-notificaties"
-
-#: mod/notifications.php:143
-msgid "Show Ignored Requests"
-msgstr "Toon genegeerde verzoeken"
-
-#: mod/notifications.php:143
-msgid "Hide Ignored Requests"
-msgstr "Verberg genegeerde verzoeken"
-
-#: mod/notifications.php:156 mod/notifications.php:238
-msgid "Notification type:"
-msgstr "Notificatiesoort:"
-
-#: mod/notifications.php:159
-msgid "Suggested by:"
-msgstr "Voorgesteld door:"
-
-#: mod/notifications.php:197
-msgid "Claims to be known to you: "
-msgstr "Denkt dat je hem of haar kent:"
-
-#: mod/notifications.php:198
-msgid "yes"
-msgstr "Ja"
-
-#: mod/notifications.php:198
-msgid "no"
-msgstr "Nee"
-
-#: mod/notifications.php:199 mod/notifications.php:204
-msgid "Shall your connection be bidirectional or not?"
-msgstr "Zal je connectie bidirectioneel zijn of niet?"
-
-#: mod/notifications.php:200 mod/notifications.php:205
-#, 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 "%s als vriend accepteren laat %s toe om in te schrijven op je berichten, en je zal ook updates ontvangen van hen in je nieuws feed."
-
-#: mod/notifications.php:201
-#, 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 "%s als volger accepteren laat hen toe om in te schrijven op je berichten, maar je zal geen updates ontvangen van hen in je nieuws feed."
-
-#: mod/notifications.php:206
-#, 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 "%s als deler accepteren laat hen toe om in te schrijven op je berichten, maar je zal geen updates ontvangen van hen in je nieuws feed."
-
-#: mod/notifications.php:217
-msgid "Friend"
-msgstr "Vriend"
-
-#: mod/notifications.php:218
-msgid "Sharer"
-msgstr "Deler"
-
-#: mod/notifications.php:218
-msgid "Subscriber"
-msgstr "Volger"
-
-#: mod/notifications.php:275
-msgid "No introductions."
-msgstr "Geen vriendschaps- of connectieverzoeken."
-
-#: mod/notifications.php:313
-msgid "Show unread"
-msgstr "Toon ongelezen"
-
-#: mod/notifications.php:313
-msgid "Show all"
-msgstr "Toon alles"
-
-#: mod/notifications.php:318
-#, php-format
-msgid "No more %s notifications."
-msgstr "Geen %s notificaties meer."
-
-#: mod/notify.php:77
-msgid "No more system notifications."
-msgstr "Geen systeemnotificaties meer."
-
-#: mod/oexchange.php:30
-msgid "Post successful."
-msgstr "Bericht succesvol geplaatst."
-
-#: mod/openid.php:29
-msgid "OpenID protocol error. No ID returned."
-msgstr "OpenID protocol fout. Geen ID Gevonden."
-
-#: mod/openid.php:66
-msgid ""
-"Account not found and OpenID registration is not permitted on this site."
-msgstr "Account niet gevonden, en OpenID-registratie is niet toegelaten op deze website."
-
-#: mod/openid.php:116 src/Module/Login.php:85 src/Module/Login.php:134
-msgid "Login failed."
-msgstr "Login mislukt."
-
-#: mod/photos.php:111 src/Model/Profile.php:903
-msgid "Photo Albums"
-msgstr "Fotoalbums"
-
-#: mod/photos.php:112 mod/photos.php:1678
-msgid "Recent Photos"
-msgstr "Recente foto's"
-
-#: mod/photos.php:115 mod/photos.php:1206 mod/photos.php:1680
-msgid "Upload New Photos"
-msgstr "Nieuwe foto's uploaden"
-
-#: mod/photos.php:134 mod/settings.php:51
+#: mod/settings.php:51 mod/photos.php:134
 msgid "everybody"
 msgstr "iedereen"
 
-#: mod/photos.php:190
-msgid "Contact information unavailable"
-msgstr "Contactinformatie niet beschikbaar"
-
-#: mod/photos.php:208
-msgid "Album not found."
-msgstr "Album niet gevonden"
-
-#: mod/photos.php:238 mod/photos.php:251 mod/photos.php:1157
-msgid "Delete Album"
-msgstr "Verwijder album"
-
-#: mod/photos.php:249
-msgid "Do you really want to delete this photo album and all its photos?"
-msgstr "Wil je echt dit fotoalbum en alle foto's erin verwijderen?"
-
-#: mod/photos.php:309 mod/photos.php:320 mod/photos.php:1423
-msgid "Delete Photo"
-msgstr "Verwijder foto"
-
-#: mod/photos.php:318
-msgid "Do you really want to delete this photo?"
-msgstr "Wil je echt deze foto verwijderen?"
-
-#: mod/photos.php:661
-msgid "a photo"
-msgstr "een foto"
-
-#: mod/photos.php:661
-#, php-format
-msgid "%1$s was tagged in %2$s by %3$s"
-msgstr "%1$s is gelabeld in %2$s door %3$s"
-
-#: mod/photos.php:758 mod/photos.php:761 mod/photos.php:790
-#: mod/profile_photo.php:151 mod/wall_upload.php:195
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr "Beeld is groter dan de limiet ( %s )"
-
-#: mod/photos.php:764
-msgid "Image upload didn't complete, please try again"
-msgstr "Opladen van het beeld is niet compleet, probeer het opnieuw"
-
-#: mod/photos.php:767
-msgid "Image file is missing"
-msgstr "Beeld bestand ontbreekt"
-
-#: mod/photos.php:772
-msgid ""
-"Server can't accept new file upload at this time, please contact your "
-"administrator"
-msgstr "De server kan op dit moment geen nieuw bestand opladen, contacteer alsjeblieft je beheerder"
-
-#: mod/photos.php:798
-msgid "Image file is empty."
-msgstr "Afbeeldingsbestand is leeg."
-
-#: mod/photos.php:813 mod/profile_photo.php:160 mod/wall_upload.php:209
-msgid "Unable to process image."
-msgstr "Niet in staat om de afbeelding te verwerken"
-
-#: mod/photos.php:842 mod/profile_photo.php:305 mod/wall_upload.php:248
-msgid "Image upload failed."
-msgstr "Uploaden van afbeelding mislukt."
-
-#: mod/photos.php:935
-msgid "No photos selected"
-msgstr "Geen foto's geselecteerd"
-
-#: mod/photos.php:1032 mod/videos.php:306
-msgid "Access to this item is restricted."
-msgstr "Toegang tot dit item is beperkt."
-
-#: mod/photos.php:1086
-msgid "Upload Photos"
-msgstr "Upload foto's"
-
-#: mod/photos.php:1090 mod/photos.php:1152
-msgid "New album name: "
-msgstr "Nieuwe albumnaam: "
-
-#: mod/photos.php:1091
-msgid "or select existing album:"
-msgstr "Of selecteer bestaand album:"
-
-#: mod/photos.php:1092
-msgid "Do not show a status post for this upload"
-msgstr "Toon geen bericht op je tijdlijn van deze upload"
-
-#: mod/photos.php:1102 mod/photos.php:1426 mod/settings.php:1224
-msgid "Show to Groups"
-msgstr "Tonen aan groepen"
-
-#: mod/photos.php:1103 mod/photos.php:1427 mod/settings.php:1225
-msgid "Show to Contacts"
-msgstr "Tonen aan contacten"
-
-#: mod/photos.php:1163
-msgid "Edit Album"
-msgstr "Album wijzigen"
-
-#: mod/photos.php:1168
-msgid "Show Newest First"
-msgstr "Toon niewste eerst"
-
-#: mod/photos.php:1170
-msgid "Show Oldest First"
-msgstr "Toon oudste eerst"
-
-#: mod/photos.php:1191 mod/photos.php:1663
-msgid "View Photo"
-msgstr "Bekijk foto"
-
-#: mod/photos.php:1232
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Toegang geweigerd. Toegang tot dit item is mogelijk beperkt."
-
-#: mod/photos.php:1234
-msgid "Photo not available"
-msgstr "Foto is niet beschikbaar"
-
-#: mod/photos.php:1303
-msgid "View photo"
-msgstr "Bekijk foto"
-
-#: mod/photos.php:1303
-msgid "Edit photo"
-msgstr "Bewerk foto"
-
-#: mod/photos.php:1304
-msgid "Use as profile photo"
-msgstr "Gebruik als profielfoto"
-
-#: mod/photos.php:1310 src/Object/Post.php:150
-msgid "Private Message"
-msgstr "Privébericht"
-
-#: mod/photos.php:1330
-msgid "View Full Size"
-msgstr "Bekijk in volledig formaat"
-
-#: mod/photos.php:1391
-msgid "Tags: "
-msgstr "Labels: "
-
-#: mod/photos.php:1394
-msgid "[Remove any tag]"
-msgstr "[Alle labels verwijderen]"
-
-#: mod/photos.php:1409
-msgid "New album name"
-msgstr "Nieuwe albumnaam"
-
-#: mod/photos.php:1410
-msgid "Caption"
-msgstr "Onderschrift"
-
-#: mod/photos.php:1411
-msgid "Add a Tag"
-msgstr "Een label toevoegen"
-
-#: mod/photos.php:1411
-msgid ""
-"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl, #Ardennen, #camping "
-
-#: mod/photos.php:1412
-msgid "Do not rotate"
-msgstr "Niet roteren"
-
-#: mod/photos.php:1413
-msgid "Rotate CW (right)"
-msgstr "Roteren met de klok mee (rechts)"
-
-#: mod/photos.php:1414
-msgid "Rotate CCW (left)"
-msgstr "Roteren tegen de klok in (links)"
-
-#: mod/photos.php:1448 src/Object/Post.php:292
-msgid "I like this (toggle)"
-msgstr "Vind ik leuk"
-
-#: mod/photos.php:1449 src/Object/Post.php:293
-msgid "I don't like this (toggle)"
-msgstr "Vind ik niet leuk"
-
-#: mod/photos.php:1466 mod/photos.php:1505 mod/photos.php:1565
-#: src/Object/Post.php:397 src/Object/Post.php:793
-msgid "Comment"
-msgstr "Reacties"
-
-#: mod/photos.php:1597
-msgid "Map"
-msgstr "Kaart"
-
-#: mod/photos.php:1669 mod/videos.php:380
-msgid "View Album"
-msgstr "Album bekijken"
-
-#: mod/ping.php:289
-msgid "{0} wants to be your friend"
-msgstr "{0} wilt je vriend worden"
-
-#: mod/ping.php:305
-msgid "{0} sent you a message"
-msgstr "{0} stuurde jou een bericht"
-
-#: mod/ping.php:321
-msgid "{0} requested registration"
-msgstr "{0} vroeg om zich te registreren"
-
-#: mod/poke.php:188
-msgid "Poke/Prod"
-msgstr "Aanstoten/porren"
-
-#: mod/poke.php:189
-msgid "poke, prod or do other things to somebody"
-msgstr "aanstoten, porren of andere dingen met iemand doen"
-
-#: mod/poke.php:190
-msgid "Recipient"
-msgstr "Ontvanger"
-
-#: mod/poke.php:191
-msgid "Choose what you wish to do to recipient"
-msgstr "Kies wat je met de ontvanger wil doen"
-
-#: mod/poke.php:194
-msgid "Make this post private"
-msgstr "Dit bericht privé maken"
-
-#: mod/profile.php:38 src/Model/Profile.php:114
-msgid "Requested profile is not available."
-msgstr "Gevraagde profiel is niet beschikbaar."
-
-#: mod/profile.php:79 mod/profile.php:82 src/Protocol/OStatus.php:1274
-#, php-format
-msgid "%s's timeline"
-msgstr "Tijdslijn van %s"
-
-#: mod/profile.php:80 src/Protocol/OStatus.php:1275
-#, php-format
-msgid "%s's posts"
-msgstr "Berichten van %s"
-
-#: mod/profile.php:81 src/Protocol/OStatus.php:1276
-#, php-format
-msgid "%s's comments"
-msgstr "reactie van %s"
-
-#: mod/profile_photo.php:55
-msgid "Image uploaded but image cropping failed."
-msgstr "Afbeelding opgeladen, maar bijsnijden mislukt."
-
-#: mod/profile_photo.php:87 mod/profile_photo.php:96 mod/profile_photo.php:105
-#: mod/profile_photo.php:313
-#, php-format
-msgid "Image size reduction [%s] failed."
-msgstr "Verkleining van de afbeelding [%s] mislukt."
-
-#: mod/profile_photo.php:124
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Shift-herlaad de pagina, of maak de browser cache leeg als nieuwe foto's niet onmiddellijk verschijnen."
-
-#: mod/profile_photo.php:132
-msgid "Unable to process image"
-msgstr "Ik kan de afbeelding niet verwerken"
-
-#: mod/profile_photo.php:244
-msgid "Upload File:"
-msgstr "Upload bestand:"
-
-#: mod/profile_photo.php:245
-msgid "Select a profile:"
-msgstr "Kies een profiel:"
-
-#: mod/profile_photo.php:250
-msgid "or"
-msgstr "of"
-
-#: mod/profile_photo.php:251
-msgid "skip this step"
-msgstr "Deze stap overslaan"
-
-#: mod/profile_photo.php:251
-msgid "select a photo from your photo albums"
-msgstr "Kies een foto uit je fotoalbums"
-
-#: mod/profile_photo.php:264
-msgid "Crop Image"
-msgstr "Afbeelding bijsnijden"
-
-#: mod/profile_photo.php:265
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Pas het afsnijden van de afbeelding aan voor het beste resultaat."
-
-#: mod/profile_photo.php:267
-msgid "Done Editing"
-msgstr "Wijzigingen compleet"
-
-#: mod/profile_photo.php:303
-msgid "Image uploaded successfully."
-msgstr "Uploaden van afbeelding gelukt."
-
-#: mod/profiles.php:57
-msgid "Profile deleted."
-msgstr "Profiel verwijderd"
-
-#: mod/profiles.php:73 mod/profiles.php:109
-msgid "Profile-"
-msgstr "Profiel-"
-
-#: mod/profiles.php:92 mod/profiles.php:131
-msgid "New profile created."
-msgstr "Nieuw profiel aangemaakt."
-
-#: mod/profiles.php:115
-msgid "Profile unavailable to clone."
-msgstr "Profiel niet beschikbaar om te klonen."
-
-#: mod/profiles.php:203
-msgid "Profile Name is required."
-msgstr "Profielnaam is vereist."
-
-#: mod/profiles.php:344
-msgid "Marital Status"
-msgstr "Echtelijke staat"
-
-#: mod/profiles.php:348
-msgid "Romantic Partner"
-msgstr "Romantische Partner"
-
-#: mod/profiles.php:360
-msgid "Work/Employment"
-msgstr "Werk"
-
-#: mod/profiles.php:363
-msgid "Religion"
-msgstr "Godsdienst"
-
-#: mod/profiles.php:367
-msgid "Political Views"
-msgstr "Politieke standpunten"
-
-#: mod/profiles.php:371
-msgid "Gender"
-msgstr "Geslacht"
-
-#: mod/profiles.php:375
-msgid "Sexual Preference"
-msgstr "Seksuele Voorkeur"
-
-#: mod/profiles.php:379
-msgid "XMPP"
-msgstr "XMPP"
-
-#: mod/profiles.php:383
-msgid "Homepage"
-msgstr "Tijdlijn"
-
-#: mod/profiles.php:387 mod/profiles.php:593
-msgid "Interests"
-msgstr "Interesses"
-
-#: mod/profiles.php:398 mod/profiles.php:589
-msgid "Location"
-msgstr "Plaats"
-
-#: mod/profiles.php:481
-msgid "Profile updated."
-msgstr "Profiel opgeslagen"
-
-#: mod/profiles.php:538
-msgid "Hide contacts and friends:"
-msgstr "Verberg contacten en vrienden:"
-
-#: mod/profiles.php:543
-msgid "Hide your contact/friend list from viewers of this profile?"
-msgstr "Je vrienden/contacten verbergen voor bezoekers van dit profiel?"
-
-#: mod/profiles.php:563
-msgid "Show more profile fields:"
-msgstr "Toon meer profiel velden:"
-
-#: mod/profiles.php:575
-msgid "Profile Actions"
-msgstr "Profiel Acties"
-
-#: mod/profiles.php:576
-msgid "Edit Profile Details"
-msgstr "Profieldetails bewerken"
-
-#: mod/profiles.php:578
-msgid "Change Profile Photo"
-msgstr "Profielfoto wijzigen"
-
-#: mod/profiles.php:580
-msgid "View this profile"
-msgstr "Dit profiel bekijken"
-
-#: mod/profiles.php:581
-msgid "View all profiles"
-msgstr "Toon alle profielen"
-
-#: mod/profiles.php:582 mod/profiles.php:677 src/Model/Profile.php:391
-msgid "Edit visibility"
-msgstr "Pas zichtbaarheid aan"
-
-#: mod/profiles.php:583
-msgid "Create a new profile using these settings"
-msgstr "Nieuw profiel aanmaken met deze instellingen"
-
-#: mod/profiles.php:584
-msgid "Clone this profile"
-msgstr "Dit profiel klonen"
-
-#: mod/profiles.php:585
-msgid "Delete this profile"
-msgstr "Dit profiel verwijderen"
-
-#: mod/profiles.php:587
-msgid "Basic information"
-msgstr "Basis informatie"
-
-#: mod/profiles.php:588
-msgid "Profile picture"
-msgstr "Profiel foto"
-
-#: mod/profiles.php:590
-msgid "Preferences"
-msgstr "Voorkeuren"
-
-#: mod/profiles.php:591
-msgid "Status information"
-msgstr "Status informatie"
-
-#: mod/profiles.php:592
-msgid "Additional information"
-msgstr "Bijkomende informatie"
-
-#: mod/profiles.php:595
-msgid "Relation"
-msgstr "Relatie"
-
-#: mod/profiles.php:596 src/Util/Temporal.php:81 src/Util/Temporal.php:83
-msgid "Miscellaneous"
-msgstr "Diversen"
-
-#: mod/profiles.php:599
-msgid "Your Gender:"
-msgstr "Je Geslacht:"
-
-#: mod/profiles.php:600
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
-msgstr "<span class=\"heart\">&hearts;</span> Echtelijke Staat:"
-
-#: mod/profiles.php:601 src/Model/Profile.php:778
-msgid "Sexual Preference:"
-msgstr "Seksuele Voorkeur:"
-
-#: mod/profiles.php:602
-msgid "Example: fishing photography software"
-msgstr "Voorbeeld: vissen fotografie software"
-
-#: mod/profiles.php:607
-msgid "Profile Name:"
-msgstr "Profiel Naam:"
-
-#: mod/profiles.php:609
-msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
-msgstr "Dit is jouw <strong>publiek</strong> profiel.<br />Het <strong>kan</strong> zichtbaar zijn voor iedereen op het internet."
-
-#: mod/profiles.php:610
-msgid "Your Full Name:"
-msgstr "Je volledige naam:"
-
-#: mod/profiles.php:611
-msgid "Title/Description:"
-msgstr "Titel/Beschrijving:"
-
-#: mod/profiles.php:614
-msgid "Street Address:"
-msgstr "Postadres:"
-
-#: mod/profiles.php:615
-msgid "Locality/City:"
-msgstr "Gemeente/Stad:"
-
-#: mod/profiles.php:616
-msgid "Region/State:"
-msgstr "Regio/Staat:"
-
-#: mod/profiles.php:617
-msgid "Postal/Zip Code:"
-msgstr "Postcode:"
-
-#: mod/profiles.php:618
-msgid "Country:"
-msgstr "Land:"
-
-#: mod/profiles.php:619 src/Util/Temporal.php:149
-msgid "Age: "
-msgstr "Leeftijd:"
-
-#: mod/profiles.php:622
-msgid "Who: (if applicable)"
-msgstr "Wie: (indien toepasbaar)"
-
-#: mod/profiles.php:622
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Voorbeelden: Kathleen123, Kathleen Peeters, kathleen@voorbeeld.nl"
-
-#: mod/profiles.php:623
-msgid "Since [date]:"
-msgstr "Sinds [datum]:"
-
-#: mod/profiles.php:625
-msgid "Tell us about yourself..."
-msgstr "Vertel iets over jezelf..."
-
-#: mod/profiles.php:626
-msgid "XMPP (Jabber) address:"
-msgstr "XMPP (Jabber) adres:"
-
-#: mod/profiles.php:626
-msgid ""
-"The XMPP address will be propagated to your contacts so that they can follow"
-" you."
-msgstr "Het XMPP adres zal doorgegeven worden aan je contacten zodat zij je kunnen volgen."
-
-#: mod/profiles.php:627
-msgid "Homepage URL:"
-msgstr "Adres tijdlijn:"
-
-#: mod/profiles.php:628 src/Model/Profile.php:786
-msgid "Hometown:"
-msgstr "Woonplaats:"
-
-#: mod/profiles.php:629 src/Model/Profile.php:794
-msgid "Political Views:"
-msgstr "Politieke standpunten:"
-
-#: mod/profiles.php:630
-msgid "Religious Views:"
-msgstr "Geloof:"
-
-#: mod/profiles.php:631
-msgid "Public Keywords:"
-msgstr "Publieke Sleutelwoorden:"
-
-#: mod/profiles.php:631
-msgid "(Used for suggesting potential friends, can be seen by others)"
-msgstr "(Gebruikt om mogelijke vrienden voor te stellen, kan door anderen gezien worden)"
-
-#: mod/profiles.php:632
-msgid "Private Keywords:"
-msgstr "Privé Sleutelwoorden:"
-
-#: mod/profiles.php:632
-msgid "(Used for searching profiles, never shown to others)"
-msgstr "(Gebruikt om profielen te zoeken, nooit aan anderen getoond)"
-
-#: mod/profiles.php:633 src/Model/Profile.php:810
-msgid "Likes:"
-msgstr "Houdt van:"
-
-#: mod/profiles.php:634 src/Model/Profile.php:814
-msgid "Dislikes:"
-msgstr "Houdt niet van:"
-
-#: mod/profiles.php:635
-msgid "Musical interests"
-msgstr "Muzikale interesses"
-
-#: mod/profiles.php:636
-msgid "Books, literature"
-msgstr "Boeken, literatuur"
-
-#: mod/profiles.php:637
-msgid "Television"
-msgstr "Televisie"
-
-#: mod/profiles.php:638
-msgid "Film/dance/culture/entertainment"
-msgstr "Film/dans/cultuur/ontspanning"
-
-#: mod/profiles.php:639
-msgid "Hobbies/Interests"
-msgstr "Hobby's/Interesses"
-
-#: mod/profiles.php:640
-msgid "Love/romance"
-msgstr "Liefde/romance"
-
-#: mod/profiles.php:641
-msgid "Work/employment"
-msgstr "Werk"
-
-#: mod/profiles.php:642
-msgid "School/education"
-msgstr "School/opleiding"
-
-#: mod/profiles.php:643
-msgid "Contact information and Social Networks"
-msgstr "Contactinformatie en sociale netwerken"
-
-#: mod/profiles.php:674 src/Model/Profile.php:387
-msgid "Profile Image"
-msgstr "Profiel afbeelding"
-
-#: mod/profiles.php:676 src/Model/Profile.php:390
-msgid "visible to everybody"
-msgstr "zichtbaar voor iedereen"
-
-#: mod/profiles.php:683
-msgid "Edit/Manage Profiles"
-msgstr "Wijzig/Beheer Profielen"
-
-#: mod/profiles.php:684 src/Model/Profile.php:377 src/Model/Profile.php:399
-msgid "Change profile photo"
-msgstr "Profiel foto wijzigen"
-
-#: mod/profiles.php:685 src/Model/Profile.php:378
-msgid "Create New Profile"
-msgstr "Maak nieuw profiel"
-
-#: mod/profperm.php:34 mod/profperm.php:65
-msgid "Invalid profile identifier."
-msgstr "Ongeldige profiel-identificatie."
-
-#: mod/profperm.php:111
-msgid "Profile Visibility Editor"
-msgstr "Profiel Zichtbaarheid Editor"
-
-#: mod/profperm.php:124
-msgid "Visible To"
-msgstr "Zichtbaar voor"
-
-#: mod/profperm.php:140
-msgid "All Contacts (with secure profile access)"
-msgstr "Alle contacten (met veilige profieltoegang)"
-
-#: mod/register.php:99
-msgid ""
-"Registration successful. Please check your email for further instructions."
-msgstr "Registratie geslaagd. Kijk je e-mail na voor verdere instructies."
-
-#: mod/register.php:103
-#, 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 "Kon email niet verzenden. Hier zijn je account details: <br> login: %s <br> paswoord: %s<br><br> Je kan je paswoord aanpassen nadat je ingelogd bent."
-
-#: mod/register.php:110
-msgid "Registration successful."
-msgstr "Registratie succes."
-
-#: mod/register.php:115
-msgid "Your registration can not be processed."
-msgstr "Je registratie kan niet verwerkt worden."
-
-#: mod/register.php:162
-msgid "Your registration is pending approval by the site owner."
-msgstr "Jouw registratie wacht op goedkeuring van de beheerder."
-
-#: mod/register.php:220
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
-msgstr "Je kunt (optioneel) dit formulier invullen via OpenID door je OpenID in te geven en op 'Registreren' te klikken."
-
-#: mod/register.php:221
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
-msgstr "Laat dit veld leeg als je niet vertrouwd bent met OpenID, en vul de rest van de items in."
-
-#: mod/register.php:222
-msgid "Your OpenID (optional): "
-msgstr "Je OpenID (optioneel):"
-
-#: mod/register.php:234
-msgid "Include your profile in member directory?"
-msgstr "Je profiel in de ledengids opnemen?"
-
-#: mod/register.php:261
-msgid "Note for the admin"
-msgstr "Nota voor de beheerder"
-
-#: mod/register.php:261
-msgid "Leave a message for the admin, why you want to join this node"
-msgstr "Laat een boodschap na voor de beheerder, waarom je bij deze node wil komen"
-
-#: mod/register.php:262
-msgid "Membership on this site is by invitation only."
-msgstr "Lidmaatschap van deze website is uitsluitend op uitnodiging."
-
-#: mod/register.php:263
-msgid "Your invitation code: "
-msgstr "Je uitnodigingscode:"
-
-#: mod/register.php:272
-msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
-msgstr "Je volledige naam (bvb. Jan Smit, echt of echt lijkend):"
-
-#: mod/register.php:273
-msgid ""
-"Your Email Address: (Initial information will be send there, so this has to "
-"be an existing address.)"
-msgstr "Je Email Adres: (Initiële informatie zal hier naartoe gezonden worden, dus dit moet een bestaand adres zijn.)"
-
-#: mod/register.php:275 mod/settings.php:1196
-msgid "New Password:"
-msgstr "Nieuw Wachtwoord:"
-
-#: mod/register.php:275
-msgid "Leave empty for an auto generated password."
-msgstr "Laat leeg voor een automatisch gegenereerd paswoord."
-
-#: mod/register.php:276 mod/settings.php:1197
-msgid "Confirm:"
-msgstr "Bevestig:"
-
-#: mod/register.php:277
-#, 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 "Kies een bijnaam. Deze moet beginnen met een letter. Je profiel adres op deze site zal dan '<strong>nickname@%s</strong>' zijn."
-
-#: mod/register.php:278
-msgid "Choose a nickname: "
-msgstr "Kies een bijnaam:"
-
-#: mod/register.php:281 src/Content/Nav.php:128 src/Module/Login.php:283
-msgid "Register"
-msgstr "Registreer"
-
-#: mod/register.php:288
-msgid "Import your profile to this friendica instance"
-msgstr "Importeer je profiel op deze friendica server"
-
-#: mod/register.php:296
-msgid "Note: This node explicitly contains adult content"
-msgstr "Waarschuwing: Deze node heeft inhoud enkel bedoeld voor volwassenen."
-
-#: mod/regmod.php:69
-msgid "Account approved."
-msgstr "Account goedgekeurd."
-
-#: mod/regmod.php:94
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registratie ingetrokken voor %s"
-
-#: mod/regmod.php:101
-msgid "Please login."
-msgstr "Inloggen."
-
-#: mod/removeme.php:47
-msgid "User deleted their account"
-msgstr "Gebruiker verwijderde zijn of haar account"
-
-#: mod/removeme.php:48
-msgid ""
-"On your Friendica node an user deleted their account. Please ensure that "
-"their data is removed from the backups."
-msgstr "Een gebruiker heeft zijn of haar account verwijderd op je Friendica node. Zorg er zeker voor dat zijn of haar data verwijderd is uit de backups."
-
-#: mod/removeme.php:49
-#, php-format
-msgid "The user id is %d"
-msgstr "De gebruikers id is %d"
-
-#: mod/removeme.php:80 mod/removeme.php:83
-msgid "Remove My Account"
-msgstr "Verwijder mijn account"
-
-#: mod/removeme.php:81
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
-msgstr "Dit zal je account volledig verwijderen. Dit kan niet hersteld worden als het eenmaal uitgevoerd is."
-
-#: mod/removeme.php:82
-msgid "Please enter your password for verification:"
-msgstr "Voer je wachtwoord in voor verificatie:"
-
-#: mod/repair_ostatus.php:20
-msgid "Resubscribing to OStatus contacts"
-msgstr "Opnieuw inschrijven bij OStatus contacten"
-
-#: mod/repair_ostatus.php:36
-msgid "Error"
-msgstr "Fout"
-
-#: mod/search.php:112
-msgid "Only logged in users are permitted to perform a search."
-msgstr "Alleen ingelogde gebruikers mogen een zoekopdracht starten."
-
-#: mod/search.php:136
-msgid "Too Many Requests"
-msgstr "Teveel aanvragen"
-
-#: mod/search.php:137
-msgid "Only one search per minute is permitted for not logged in users."
-msgstr "Niet ingelogde gebruikers mogen slechts 1 opzoeking doen per minuut"
-
-#: mod/search.php:246
-#, php-format
-msgid "Items tagged with: %s"
-msgstr "Items getagd met: %s"
-
 #: mod/settings.php:56
 msgid "Account"
 msgstr "Account"
 
-#: mod/settings.php:64 src/Content/Nav.php:210 src/Model/Profile.php:370
+#: mod/settings.php:64 src/Model/Profile.php:372 src/Content/Nav.php:210
 msgid "Profiles"
 msgstr "Profielen"
 
+#: mod/settings.php:72 mod/admin.php:190
+msgid "Additional features"
+msgstr "Extra functies"
+
 #: mod/settings.php:80
 msgid "Display"
 msgstr "Weergave"
@@ -6440,6 +2108,10 @@ msgstr "Weergave"
 msgid "Social Networks"
 msgstr "Sociale netwerken"
 
+#: mod/settings.php:94 mod/admin.php:188 mod/admin.php:2013 mod/admin.php:2073
+msgid "Addons"
+msgstr "Addons"
+
 #: mod/settings.php:101 src/Content/Nav.php:205
 msgid "Delegations"
 msgstr "Delegaties"
@@ -6460,6 +2132,10 @@ msgstr "Account verwijderen"
 msgid "Missing some important data!"
 msgstr "Een belangrijk gegeven ontbreekt!"
 
+#: mod/settings.php:176 mod/settings.php:701 mod/contacts.php:848
+msgid "Update"
+msgstr "Wijzigen"
+
 #: mod/settings.php:285
 msgid "Failed to connect with email account using the settings provided."
 msgstr "Ik kon geen verbinding maken met het e-mail account met de gegeven instellingen."
@@ -6476,7 +2152,7 @@ msgstr "Functies opgeslagen"
 msgid "Relocate message has been send to your contacts"
 msgstr "Verhuis boodschap is verzonden naar je contacten"
 
-#: mod/settings.php:391 src/Model/User.php:374
+#: mod/settings.php:391 src/Model/User.php:377
 msgid "Passwords do not match. Password unchanged."
 msgstr "Wachtwoorden komen niet overeen. Wachtwoord niet gewijzigd."
 
@@ -6538,6 +2214,13 @@ msgstr "Instellingen opgeslagen"
 msgid "Add application"
 msgstr "Toepassing toevoegen"
 
+#: mod/settings.php:675 mod/settings.php:782 mod/settings.php:870
+#: mod/settings.php:959 mod/settings.php:1189 mod/delegate.php:170
+#: mod/admin.php:317 mod/admin.php:1426 mod/admin.php:2074 mod/admin.php:2328
+#: mod/admin.php:2403 mod/admin.php:2550
+msgid "Save Settings"
+msgstr "Instellingen opslaan"
+
 #: mod/settings.php:678 mod/settings.php:704
 msgid "Consumer Key"
 msgstr "Gebruikerssleutel"
@@ -6562,7 +2245,7 @@ msgstr "Je kunt deze toepassing niet wijzigen."
 msgid "Connected Apps"
 msgstr "Verbonden applicaties"
 
-#: mod/settings.php:735 src/Object/Post.php:157 src/Object/Post.php:159
+#: mod/settings.php:735 src/Object/Post.php:158 src/Object/Post.php:160
 msgid "Edit"
 msgstr "Bewerken"
 
@@ -6586,11 +2269,19 @@ msgstr "Geen Addon instellingen geconfigureerd"
 msgid "Addon Settings"
 msgstr "Addon instellingen"
 
+#: mod/settings.php:773 mod/admin.php:2539 mod/admin.php:2540
+msgid "Off"
+msgstr "Uit"
+
+#: mod/settings.php:773 mod/admin.php:2539 mod/admin.php:2540
+msgid "On"
+msgstr "Aan"
+
 #: mod/settings.php:780
 msgid "Additional Features"
 msgstr "Extra functies"
 
-#: mod/settings.php:803 src/Content/ContactSelector.php:81
+#: mod/settings.php:803 src/Content/ContactSelector.php:82
 msgid "Diaspora"
 msgstr "Diaspora"
 
@@ -6734,6 +2425,10 @@ msgstr "Naar map verplaatsen"
 msgid "Move to folder:"
 msgstr "Verplaatsen naar map:"
 
+#: mod/settings.php:903 mod/admin.php:1316
+msgid "No special theme for mobile devices"
+msgstr "Geen speciaal thema voor mobiele apparaten"
+
 #: mod/settings.php:912
 #, php-format
 msgid "%s - (Unsupported)"
@@ -6848,12 +2543,6 @@ msgstr "Speciale Thema Instellingen"
 msgid "Content Settings"
 msgstr "Content Instellingen"
 
-#: mod/settings.php:981 view/theme/duepuntozero/config.php:73
-#: view/theme/frio/config.php:120 view/theme/quattro/config.php:75
-#: view/theme/vier/config.php:121
-msgid "Theme settings"
-msgstr "Thema-instellingen"
-
 #: mod/settings.php:1000
 msgid "Unable to find your profile. Please contact your admin."
 msgstr "Kan je profiel niet vinden. Contacteer alsjeblieft je beheerder."
@@ -6870,42 +2559,74 @@ msgstr "Persoonlijke Pagina Subtypes"
 msgid "Community Forum Subtypes"
 msgstr "Groepsforum Subtypes"
 
+#: mod/settings.php:1048 mod/admin.php:1841
+msgid "Personal Page"
+msgstr "Persoonlijke pagina"
+
 #: mod/settings.php:1049
 msgid "Account for a personal profile."
 msgstr "Account voor een persoonlijk profiel"
 
+#: mod/settings.php:1052 mod/admin.php:1842
+msgid "Organisation Page"
+msgstr "Organisatie Pagina"
+
 #: mod/settings.php:1053
 msgid ""
 "Account for an organisation that automatically approves contact requests as "
 "\"Followers\"."
 msgstr "Account voor een organisatie die automatisch contact aanvragen goedkeurt als \"Volgers\"."
 
+#: mod/settings.php:1056 mod/admin.php:1843
+msgid "News Page"
+msgstr "Nieuws pagina"
+
 #: mod/settings.php:1057
 msgid ""
 "Account for a news reflector that automatically approves contact requests as"
 " \"Followers\"."
 msgstr "Account voor een nieuws reflector die automatisch contact aanvragen goedkeurt als \"Volgers\"."
 
+#: mod/settings.php:1060 mod/admin.php:1844
+msgid "Community Forum"
+msgstr "Groepsforum"
+
 #: mod/settings.php:1061
 msgid "Account for community discussions."
 msgstr "Account voor groepsdiscussies."
 
+#: mod/settings.php:1064 mod/admin.php:1834
+msgid "Normal Account Page"
+msgstr "Normale accountpagina"
+
 #: mod/settings.php:1065
 msgid ""
 "Account for a regular personal profile that requires manual approval of "
 "\"Friends\" and \"Followers\"."
 msgstr "Account voor een normaal persoonlijk profiel dat manuele goedkeuring vereist van \"Vrienden\" en \"Volgers\"."
 
+#: mod/settings.php:1068 mod/admin.php:1835
+msgid "Soapbox Page"
+msgstr "Zeepkist-pagina"
+
 #: mod/settings.php:1069
 msgid ""
 "Account for a public profile that automatically approves contact requests as"
 " \"Followers\"."
 msgstr "Account voor een publiek profiel dat automatisch contact aanvragen goedkeurt als \"Volgers\"."
 
+#: mod/settings.php:1072 mod/admin.php:1836
+msgid "Public Forum"
+msgstr "Publiek Forum"
+
 #: mod/settings.php:1073
 msgid "Automatically approves all contact requests."
 msgstr "Aanvaardt automatisch all contact aanvragen."
 
+#: mod/settings.php:1076 mod/admin.php:1837
+msgid "Automatic Friend Page"
+msgstr "Automatisch Vriendschapspagina"
+
 #: mod/settings.php:1077
 msgid ""
 "Account for a popular profile that automatically approves contact requests "
@@ -6940,6 +2661,16 @@ msgid ""
 " system settings."
 msgstr "Je profiel zal gepubliceerd worden de <a href=\"%s\">lokale gids</a> van deze node. Je profiel details kunnen publiek zichtbaar zijn afhankelijk van de systeem instellingen."
 
+#: 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/register.php:238 mod/dfrn_request.php:645
+#: mod/api.php:111 mod/follow.php:150 mod/profiles.php:541
+#: mod/profiles.php:545 mod/profiles.php:566
+msgid "No"
+msgstr "Nee"
+
 #: mod/settings.php:1106
 msgid "Publish your default profile in the global social directory?"
 msgstr "Je standaardprofiel in de globale sociale gids publiceren?"
@@ -7063,6 +2794,14 @@ msgstr "Account Instellingen"
 msgid "Password Settings"
 msgstr "Wachtwoord Instellingen"
 
+#: mod/settings.php:1196 mod/register.php:275
+msgid "New Password:"
+msgstr "Nieuw Wachtwoord:"
+
+#: mod/settings.php:1197 mod/register.php:276
+msgid "Confirm:"
+msgstr "Bevestig:"
+
 #: mod/settings.php:1197
 msgid "Leave password fields blank unless changing"
 msgstr "Laat de wachtwoord-velden leeg, tenzij je het wilt veranderen"
@@ -7083,7 +2822,7 @@ msgstr "Wachtwoord:"
 msgid "Basic Settings"
 msgstr "Basis Instellingen"
 
-#: mod/settings.php:1204 src/Model/Profile.php:734
+#: mod/settings.php:1204 src/Model/Profile.php:725
 msgid "Full Name:"
 msgstr "Volledige Naam:"
 
@@ -7133,6 +2872,14 @@ msgstr "Standaard rechten voor nieuwe berichten"
 msgid "(click to open/close)"
 msgstr "(klik om te openen/sluiten)"
 
+#: mod/settings.php:1224 mod/photos.php:1126 mod/photos.php:1456
+msgid "Show to Groups"
+msgstr "Tonen aan groepen"
+
+#: mod/settings.php:1225 mod/photos.php:1127 mod/photos.php:1457
+msgid "Show to Contacts"
+msgstr "Tonen aan contacten"
+
 #: mod/settings.php:1226
 msgid "Default Private Post"
 msgstr "Standaard Privé Post"
@@ -7237,40 +2984,291 @@ msgstr "Als je je profiel van een andere server hebt verhuisd, en er zijn contac
 msgid "Resend relocate message to contacts"
 msgstr "Stuur verhuis boodschap naar contacten"
 
-#: mod/subthread.php:113
+#: mod/ping.php:289
+msgid "{0} wants to be your friend"
+msgstr "{0} wilt je vriend worden"
+
+#: mod/ping.php:305
+msgid "{0} sent you a message"
+msgstr "{0} stuurde jou een bericht"
+
+#: mod/ping.php:321
+msgid "{0} requested registration"
+msgstr "{0} vroeg om zich te registreren"
+
+#: mod/search.php:39 mod/network.php:194
+msgid "Remove term"
+msgstr "Verwijder zoekterm"
+
+#: mod/search.php:48 mod/network.php:201 src/Content/Feature.php:100
+msgid "Saved Searches"
+msgstr "Opgeslagen zoekopdrachten"
+
+#: mod/search.php:112
+msgid "Only logged in users are permitted to perform a search."
+msgstr "Alleen ingelogde gebruikers mogen een zoekopdracht starten."
+
+#: mod/search.php:136
+msgid "Too Many Requests"
+msgstr "Teveel aanvragen"
+
+#: mod/search.php:137
+msgid "Only one search per minute is permitted for not logged in users."
+msgstr "Niet ingelogde gebruikers mogen slechts 1 opzoeking doen per minuut"
+
+#: mod/search.php:240 mod/community.php:161
+msgid "No results."
+msgstr "Geen resultaten."
+
+#: mod/search.php:246
 #, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s volgt %3$s van %2$s"
+msgid "Items tagged with: %s"
+msgstr "Items getagd met: %s"
 
-#: mod/suggest.php:37
-msgid "Do you really want to delete this suggestion?"
-msgstr "Wil je echt dit voorstel verwijderen?"
+#: mod/search.php:248 mod/contacts.php:841
+#, php-format
+msgid "Results for: %s"
+msgstr "Resultaten voor: %s"
 
-#: mod/suggest.php:73
+#: mod/common.php:93
+msgid "No contacts in common."
+msgstr "Geen gedeelde contacten."
+
+#: mod/common.php:142 mod/contacts.php:916
+msgid "Common Friends"
+msgstr "Gedeelde Vrienden"
+
+#: mod/bookmarklet.php:24 src/Module/Login.php:310 src/Content/Nav.php:114
+msgid "Login"
+msgstr "Login"
+
+#: mod/bookmarklet.php:52
+msgid "The post was created"
+msgstr "Het bericht is aangemaakt"
+
+#: mod/network.php:202 src/Model/Group.php:401
+msgid "add"
+msgstr "toevoegen"
+
+#: mod/network.php:548
+#, php-format
 msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr "Geen voorstellen beschikbaar. Als dit een nieuwe website is, kun je het over 24 uur nog eens proberen."
+"Warning: This group contains %s member from a network that doesn't allow non"
+" public messages."
+msgid_plural ""
+"Warning: This group contains %s members from a network that doesn't allow "
+"non public messages."
+msgstr[0] "Waarschuwing: Deze groep bevat %s lid van een netwerk dat geen niet-publieke boodschappen toelaat."
+msgstr[1] "Waarschuwing: Deze groep bevat %s leden van een netwerk dat geen niet-publieke boodschappen toelaat."
 
-#: mod/suggest.php:86 mod/suggest.php:106
-msgid "Ignore/Hide"
-msgstr "Negeren/Verbergen"
+#: mod/network.php:551
+msgid "Messages in this group won't be send to these receivers."
+msgstr "Boodschappen in deze groep zullen niet verzonden worden naar deze ontvangers."
 
-#: mod/suggest.php:116 view/theme/vier/theme.php:202 src/Content/Widget.php:63
-msgid "Friend Suggestions"
-msgstr "Vriendschapsvoorstellen"
+#: mod/network.php:620
+msgid "No such group"
+msgstr "Zo'n groep bestaat niet"
 
-#: mod/tagrm.php:43
-msgid "Tag removed"
-msgstr "Label verwijderd"
+#: mod/network.php:641 mod/group.php:247
+msgid "Group is empty"
+msgstr "De groep is leeg"
 
-#: mod/tagrm.php:77
-msgid "Remove Item Tag"
-msgstr "Verwijder label van item"
+#: mod/network.php:645
+#, php-format
+msgid "Group: %s"
+msgstr "Groep: %s"
 
-#: mod/tagrm.php:79
-msgid "Select a tag to remove: "
-msgstr "Selecteer een label om te verwijderen: "
+#: mod/network.php:671
+msgid "Private messages to this person are at risk of public disclosure."
+msgstr "Privéberichten naar deze persoon kunnen openbaar gemaakt worden."
+
+#: mod/network.php:674
+msgid "Invalid contact."
+msgstr "Ongeldig contact."
+
+#: mod/network.php:945
+msgid "Commented Order"
+msgstr "Nieuwe reacties bovenaan"
+
+#: mod/network.php:948
+msgid "Sort by Comment Date"
+msgstr "Berichten met nieuwe reacties bovenaan"
+
+#: mod/network.php:953
+msgid "Posted Order"
+msgstr "Nieuwe berichten bovenaan"
+
+#: mod/network.php:956
+msgid "Sort by Post Date"
+msgstr "Nieuwe berichten bovenaan"
+
+#: mod/network.php:964 mod/profiles.php:594
+#: src/Core/NotificationsManager.php:186
+msgid "Personal"
+msgstr "Persoonlijk"
+
+#: mod/network.php:967
+msgid "Posts that mention or involve you"
+msgstr "Alleen berichten die jou vermelden of op jou betrekking hebben"
+
+#: mod/network.php:975
+msgid "New"
+msgstr "Nieuw"
+
+#: mod/network.php:978
+msgid "Activity Stream - by date"
+msgstr "Activiteitenstroom - volgens datum"
+
+#: mod/network.php:986
+msgid "Shared Links"
+msgstr "Gedeelde links"
+
+#: mod/network.php:989
+msgid "Interesting Links"
+msgstr "Interessante links"
+
+#: mod/network.php:997
+msgid "Starred"
+msgstr "Met ster"
+
+#: mod/network.php:1000
+msgid "Favourite Posts"
+msgstr "Favoriete berichten"
+
+#: mod/group.php:36
+msgid "Group created."
+msgstr "Groep aangemaakt."
+
+#: mod/group.php:42
+msgid "Could not create group."
+msgstr "Kon de groep niet aanmaken."
+
+#: mod/group.php:56 mod/group.php:187
+msgid "Group not found."
+msgstr "Groep niet gevonden."
+
+#: mod/group.php:70
+msgid "Group name changed."
+msgstr "Groepsnaam gewijzigd."
+
+#: mod/group.php:101
+msgid "Save Group"
+msgstr "Bewaar groep"
+
+#: mod/group.php:102
+msgid "Filter"
+msgstr "filter"
+
+#: mod/group.php:107
+msgid "Create a group of contacts/friends."
+msgstr "Maak een groep contacten/vrienden aan."
+
+#: mod/group.php:108 mod/group.php:134 mod/group.php:229
+#: src/Model/Group.php:410
+msgid "Group Name: "
+msgstr "Groepsnaam:"
+
+#: mod/group.php:125 src/Model/Group.php:407
+msgid "Contacts not in any group"
+msgstr "Contacten bestaan in geen enkele groep"
+
+#: mod/group.php:157
+msgid "Group removed."
+msgstr "Groep verwijderd."
+
+#: mod/group.php:159
+msgid "Unable to remove group."
+msgstr "Niet in staat om groep te verwijderen."
+
+#: mod/group.php:222
+msgid "Delete Group"
+msgstr "Verwijder Groep"
+
+#: mod/group.php:233
+msgid "Edit Group Name"
+msgstr "Bewerk Groep Naam"
+
+#: mod/group.php:244
+msgid "Members"
+msgstr "Leden"
+
+#: mod/group.php:246 mod/contacts.php:739
+msgid "All Contacts"
+msgstr "Alle Contacten"
+
+#: mod/group.php:260
+msgid "Remove contact from group"
+msgstr "Verwijder contact uit de groep"
+
+#: mod/group.php:278 mod/profperm.php:118
+msgid "Click on a contact to add or remove."
+msgstr "Klik op een contact om het toe te voegen of te verwijderen."
+
+#: mod/group.php:292
+msgid "Add contact to group"
+msgstr "Voeg contact toe aan de groep"
+
+#: mod/delegate.php:39
+msgid "Parent user not found."
+msgstr "Ouderlijke gebruiker niet gevonden."
+
+#: mod/delegate.php:146
+msgid "No parent user"
+msgstr "Ouderlijke gebruiker ontbreekt"
+
+#: mod/delegate.php:161
+msgid "Parent Password:"
+msgstr "Ouderlijk paswoord:"
+
+#: mod/delegate.php:161
+msgid ""
+"Please enter the password of the parent account to legitimize your request."
+msgstr "Geef alstublieft het paswoord van het ouderlijke account om je verzoek te legitimeren."
+
+#: mod/delegate.php:166
+msgid "Parent User"
+msgstr "Ouderlijke gebruiker"
+
+#: mod/delegate.php:169
+msgid ""
+"Parent users have total control about this account, including the account "
+"settings. Please double check whom you give this access."
+msgstr "Ouderlijke gebruikers hebben totale controle over dit account, de account instellingen inbegrepen. Dubbel check dus alstublieft aan wie je deze toegang geeft."
+
+#: mod/delegate.php:171 src/Content/Nav.php:205
+msgid "Delegate Page Management"
+msgstr "Paginabeheer uitbesteden"
+
+#: mod/delegate.php:172
+msgid "Delegates"
+msgstr "Gemachtigden"
+
+#: mod/delegate.php:174
+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 "Personen waaraan het beheer is uitbesteed kunnen alle onderdelen van een account/pagina beheren, behalve de basisinstellingen van een account. Besteed je persoonlijke account daarom niet uit aan personen die je niet volledig vertrouwt."
+
+#: mod/delegate.php:175
+msgid "Existing Page Delegates"
+msgstr "Bestaande personen waaraan het paginabeheer is uitbesteed"
+
+#: mod/delegate.php:177
+msgid "Potential Delegates"
+msgstr "Mogelijke personen waaraan het paginabeheer kan worden uitbesteed "
+
+#: mod/delegate.php:179 mod/tagrm.php:90
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: mod/delegate.php:180
+msgid "Add"
+msgstr "Toevoegen"
+
+#: mod/delegate.php:181
+msgid "No entries."
+msgstr "Geen gegevens."
 
 #: mod/uexport.php:44
 msgid "Export account"
@@ -7293,88 +3291,502 @@ msgid ""
 "of your account (photos are not exported)"
 msgstr "Je account info, contacten en al je items in json formaat exporteren. Dit kan een heel groot bestand worden, en kan lang duren. Gebruik dit om een volledige backup van je account te maken (foto's worden niet geexporteerd)"
 
-#: mod/unfollow.php:35
-msgid "Contact wasn't found or can't be unfollowed."
-msgstr "Contact kon niet gevonden worden or can niet ontvolgd worden."
+#: mod/repair_ostatus.php:21
+msgid "Resubscribing to OStatus contacts"
+msgstr "Opnieuw inschrijven bij OStatus contacten"
 
-#: mod/unfollow.php:48
-msgid "Contact unfollowed"
-msgstr "Contact ontvolgd."
+#: mod/repair_ostatus.php:37
+msgid "Error"
+msgstr "Fout"
 
-#: mod/unfollow.php:74
-msgid "You aren't a friend of this contact."
-msgstr "Je bent niet bevriend met dit contact."
+#: mod/repair_ostatus.php:52 mod/ostatus_subscribe.php:65
+msgid "Done"
+msgstr "Klaar"
 
-#: mod/unfollow.php:80
-msgid "Unfollowing is currently not supported by your network."
-msgstr "Ontvolgen is momenteel niet gesupporteerd door je netwerk."
+#: mod/repair_ostatus.php:58 mod/ostatus_subscribe.php:89
+msgid "Keep this window open until done."
+msgstr "Houd dit scherm open tot het klaar is"
 
-#: mod/videos.php:138
-msgid "Do you really want to delete this video?"
-msgstr "Wil je deze video echt verwijderen?"
+#: mod/viewcontacts.php:20 mod/viewcontacts.php:24 mod/cal.php:32
+#: mod/cal.php:36 mod/follow.php:19 mod/community.php:35 mod/viewsrc.php:13
+msgid "Access denied."
+msgstr "Toegang geweigerd"
 
-#: mod/videos.php:143
-msgid "Delete Video"
-msgstr "Verwijder video"
-
-#: mod/videos.php:206
-msgid "No videos selected"
-msgstr "Geen video's geselecteerd"
-
-#: mod/videos.php:388
-msgid "Recent Videos"
-msgstr "Recente video's"
-
-#: mod/videos.php:390
-msgid "Upload New Videos"
-msgstr "Nieuwe video's uploaden"
-
-#: mod/viewcontacts.php:89
+#: mod/viewcontacts.php:90
 msgid "No contacts."
 msgstr "Geen contacten."
 
-#: mod/wall_attach.php:26 mod/wall_attach.php:34 mod/wall_attach.php:85
-#: mod/wall_upload.php:39 mod/wall_upload.php:55 mod/wall_upload.php:113
-#: mod/wall_upload.php:164 mod/wall_upload.php:167
-msgid "Invalid request."
-msgstr "Ongeldige aanvraag."
-
-#: mod/wall_attach.php:103
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
-msgstr "Sorry, je op te laden bestand is groter dan deze PHP configuratie toelaat"
-
-#: mod/wall_attach.php:103
-msgid "Or - did you try to upload an empty file?"
-msgstr "Of - probeerde je een lege file op te laden?"
-
-#: mod/wall_attach.php:114
+#: mod/viewcontacts.php:106 mod/contacts.php:639 mod/contacts.php:1052
 #, php-format
-msgid "File exceeds size limit of %s"
-msgstr "Bestand is groter dan de limiet ( %s )"
+msgid "Visit %s's profile [%s]"
+msgstr "Bekijk het profiel van %s [%s]"
 
-#: mod/wall_attach.php:138 mod/wall_attach.php:154
-msgid "File upload failed."
-msgstr "Uploaden van bestand mislukt."
+#: mod/unfollow.php:36
+msgid "Contact wasn't found or can't be unfollowed."
+msgstr "Contact kon niet gevonden worden or can niet ontvolgd worden."
 
-#: mod/wallmessage.php:49 mod/wallmessage.php:112
-#, php-format
-msgid "Number of daily wall messages for %s exceeded. Message failed."
-msgstr "Maximum aantal dagelijkse tijdlijn boodschappen van %s overschreden. Kon boodschap niet plaatsen."
+#: mod/unfollow.php:49
+msgid "Contact unfollowed"
+msgstr "Contact ontvolgd."
 
-#: mod/wallmessage.php:60
-msgid "Unable to check your home location."
-msgstr "Niet in staat om je tijdlijn-locatie vast te stellen"
+#: mod/unfollow.php:67 mod/dfrn_request.php:654 mod/follow.php:62
+msgid "Submit Request"
+msgstr "Aanvraag indienen"
 
-#: mod/wallmessage.php:86 mod/wallmessage.php:95
-msgid "No recipient."
-msgstr "Geen ontvanger."
+#: mod/unfollow.php:76
+msgid "You aren't a friend of this contact."
+msgstr "Je bent niet bevriend met dit contact."
 
-#: mod/wallmessage.php:133
+#: mod/unfollow.php:82
+msgid "Unfollowing is currently not supported by your network."
+msgstr "Ontvolgen is momenteel niet gesupporteerd door je netwerk."
+
+#: mod/unfollow.php:103 mod/contacts.php:601
+msgid "Disconnect/Unfollow"
+msgstr "Disconnecteer/stop met volgen"
+
+#: mod/unfollow.php:116 mod/dfrn_request.php:652 mod/follow.php:157
+msgid "Your Identity Address:"
+msgstr "Adres van je identiteit:"
+
+#: mod/unfollow.php:125 mod/notifications.php:174 mod/notifications.php:263
+#: mod/admin.php:500 mod/admin.php:510 mod/contacts.php:676 mod/follow.php:166
+msgid "Profile URL"
+msgstr "Profiel url"
+
+#: mod/unfollow.php:135 mod/contacts.php:888 mod/follow.php:189
+#: src/Model/Profile.php:878
+msgid "Status Messages and Posts"
+msgstr "Berichten op jouw tijdlijn"
+
+#: mod/update_notes.php:36 mod/update_network.php:33
+#: mod/update_contacts.php:24 mod/update_profile.php:35
+#: mod/update_community.php:23 mod/update_display.php:24
+msgid "[Embedded content - reload page to view]"
+msgstr "[Ingebedde inhoud - herlaad pagina om het te bekijken]"
+
+#: mod/register.php:99
+msgid ""
+"Registration successful. Please check your email for further instructions."
+msgstr "Registratie geslaagd. Kijk je e-mail na voor verdere instructies."
+
+#: mod/register.php:103
 #, 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 "Als je wilt dat %s antwoordt moet je nakijken dat de privacy-instellingen op jouw website privéberichten van onbekende afzenders toelaat."
+"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 "Kon email niet verzenden. Hier zijn je account details: <br> login: %s <br> paswoord: %s<br><br> Je kan je paswoord aanpassen nadat je ingelogd bent."
+
+#: mod/register.php:110
+msgid "Registration successful."
+msgstr "Registratie succes."
+
+#: mod/register.php:115
+msgid "Your registration can not be processed."
+msgstr "Je registratie kan niet verwerkt worden."
+
+#: mod/register.php:162
+msgid "Your registration is pending approval by the site owner."
+msgstr "Jouw registratie wacht op goedkeuring van de beheerder."
+
+#: mod/register.php:191 mod/uimport.php:55
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr "Deze website heeft het toegelaten dagelijkse aantal registraties overschreden. Probeer morgen opnieuw."
+
+#: mod/register.php:220
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
+msgstr "Je kunt (optioneel) dit formulier invullen via OpenID door je OpenID in te geven en op 'Registreren' te klikken."
+
+#: mod/register.php:221
+msgid ""
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
+msgstr "Laat dit veld leeg als je niet vertrouwd bent met OpenID, en vul de rest van de items in."
+
+#: mod/register.php:222
+msgid "Your OpenID (optional): "
+msgstr "Je OpenID (optioneel):"
+
+#: mod/register.php:234
+msgid "Include your profile in member directory?"
+msgstr "Je profiel in de ledengids opnemen?"
+
+#: mod/register.php:261
+msgid "Note for the admin"
+msgstr "Nota voor de beheerder"
+
+#: mod/register.php:261
+msgid "Leave a message for the admin, why you want to join this node"
+msgstr "Laat een boodschap na voor de beheerder, waarom je bij deze node wil komen"
+
+#: mod/register.php:262
+msgid "Membership on this site is by invitation only."
+msgstr "Lidmaatschap van deze website is uitsluitend op uitnodiging."
+
+#: mod/register.php:263
+msgid "Your invitation code: "
+msgstr "Je uitnodigingscode:"
+
+#: mod/register.php:266 mod/admin.php:1428
+msgid "Registration"
+msgstr "Registratie"
+
+#: mod/register.php:272
+msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
+msgstr "Je volledige naam (bvb. Jan Smit, echt of echt lijkend):"
+
+#: mod/register.php:273
+msgid ""
+"Your Email Address: (Initial information will be send there, so this has to "
+"be an existing address.)"
+msgstr "Je Email Adres: (Initiële informatie zal hier naartoe gezonden worden, dus dit moet een bestaand adres zijn.)"
+
+#: mod/register.php:275
+msgid "Leave empty for an auto generated password."
+msgstr "Laat leeg voor een automatisch gegenereerd paswoord."
+
+#: mod/register.php:277
+#, 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 "Kies een bijnaam. Deze moet beginnen met een letter. Je profiel adres op deze site zal dan '<strong>nickname@%s</strong>' zijn."
+
+#: mod/register.php:278
+msgid "Choose a nickname: "
+msgstr "Kies een bijnaam:"
+
+#: mod/register.php:281 src/Module/Login.php:281 src/Content/Nav.php:128
+msgid "Register"
+msgstr "Registreer"
+
+#: mod/register.php:287 mod/uimport.php:70
+msgid "Import"
+msgstr "Importeren"
+
+#: mod/register.php:288
+msgid "Import your profile to this friendica instance"
+msgstr "Importeer je profiel op deze friendica server"
+
+#: mod/register.php:290 mod/admin.php:191 mod/admin.php:310
+#: src/Module/Tos.php:70 src/Content/Nav.php:178
+msgid "Terms of Service"
+msgstr "Gebruiksvoorwaarden"
+
+#: mod/register.php:296
+msgid "Note: This node explicitly contains adult content"
+msgstr "Waarschuwing: Deze node heeft inhoud enkel bedoeld voor volwassenen."
+
+#: mod/notifications.php:35
+msgid "Invalid request identifier."
+msgstr "Ongeldige <em>request identifier</em>."
+
+#: mod/notifications.php:44 mod/notifications.php:183
+#: mod/notifications.php:235 mod/message.php:114
+msgid "Discard"
+msgstr "Verwerpen"
+
+#: mod/notifications.php:57 mod/notifications.php:182
+#: mod/notifications.php:271 mod/contacts.php:658 mod/contacts.php:850
+#: mod/contacts.php:1113
+msgid "Ignore"
+msgstr "Negeren"
+
+#: mod/notifications.php:93 src/Content/Nav.php:191
+msgid "Notifications"
+msgstr "Notificaties"
+
+#: mod/notifications.php:101
+msgid "Network Notifications"
+msgstr "Netwerknotificaties"
+
+#: mod/notifications.php:106 mod/notify.php:81
+msgid "System Notifications"
+msgstr "Systeemnotificaties"
+
+#: mod/notifications.php:111
+msgid "Personal Notifications"
+msgstr "Persoonlijke notificaties"
+
+#: mod/notifications.php:116
+msgid "Home Notifications"
+msgstr "Tijdlijn-notificaties"
+
+#: mod/notifications.php:148
+msgid "Show Ignored Requests"
+msgstr "Toon genegeerde verzoeken"
+
+#: mod/notifications.php:148
+msgid "Hide Ignored Requests"
+msgstr "Verberg genegeerde verzoeken"
+
+#: mod/notifications.php:161 mod/notifications.php:243
+msgid "Notification type:"
+msgstr "Notificatiesoort:"
+
+#: mod/notifications.php:164
+msgid "Suggested by:"
+msgstr "Voorgesteld door:"
+
+#: mod/notifications.php:176 mod/notifications.php:260 mod/contacts.php:666
+msgid "Hide this contact from others"
+msgstr "Verberg dit contact voor anderen"
+
+#: mod/notifications.php:179 mod/notifications.php:269 mod/admin.php:1904
+msgid "Approve"
+msgstr "Goedkeuren"
+
+#: mod/notifications.php:202
+msgid "Claims to be known to you: "
+msgstr "Denkt dat je hem of haar kent:"
+
+#: mod/notifications.php:203
+msgid "yes"
+msgstr "Ja"
+
+#: mod/notifications.php:203
+msgid "no"
+msgstr "Nee"
+
+#: mod/notifications.php:204 mod/notifications.php:209
+msgid "Shall your connection be bidirectional or not?"
+msgstr "Zal je connectie bidirectioneel zijn of niet?"
+
+#: mod/notifications.php:205 mod/notifications.php:210
+#, 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 "%s als vriend accepteren laat %s toe om in te schrijven op je berichten, en je zal ook updates ontvangen van hen in je nieuws feed."
+
+#: mod/notifications.php:206
+#, 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 "%s als volger accepteren laat hen toe om in te schrijven op je berichten, maar je zal geen updates ontvangen van hen in je nieuws feed."
+
+#: mod/notifications.php:211
+#, 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 "%s als deler accepteren laat hen toe om in te schrijven op je berichten, maar je zal geen updates ontvangen van hen in je nieuws feed."
+
+#: mod/notifications.php:222
+msgid "Friend"
+msgstr "Vriend"
+
+#: mod/notifications.php:223
+msgid "Sharer"
+msgstr "Deler"
+
+#: mod/notifications.php:223
+msgid "Subscriber"
+msgstr "Volger"
+
+#: mod/notifications.php:257 mod/contacts.php:686 mod/follow.php:177
+#: src/Model/Profile.php:781
+msgid "Tags:"
+msgstr "Labels:"
+
+#: mod/notifications.php:266 mod/contacts.php:76 src/Model/Profile.php:520
+msgid "Network:"
+msgstr "Netwerk:"
+
+#: mod/notifications.php:280
+msgid "No introductions."
+msgstr "Geen vriendschaps- of connectieverzoeken."
+
+#: mod/notifications.php:318
+msgid "Show unread"
+msgstr "Toon ongelezen"
+
+#: mod/notifications.php:318
+msgid "Show all"
+msgstr "Toon alles"
+
+#: mod/notifications.php:323
+#, php-format
+msgid "No more %s notifications."
+msgstr "Geen %s notificaties meer."
+
+#: mod/message.php:31 mod/message.php:120 src/Content/Nav.php:199
+msgid "New Message"
+msgstr "Nieuw Bericht"
+
+#: mod/message.php:78
+msgid "Unable to locate contact information."
+msgstr "Ik kan geen contact informatie vinden."
+
+#: mod/message.php:152
+msgid "Do you really want to delete this message?"
+msgstr "Wil je echt dit bericht verwijderen?"
+
+#: mod/message.php:169
+msgid "Message deleted."
+msgstr "Bericht verwijderd."
+
+#: mod/message.php:184
+msgid "Conversation removed."
+msgstr "Gesprek verwijderd."
+
+#: mod/message.php:290
+msgid "No messages."
+msgstr "Geen berichten."
+
+#: mod/message.php:331
+msgid "Message not available."
+msgstr "Bericht niet beschikbaar."
+
+#: mod/message.php:395
+msgid "Delete message"
+msgstr "Verwijder bericht"
+
+#: mod/message.php:397 mod/message.php:498
+msgid "D, d M Y - g:i A"
+msgstr "D, d M Y - g:i A"
+
+#: mod/message.php:412 mod/message.php:495
+msgid "Delete conversation"
+msgstr "Verwijder gesprek"
+
+#: mod/message.php:414
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Geen beveiligde communicatie beschikbaar. Je kunt <strong>misschien</strong> antwoorden vanaf de profiel-pagina van de afzender."
+
+#: mod/message.php:418
+msgid "Send Reply"
+msgstr "Verstuur Antwoord"
+
+#: mod/message.php:469
+#, php-format
+msgid "Unknown sender - %s"
+msgstr "Onbekende afzender - %s"
+
+#: mod/message.php:471
+#, php-format
+msgid "You and %s"
+msgstr "Jij en %s"
+
+#: mod/message.php:473
+#, php-format
+msgid "%s and You"
+msgstr "%s en jij"
+
+#: mod/message.php:501
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d bericht"
+msgstr[1] "%d berichten"
+
+#: mod/hcard.php:19
+msgid "No profile"
+msgstr "Geen profiel"
+
+#: mod/ostatus_subscribe.php:22
+msgid "Subscribing to OStatus contacts"
+msgstr "Inschrijven bij OStatus contacten"
+
+#: mod/ostatus_subscribe.php:34
+msgid "No contact provided."
+msgstr "Geen contact opgegeven."
+
+#: mod/ostatus_subscribe.php:41
+msgid "Couldn't fetch information for contact."
+msgstr "Kon de informatie voor het contact niet ophalen."
+
+#: mod/ostatus_subscribe.php:51
+msgid "Couldn't fetch friends for contact."
+msgstr "Kon de vrienden van contact niet ophalen."
+
+#: mod/ostatus_subscribe.php:79
+msgid "success"
+msgstr "Succesvol"
+
+#: mod/ostatus_subscribe.php:81
+msgid "failed"
+msgstr "Mislukt"
+
+#: mod/ostatus_subscribe.php:84 src/Object/Post.php:264
+msgid "ignored"
+msgstr "Verboden"
+
+#: mod/dfrn_poll.php:126 mod/dfrn_poll.php:549
+#, php-format
+msgid "%1$s welcomes %2$s"
+msgstr "%1$s heet %2$s van harte welkom"
+
+#: mod/removeme.php:47
+msgid "User deleted their account"
+msgstr "Gebruiker verwijderde zijn of haar account"
+
+#: mod/removeme.php:48
+msgid ""
+"On your Friendica node an user deleted their account. Please ensure that "
+"their data is removed from the backups."
+msgstr "Een gebruiker heeft zijn of haar account verwijderd op je Friendica node. Zorg er zeker voor dat zijn of haar data verwijderd is uit de backups."
+
+#: mod/removeme.php:49
+#, php-format
+msgid "The user id is %d"
+msgstr "De gebruikers id is %d"
+
+#: mod/removeme.php:81 mod/removeme.php:84
+msgid "Remove My Account"
+msgstr "Verwijder mijn account"
+
+#: mod/removeme.php:82
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
+msgstr "Dit zal je account volledig verwijderen. Dit kan niet hersteld worden als het eenmaal uitgevoerd is."
+
+#: mod/removeme.php:83
+msgid "Please enter your password for verification:"
+msgstr "Voer je wachtwoord in voor verificatie:"
+
+#: mod/tagrm.php:43
+msgid "Tag removed"
+msgstr "Label verwijderd"
+
+#: mod/tagrm.php:77
+msgid "Remove Item Tag"
+msgstr "Verwijder label van item"
+
+#: mod/tagrm.php:79
+msgid "Select a tag to remove: "
+msgstr "Selecteer een label om te verwijderen: "
+
+#: mod/home.php:39
+#, php-format
+msgid "Welcome to %s"
+msgstr "Welkom op %s"
+
+#: mod/suggest.php:38
+msgid "Do you really want to delete this suggestion?"
+msgstr "Wil je echt dit voorstel verwijderen?"
+
+#: mod/suggest.php:74
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "Geen voorstellen beschikbaar. Als dit een nieuwe website is, kun je het over 24 uur nog eens proberen."
+
+#: mod/suggest.php:87 mod/suggest.php:107
+msgid "Ignore/Hide"
+msgstr "Negeren/Verbergen"
+
+#: mod/filer.php:34
+msgid "- select -"
+msgstr "- Kies -"
 
 #: mod/friendica.php:78
 #, php-format
@@ -7418,293 +3830,4228 @@ msgstr "Lees de <a href=\"%1$s/tos\">Gebruiksvoorwaarden</a> van deze node na."
 msgid "On this server the following remote servers are blocked."
 msgstr "De volgende remote servers zijn geblokkeerd."
 
-#: view/theme/duepuntozero/config.php:54 src/Model/User.php:541
-msgid "default"
-msgstr "standaard"
+#: mod/friendica.php:130 mod/admin.php:363 mod/admin.php:381
+#: mod/dfrn_request.php:345 src/Model/Contact.php:1582
+msgid "Blocked domain"
+msgstr "Domein geblokeerd"
 
-#: view/theme/duepuntozero/config.php:55
-msgid "greenzero"
-msgstr "greenzero"
+#: mod/friendica.php:130 mod/admin.php:364 mod/admin.php:382
+msgid "Reason for the block"
+msgstr "Reden van de blokkering"
 
-#: view/theme/duepuntozero/config.php:56
-msgid "purplezero"
-msgstr "purplezero"
+#: mod/display.php:303 mod/cal.php:144 mod/profile.php:175
+msgid "Access to this profile has been restricted."
+msgstr "Toegang tot dit profiel is beperkt."
 
-#: view/theme/duepuntozero/config.php:57
-msgid "easterbunny"
-msgstr "easterbunny"
+#: mod/wall_upload.php:39 mod/wall_upload.php:55 mod/wall_upload.php:113
+#: mod/wall_upload.php:164 mod/wall_upload.php:167 mod/wall_attach.php:27
+#: mod/wall_attach.php:34 mod/wall_attach.php:89
+msgid "Invalid request."
+msgstr "Ongeldige aanvraag."
 
-#: view/theme/duepuntozero/config.php:58
-msgid "darkzero"
-msgstr "darkzero"
+#: mod/wall_upload.php:195 mod/profile_photo.php:151 mod/photos.php:776
+#: mod/photos.php:779 mod/photos.php:808
+#, php-format
+msgid "Image exceeds size limit of %s"
+msgstr "Beeld is groter dan de limiet ( %s )"
 
-#: view/theme/duepuntozero/config.php:59
-msgid "comix"
-msgstr "comix"
+#: mod/wall_upload.php:209 mod/profile_photo.php:160 mod/photos.php:831
+msgid "Unable to process image."
+msgstr "Niet in staat om de afbeelding te verwerken"
 
-#: view/theme/duepuntozero/config.php:60
-msgid "slackr"
-msgstr "slackr"
+#: mod/wall_upload.php:240 mod/item.php:473 src/Object/Image.php:966
+#: src/Object/Image.php:982 src/Object/Image.php:990 src/Object/Image.php:1015
+msgid "Wall Photos"
+msgstr "Tijdlijn foto's"
 
-#: view/theme/duepuntozero/config.php:74
-msgid "Variations"
-msgstr "Variaties"
+#: mod/wall_upload.php:248 mod/profile_photo.php:305 mod/photos.php:860
+msgid "Image upload failed."
+msgstr "Uploaden van afbeelding mislukt."
 
-#: view/theme/frio/php/Image.php:24
-msgid "Top Banner"
-msgstr "Banner Bovenaan"
+#: mod/newmember.php:11
+msgid "Welcome to Friendica"
+msgstr "Welkom bij Friendica"
 
-#: view/theme/frio/php/Image.php:24
+#: mod/newmember.php:12
+msgid "New Member Checklist"
+msgstr "Checklist voor nieuwe leden"
+
+#: mod/newmember.php:14
 msgid ""
-"Resize image to the width of the screen and show background color below on "
-"long pages."
-msgstr "Pas het beeld aan aan de breedte van het scherm en toon achtergrondkleur onder lange pagina's"
+"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 "We willen je een paar tips en verwijzingen aanreiken om je een aangename ervaring te bezorgen. Klik op een item om de relevante pagina's te bezoeken. Een verwijzing naar deze pagina zal twee weken lang na je registratie zichtbaar zijn op je tijdlijn. Daarna zal de verwijzing stilletjes verdwijnen."
 
-#: view/theme/frio/php/Image.php:25
-msgid "Full screen"
-msgstr "Volledig scherm"
+#: mod/newmember.php:15
+msgid "Getting Started"
+msgstr "Aan de slag"
 
-#: view/theme/frio/php/Image.php:25
+#: mod/newmember.php:17
+msgid "Friendica Walk-Through"
+msgstr "Doorloop Friendica"
+
+#: mod/newmember.php:17
 msgid ""
-"Resize image to fill entire screen, clipping either the right or the bottom."
-msgstr "Pas het beeld aan om het hele scherm te vullen, met ofwel de rechter- of de onderkant afgeknipt."
+"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 "Op je <em>Snelstart</em> pagina kun je een korte inleiding vinden over je profiel en netwerk tabs, om enkele nieuwe connecties te leggen en groepen te vinden om lid van te worden."
 
-#: view/theme/frio/php/Image.php:26
-msgid "Single row mosaic"
-msgstr "Enkele rij mozaïek"
+#: mod/newmember.php:21
+msgid "Go to Your Settings"
+msgstr "Ga naar je instellingen"
 
-#: view/theme/frio/php/Image.php:26
+#: mod/newmember.php:21
 msgid ""
-"Resize image to repeat it on a single row, either vertical or horizontal."
-msgstr "Pas het beeld aan zodat het herhaald wordt op een enkele rij, ofwel vertikaal ofwel horizontaal"
+"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 "Verander je initieel wachtwoord op je <em>instellingenpagina</em>. Noteer ook het adres van je identiteit. Dit ziet er uit als een e-mailadres - en zal nuttig zijn om vrienden te maken op het vrije sociale web."
 
-#: view/theme/frio/php/Image.php:27
-msgid "Mosaic"
-msgstr "Mozaïek"
+#: 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 "Controleer ook de andere instellingen, in het bijzonder de privacy-instellingen. Een niet-gepubliceerd adres is zoals een privé-telefoonnummer. In het algemeen wil je waarschijnlijk je adres publiceren - tenzij al je vrienden en mogelijke vrienden precies weten hoe je te vinden."
 
-#: view/theme/frio/php/Image.php:27
-msgid "Repeat image to fill the screen."
-msgstr "Herhaal beeld om het scherm te vullen."
+#: mod/newmember.php:26 mod/profile_photo.php:246 mod/profiles.php:598
+msgid "Upload Profile Photo"
+msgstr "Profielfoto uploaden"
 
-#: view/theme/frio/config.php:102
-msgid "Custom"
-msgstr "Aangepast"
+#: 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 "Upload een profielfoto, als je dat nog niet gedaan hebt. Studies tonen aan dat mensen met echte foto's van zichzelf tien keer gemakkelijker vrienden maken dan mensen die dat niet doen."
 
-#: view/theme/frio/config.php:114
-msgid "Note"
-msgstr "Nota"
+#: mod/newmember.php:27
+msgid "Edit Your Profile"
+msgstr "Bewerk je profiel"
 
-#: view/theme/frio/config.php:114
-msgid "Check image permissions if all users are allowed to see the image"
-msgstr "Controleer of alle gebruikers permissie hebben om het beeld te zien "
+#: 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 "Bewerk je <strong>standaard</strong> profiel zoals je wilt. Controleer de instellingen om je vriendenlijst te verbergen, en om je profiel voor ongekende bezoekers te verbergen."
 
-#: view/theme/frio/config.php:121
-msgid "Select color scheme"
-msgstr "Selecteer kleurschema"
+#: mod/newmember.php:28
+msgid "Profile Keywords"
+msgstr "Sleutelwoorden voor dit profiel"
 
-#: view/theme/frio/config.php:122
-msgid "Navigation bar background color"
-msgstr "Navigatie balk achtergrondkleur"
+#: 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 "Stel enkele openbare sleutelwoorden in voor je standaard profiel die je interesses beschrijven. We kunnen dan misschien mensen vinden met gelijkaardige interesses, en vrienden voorstellen."
 
-#: view/theme/frio/config.php:123
-msgid "Navigation bar icon color "
-msgstr "Navigatie balk icoon kleur"
+#: mod/newmember.php:30
+msgid "Connecting"
+msgstr "Verbinding aan het maken"
 
-#: view/theme/frio/config.php:124
-msgid "Link color"
-msgstr "Link kleur"
+#: mod/newmember.php:36
+msgid "Importing Emails"
+msgstr "E-mails importeren"
 
-#: view/theme/frio/config.php:125
-msgid "Set the background color"
-msgstr "Stel de achtergrondkleur in"
+#: 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 "Vul je e-mailtoegangsinformatie in op je pagina met verbindingsinstellingen als je vrienden of mailinglijsten uit je e-mail-inbox wilt importeren, en met hen wilt communiceren"
 
-#: view/theme/frio/config.php:126
-msgid "Content background opacity"
-msgstr "Content achtergrond opaciteit"
+#: mod/newmember.php:39
+msgid "Go to Your Contacts Page"
+msgstr "Ga naar je contactenpagina"
 
-#: view/theme/frio/config.php:127
-msgid "Set the background image"
-msgstr "Stel het achtergrondbeeld in"
+#: 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 "Je contactenpagina is jouw poort om vriendschappen te beheren en verbinding te leggen met vrienden op andere netwerken. Je kunt hun adres of URL toevoegen in de <em>Voeg nieuw contact toe</em> dialoog."
 
-#: view/theme/frio/config.php:128
-msgid "Background image style"
-msgstr "Achtergrond beeld stijl"
+#: mod/newmember.php:40
+msgid "Go to Your Site's Directory"
+msgstr "Ga naar de gids van je website"
 
-#: view/theme/frio/config.php:133
-msgid "Login page background image"
-msgstr "Achtergrondafbeelding aanmeldpagina"
+#: 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 "In de gids vind je andere mensen in dit netwerk of op andere federatieve sites. Zoek naar het woord <em>Connect</em> of <em>Follow</em> op hun profielpagina (meestal aan de linkerkant). Vul je eigen identiteitsadres in wanneer daar om wordt gevraagd."
 
-#: view/theme/frio/config.php:137
-msgid "Login page background color"
-msgstr "Achtergrondkleur aanmeldpagina"
+#: mod/newmember.php:41
+msgid "Finding New People"
+msgstr "Nieuwe mensen vinden"
 
-#: view/theme/frio/config.php:137
-msgid "Leave background image and color empty for theme defaults"
-msgstr "Laat de achtergrondafbeelding en kleur leeg om de standaard van het thema te gebruiken"
+#: 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 "Op het zijpaneel van de Contacten pagina vind je verschillende tools om nieuwe vrienden te zoeken. We kunnen mensen op interesses matchen, mensen opzoeken op naam of hobby, en suggesties doen gebaseerd op netwerk-relaties. Op een nieuwe webstek beginnen vriendschapssuggesties meestal binnen de 24 uur beschikbaar te worden."
 
-#: view/theme/frio/theme.php:238
-msgid "Guest"
-msgstr "Gast"
+#: mod/newmember.php:43 src/Model/Group.php:402
+msgid "Groups"
+msgstr "Groepen"
 
-#: view/theme/frio/theme.php:243
-msgid "Visitor"
-msgstr "Bezoeker"
+#: mod/newmember.php:45
+msgid "Group Your Contacts"
+msgstr "Groepeer je contacten"
 
-#: view/theme/frio/theme.php:256 src/Content/Nav.php:97
-#: src/Module/Login.php:311
-msgid "Logout"
-msgstr "Uitloggen"
+#: 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 "Als je een aantal vrienden gemaakt hebt kun je ze in je eigen gespreksgroepen indelen vanuit de zijbalk van je 'Contacten' pagina, en dan kun je met elke groep apart contact houden op je Netwerk pagina. "
 
-#: view/theme/frio/theme.php:256 src/Content/Nav.php:97
-msgid "End this session"
-msgstr "Deze sessie beëindigen"
+#: mod/newmember.php:48
+msgid "Why Aren't My Posts Public?"
+msgstr "Waarom zijn mijn berichten niet openbaar?"
 
-#: view/theme/frio/theme.php:259 src/Content/Nav.php:100
-#: src/Content/Nav.php:186
-msgid "Your posts and conversations"
-msgstr "Jouw berichten en gesprekken"
+#: 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 "Friendica respecteert je privacy. Standaard zullen je berichten alleen zichtbaar zijn voor personen die jij als vriend hebt toegevoegd. Lees de help (zie de verwijzing hierboven) voor meer informatie."
 
-#: view/theme/frio/theme.php:260 src/Content/Nav.php:101
-msgid "Your profile page"
-msgstr "Jouw profiel pagina"
+#: mod/newmember.php:52
+msgid "Getting Help"
+msgstr "Hulp krijgen"
 
-#: view/theme/frio/theme.php:261 src/Content/Nav.php:102
-msgid "Your photos"
-msgstr "Jouw foto's"
+#: mod/newmember.php:54
+msgid "Go to the Help Section"
+msgstr "Ga naar de help"
 
-#: view/theme/frio/theme.php:262 src/Content/Nav.php:103
-#: src/Model/Profile.php:908 src/Model/Profile.php:911
-msgid "Videos"
-msgstr "Video's"
+#: mod/newmember.php:54
+msgid ""
+"Our <strong>help</strong> pages may be consulted for detail on other program"
+" features and resources."
+msgstr "Je kunt onze <strong>help</strong> pagina's raadplegen voor gedetailleerde informatie over andere functies van dit programma."
 
-#: view/theme/frio/theme.php:262 src/Content/Nav.php:103
-msgid "Your videos"
-msgstr "Je video's"
+#: mod/lostpass.php:28
+msgid "No valid account found."
+msgstr "Geen geldige account gevonden."
 
-#: view/theme/frio/theme.php:263 src/Content/Nav.php:104
-msgid "Your events"
-msgstr "Jouw gebeurtenissen"
+#: mod/lostpass.php:40
+msgid "Password reset request issued. Check your email."
+msgstr "Verzoek om wachtwoord opnieuw in te stellen werd verstuurd. Kijk uw e-mail na."
 
-#: view/theme/frio/theme.php:266 src/Content/Nav.php:183
-msgid "Conversations from your friends"
-msgstr "Gesprekken van je vrienden"
+#: mod/lostpass.php:46
+#, php-format
+msgid ""
+"\n"
+"\t\tDear %1$s,\n"
+"\t\t\tA request was recently received at \"%2$s\" to reset your account\n"
+"\t\tpassword. In order to confirm this request, please select the verification link\n"
+"\t\tbelow or paste it into your web browser address bar.\n"
+"\n"
+"\t\tIf you did NOT request this change, please DO NOT follow the link\n"
+"\t\tprovided and ignore and/or delete this email, the request will expire shortly.\n"
+"\n"
+"\t\tYour password will not be changed unless we can verify that you\n"
+"\t\tissued this request."
+msgstr "\n\t\tBeste %1$s,\n\t\t\tEr is recent om \"%2$s\" een verzoek gekomen om je paswoord te resetten.\n\t\tOm dit verzoek te bevestigen, gelieve de verificatie link hieronder te volgen of in je browser te kopiëren.\n\n\t\tAls je dit verzoek NIET hebt gedaan, volg deze link dan NIET en negeer \n\t\ten/of verwijder deze email, het verzoek zal binnenkort vanzelf ongeldig worden.\n\n\t\tJe paswoord zal niet aangepast worden tenzij we kunnen verifiëren\n\t\tdat je dit verzoek verzonden hebt."
 
-#: view/theme/frio/theme.php:267 src/Content/Nav.php:170
-#: src/Model/Profile.php:923 src/Model/Profile.php:934
-msgid "Events and Calendar"
-msgstr "Gebeurtenissen en kalender"
+#: mod/lostpass.php:57
+#, php-format
+msgid ""
+"\n"
+"\t\tFollow this link soon to verify your identity:\n"
+"\n"
+"\t\t%1$s\n"
+"\n"
+"\t\tYou will then receive a follow-up message containing the new password.\n"
+"\t\tYou may change that password from your account settings page after logging in.\n"
+"\n"
+"\t\tThe login details are as follows:\n"
+"\n"
+"\t\tSite Location:\t%2$s\n"
+"\t\tLogin Name:\t%3$s"
+msgstr "\n\t\tVolg nu deze link om je identiteit te bevestigen:\n\n\t\t%1$s\n\n\t\tJe zal dan een boodschap krijgen met je nieuw paswoord.\n\t\tJe kunt je paswoord veranderen in je instelling pagina nadat je ingelogd bent.\n\n\t\tDe login details zijn de volgende:\n\n\t\tSite locatie:\t%2$s\n\t\tLogin naam:\t%3$s"
 
-#: view/theme/frio/theme.php:268 src/Content/Nav.php:196
-msgid "Private mail"
-msgstr "Privéberichten"
+#: mod/lostpass.php:76
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Op %s werd gevraagd je wachtwoord opnieuw in te stellen"
 
-#: view/theme/frio/theme.php:269 src/Content/Nav.php:207
-msgid "Account settings"
-msgstr "Account instellingen"
+#: mod/lostpass.php:92
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "Verzoek kon niet geverifieerd worden. (Misschien heb je het voordien al ingediend.) Wachtwoord niet opnieuw ingesteld."
 
-#: view/theme/frio/theme.php:270 src/Content/Nav.php:213
-msgid "Manage/edit friends and contacts"
-msgstr "Beheer/Wijzig vrienden en contacten"
+#: mod/lostpass.php:105
+msgid "Request has expired, please make a new one."
+msgstr "Aanvraag is verlopen, gelieve een nieuwe aan te maken."
 
-#: view/theme/quattro/config.php:76
-msgid "Alignment"
-msgstr "Uitlijning"
+#: mod/lostpass.php:120
+msgid "Forgot your Password?"
+msgstr "Wachtwoord vergeten?"
 
-#: view/theme/quattro/config.php:76
-msgid "Left"
-msgstr "Links"
+#: mod/lostpass.php:121
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Voer je e-mailadres in en verstuur het om je wachtwoord opnieuw in te stellen. Kijk dan je e-mail na voor verdere instructies."
 
-#: view/theme/quattro/config.php:76
-msgid "Center"
-msgstr "Gecentreerd"
+#: mod/lostpass.php:122 src/Module/Login.php:312
+msgid "Nickname or Email: "
+msgstr "Bijnaam of e-mail:"
 
-#: view/theme/quattro/config.php:77
-msgid "Color scheme"
-msgstr "Kleurschema"
+#: mod/lostpass.php:123
+msgid "Reset"
+msgstr "Opnieuw"
 
-#: view/theme/quattro/config.php:78
-msgid "Posts font size"
-msgstr "Lettergrootte berichten"
+#: mod/lostpass.php:139 src/Module/Login.php:324
+msgid "Password Reset"
+msgstr "Wachtwoord opnieuw instellen"
 
-#: view/theme/quattro/config.php:79
-msgid "Textareas font size"
-msgstr "Lettergrootte tekstgebieden"
+#: mod/lostpass.php:140
+msgid "Your password has been reset as requested."
+msgstr "Je wachtwoord is opnieuw ingesteld zoals gevraagd."
 
-#: view/theme/vier/config.php:75
-msgid "Comma separated list of helper forums"
-msgstr "Kommagescheiden lijst van de helper forums"
+#: mod/lostpass.php:141
+msgid "Your new password is"
+msgstr "Je nieuwe wachtwoord is"
 
-#: view/theme/vier/config.php:115 src/Core/ACL.php:299
-msgid "don't show"
-msgstr "niet tonen"
+#: mod/lostpass.php:142
+msgid "Save or copy your new password - and then"
+msgstr "Bewaar of kopieer je nieuw wachtwoord - en dan"
 
-#: view/theme/vier/config.php:115 src/Core/ACL.php:298
-msgid "show"
-msgstr "tonen"
+#: mod/lostpass.php:143
+msgid "click here to login"
+msgstr "klik hier om in te loggen"
 
-#: view/theme/vier/config.php:122
-msgid "Set style"
-msgstr "Stijl instellen"
+#: mod/lostpass.php:144
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Je kunt dit wachtwoord veranderen nadat je bent ingelogd op de <em>Instellingen></em> pagina."
 
-#: view/theme/vier/config.php:123
-msgid "Community Pages"
-msgstr "Forum/groepspagina's"
+#: mod/lostpass.php:152
+#, php-format
+msgid ""
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tYour password has been changed as requested. Please retain this\n"
+"\t\t\tinformation for your records (or change your password immediately to\n"
+"\t\t\tsomething that you will remember).\n"
+"\t\t"
+msgstr "\n\t\t\tBeste %1$s,\n\t\t\t\tJe paswoord is aangepast zoals je gevraagd hebt. Hou deze informatie\n\t\t\talstublieft bij (of pas je paswoord onmiddellijk aan\n\t\t\tnaar iets wat je je kan herinneren).\n\t\t"
 
-#: view/theme/vier/config.php:124 view/theme/vier/theme.php:149
-msgid "Community Profiles"
-msgstr "Forum/groepsprofielen"
+#: mod/lostpass.php:158
+#, php-format
+msgid ""
+"\n"
+"\t\t\tYour login details are as follows:\n"
+"\n"
+"\t\t\tSite Location:\t%1$s\n"
+"\t\t\tLogin Name:\t%2$s\n"
+"\t\t\tPassword:\t%3$s\n"
+"\n"
+"\t\t\tYou may change that password from your account settings page after logging in.\n"
+"\t\t"
+msgstr "\n\t\t\tJe login details zijn de volgende:\n\n\t\t\tSite Locatie:\t%1$s\n\t\t\tLogin Naam:\t%2$s\n\t\t\tPaswoord:\t%3$s\n\n\t\t\tJe kan dit paswoord in het account instellingen aanpassen nadat je ingelogd bent.\n\t\t"
 
-#: view/theme/vier/config.php:125
-msgid "Help or @NewHere ?"
-msgstr "Help of @NewHere ?"
+#: mod/lostpass.php:174
+#, php-format
+msgid "Your password has been changed at %s"
+msgstr "Je wachtwoord is veranderd op %s"
 
-#: view/theme/vier/config.php:126 view/theme/vier/theme.php:386
-msgid "Connect Services"
-msgstr "Diensten verbinden"
+#: mod/babel.php:22
+msgid "Source input"
+msgstr "Bron input"
 
-#: view/theme/vier/config.php:127
-msgid "Find Friends"
-msgstr "Zoek vrienden"
+#: mod/babel.php:28
+msgid "BBCode::toPlaintext"
+msgstr "BBCode::toPlaintext"
 
-#: view/theme/vier/config.php:128 view/theme/vier/theme.php:179
-msgid "Last users"
-msgstr "Laatste gebruikers"
+#: mod/babel.php:34
+msgid "BBCode::convert (raw HTML)"
+msgstr "BBCode::convert (raw HTML)"
 
-#: view/theme/vier/theme.php:197 src/Content/Widget.php:58
-msgid "Find People"
-msgstr "Zoek mensen"
+#: mod/babel.php:39
+msgid "BBCode::convert"
+msgstr "BBCode::convert"
 
-#: view/theme/vier/theme.php:198 src/Content/Widget.php:59
-msgid "Enter name or interest"
-msgstr "Vul naam of interesse in"
+#: mod/babel.php:45
+msgid "BBCode::convert => HTML::toBBCode"
+msgstr "BBCode::convert => HTML::toBBCode"
 
-#: view/theme/vier/theme.php:200 src/Content/Widget.php:61
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Voorbeelden: Jan Peeters, Vissen"
+#: mod/babel.php:51
+msgid "BBCode::toMarkdown"
+msgstr "BBCode::toMarkdown"
 
-#: view/theme/vier/theme.php:203 src/Content/Widget.php:64
-msgid "Similar Interests"
-msgstr "Dezelfde interesses"
+#: mod/babel.php:57
+msgid "BBCode::toMarkdown => Markdown::convert"
+msgstr "BBCode::toMarkdown => Markdown::convert"
 
-#: view/theme/vier/theme.php:204 src/Content/Widget.php:65
-msgid "Random Profile"
-msgstr "Willekeurig Profiel"
+#: mod/babel.php:63
+msgid "BBCode::toMarkdown => Markdown::toBBCode"
+msgstr "BBCode::toMarkdown => Markdown::toBBCode"
 
-#: view/theme/vier/theme.php:205 src/Content/Widget.php:66
-msgid "Invite Friends"
-msgstr "Vrienden uitnodigen"
+#: mod/babel.php:69
+msgid "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"
+msgstr "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"
 
-#: view/theme/vier/theme.php:208 src/Content/Widget.php:69
-msgid "Local Directory"
-msgstr "Lokale gids"
+#: mod/babel.php:76
+msgid "Source input \\x28Diaspora format\\x29"
+msgstr "Bron input \\x28Diaspora formaat\\x29"
 
-#: view/theme/vier/theme.php:253 src/Content/ForumManager.php:127
-msgid "External link to forum"
-msgstr "Externe link naar het forum"
+#: mod/babel.php:82
+msgid "Markdown::toBBCode"
+msgstr "Markdown::toBBCode"
 
-#: view/theme/vier/theme.php:289
-msgid "Quick Start"
-msgstr "Snelstart"
+#: mod/babel.php:89
+msgid "Raw HTML input"
+msgstr "Onverwerkte HTML input"
+
+#: mod/babel.php:94
+msgid "HTML Input"
+msgstr "HTML Input"
+
+#: mod/babel.php:100
+msgid "HTML::toBBCode"
+msgstr "HTML::toBBCode"
+
+#: mod/babel.php:106
+msgid "HTML::toPlaintext"
+msgstr "HTML::toPlaintext"
+
+#: mod/babel.php:114
+msgid "Source text"
+msgstr "Brontekst"
+
+#: mod/babel.php:115
+msgid "BBCode"
+msgstr "BBCode"
+
+#: mod/babel.php:116
+msgid "Markdown"
+msgstr "Markdown"
+
+#: mod/babel.php:117
+msgid "HTML"
+msgstr "HTML"
+
+#: mod/admin.php:109
+msgid "Theme settings updated."
+msgstr "Thema-instellingen opgeslagen"
+
+#: mod/admin.php:182 src/Content/Nav.php:175
+msgid "Information"
+msgstr "Informatie"
+
+#: mod/admin.php:183
+msgid "Overview"
+msgstr "Overzicht"
+
+#: mod/admin.php:184 mod/admin.php:723
+msgid "Federation Statistics"
+msgstr "Federatie Statistieken"
+
+#: mod/admin.php:185
+msgid "Configuration"
+msgstr "Configuratie"
+
+#: mod/admin.php:186 mod/admin.php:1425
+msgid "Site"
+msgstr "Website"
+
+#: mod/admin.php:187 mod/admin.php:1354 mod/admin.php:1896 mod/admin.php:1913
+msgid "Users"
+msgstr "Gebruiker"
+
+#: mod/admin.php:189 mod/admin.php:2283 mod/admin.php:2327
+msgid "Themes"
+msgstr "Thema's"
+
+#: mod/admin.php:192
+msgid "Database"
+msgstr "Database"
+
+#: mod/admin.php:193
+msgid "DB updates"
+msgstr "DB aanpassingen"
+
+#: mod/admin.php:194 mod/admin.php:766
+msgid "Inspect Queue"
+msgstr "Wachtrij Inspecteren"
+
+#: mod/admin.php:195
+msgid "Inspect worker Queue"
+msgstr "Taakwachtrij inspecteren"
+
+#: mod/admin.php:196
+msgid "Tools"
+msgstr "Hulpmiddelen"
+
+#: mod/admin.php:197
+msgid "Contact Blocklist"
+msgstr "Contact Blokkeerlijst"
+
+#: mod/admin.php:198 mod/admin.php:372
+msgid "Server Blocklist"
+msgstr "Server Blokkeerlijst"
+
+#: mod/admin.php:199 mod/admin.php:531
+msgid "Delete Item"
+msgstr "Verwijder Item"
+
+#: mod/admin.php:200 mod/admin.php:201 mod/admin.php:2402
+msgid "Logs"
+msgstr "Logs"
+
+#: mod/admin.php:202 mod/admin.php:2469
+msgid "View Logs"
+msgstr "Bekijk Logs"
+
+#: mod/admin.php:204
+msgid "Diagnostics"
+msgstr "Diagnostiek"
+
+#: mod/admin.php:205
+msgid "PHP Info"
+msgstr "PHP Info"
+
+#: mod/admin.php:206
+msgid "probe address"
+msgstr "probe adres"
+
+#: mod/admin.php:207
+msgid "check webfinger"
+msgstr "check webfinger"
+
+#: mod/admin.php:226 src/Content/Nav.php:218
+msgid "Admin"
+msgstr "Beheer"
+
+#: mod/admin.php:227
+msgid "Addon Features"
+msgstr "Addon Features"
+
+#: mod/admin.php:228
+msgid "User registrations waiting for confirmation"
+msgstr "Gebruikersregistraties wachten op bevestiging"
+
+#: mod/admin.php:309 mod/admin.php:371 mod/admin.php:488 mod/admin.php:530
+#: mod/admin.php:722 mod/admin.php:765 mod/admin.php:806 mod/admin.php:914
+#: mod/admin.php:1424 mod/admin.php:1895 mod/admin.php:2012 mod/admin.php:2072
+#: mod/admin.php:2282 mod/admin.php:2326 mod/admin.php:2401 mod/admin.php:2468
+msgid "Administration"
+msgstr "Beheer"
+
+#: mod/admin.php:311
+msgid "Display Terms of Service"
+msgstr "Toon Gebruiksvoorwaarden"
+
+#: mod/admin.php:311
+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 "Activeer de Gebruiksvoorwaarden pagina. Als deze geactiveerd is, dan zal er een link naar de voorwaarden toegevoegd worden aan het registratie formulier en de algemene informatie pagina."
+
+#: mod/admin.php:312
+msgid "Display Privacy Statement"
+msgstr "Toon Privacy Verklaring"
+
+#: mod/admin.php:312
+#, 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 "Toon wat inlichtigen over de nodige informatite om de node te beheren in overeenstemming met bvb. de <a href=\"%s\" target=\"_blank\">EU-GDPR</a> (EU-AVG)."
+
+#: mod/admin.php:313
+msgid "Privacy Statement Preview"
+msgstr "Privacy Verklaring Voorbeeldweergave"
+
+#: mod/admin.php:315
+msgid "The Terms of Service"
+msgstr "De Gebruiksvoorwaarden"
+
+#: mod/admin.php:315
+msgid ""
+"Enter the Terms of Service for your node here. You can use BBCode. Headers "
+"of sections should be [h2] and below."
+msgstr "Geef hier de Gebruiksvoorwaarden van je node op. Je kan BBCode gebruiken. Sectie headers moeten [h2] zijn of lager."
+
+#: mod/admin.php:363
+msgid "The blocked domain"
+msgstr "Het geblokkeerde domein"
+
+#: mod/admin.php:364 mod/admin.php:377
+msgid "The reason why you blocked this domain."
+msgstr "De reden waarom je dit domein geblokkeerd hebt."
+
+#: mod/admin.php:365
+msgid "Delete domain"
+msgstr "Verwijder domein"
+
+#: mod/admin.php:365
+msgid "Check to delete this entry from the blocklist"
+msgstr "Vink aan om dit item van de blokkeerlijst te verwijderen"
+
+#: mod/admin.php:373
+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 "Deze pagina kan je gebruiken om een zwarte lijst van servers aan te leggen van het gefedereerde netwerk die niet met jouw node mogen interageren. Voor alle domeine die je opgeeft moet je ook een reden geven waarom je die remote server geblokkeerd hebt."
+
+#: mod/admin.php:374
+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 "De lijst van geblokkeerde servers zal publiek beschikbaar gemaakt worden op de /friendica pagina zodat je gebruikers en personen die communicatie problemen onderzoeken gemakkelijk de reden kunnen vinden."
+
+#: mod/admin.php:375
+msgid "Add new entry to block list"
+msgstr "Voeg nieuw item toe aan de blokkeerlijst"
+
+#: mod/admin.php:376
+msgid "Server Domain"
+msgstr "Server Domein"
+
+#: mod/admin.php:376
+msgid ""
+"The domain of the new server to add to the block list. Do not include the "
+"protocol."
+msgstr "Het domein van de nieuwe server om toe te voegen aan de blokkeerlijst. Laat het protocol weg."
+
+#: mod/admin.php:377
+msgid "Block reason"
+msgstr "Reden voor blokkering"
+
+#: mod/admin.php:378
+msgid "Add Entry"
+msgstr "Voeg Item toe"
+
+#: mod/admin.php:379
+msgid "Save changes to the blocklist"
+msgstr "Sla veranderingen in de blokkeerlijst op"
+
+#: mod/admin.php:380
+msgid "Current Entries in the Blocklist"
+msgstr "Huidige Items in de blokkeerlijst"
+
+#: mod/admin.php:383
+msgid "Delete entry from blocklist"
+msgstr "Verwijder item uit de blokkeerlijst"
+
+#: mod/admin.php:386
+msgid "Delete entry from blocklist?"
+msgstr "Item verwijderen uit de blokkeerlijst?"
+
+#: mod/admin.php:412
+msgid "Server added to blocklist."
+msgstr "Server toegevoegd aan blokkeerlijst."
+
+#: mod/admin.php:428
+msgid "Site blocklist updated."
+msgstr "Site blokkeerlijst opgeslagen"
+
+#: mod/admin.php:451 src/Core/Console/GlobalCommunityBlock.php:68
+msgid "The contact has been blocked from the node"
+msgstr "Het contact is geblokkeerd van deze node"
+
+#: mod/admin.php:453 src/Core/Console/GlobalCommunityBlock.php:65
+#, php-format
+msgid "Could not find any contact entry for this URL (%s)"
+msgstr "Kon geen contact vinden op deze URL (%s)"
+
+#: mod/admin.php:460
+#, php-format
+msgid "%s contact unblocked"
+msgid_plural "%s contacts unblocked"
+msgstr[0] "%s contact is niet langer geblokkeerd"
+msgstr[1] "%s contacten zijn niet langer geblokkeerd"
+
+#: mod/admin.php:489
+msgid "Remote Contact Blocklist"
+msgstr "Remote Contact Blokkeerlijst"
+
+#: mod/admin.php:490
+msgid ""
+"This page allows you to prevent any message from a remote contact to reach "
+"your node."
+msgstr "De pagina laat je toe om te vermijden dat boodschappen van een remote contact je node bereiken."
+
+#: mod/admin.php:491
+msgid "Block Remote Contact"
+msgstr "Blokkeer Remote Contact"
+
+#: mod/admin.php:492 mod/admin.php:1898
+msgid "select all"
+msgstr "Alles selecteren"
+
+#: mod/admin.php:493
+msgid "select none"
+msgstr "selecteer geen"
+
+#: mod/admin.php:494 mod/admin.php:1907 mod/contacts.php:657
+#: mod/contacts.php:849 mod/contacts.php:1105
+msgid "Block"
+msgstr "Blokkeren"
+
+#: mod/admin.php:495 mod/admin.php:1909 mod/contacts.php:657
+#: mod/contacts.php:849 mod/contacts.php:1105
+msgid "Unblock"
+msgstr "Blokkering opheffen"
+
+#: mod/admin.php:496
+msgid "No remote contact is blocked from this node."
+msgstr "Geen enkel remote contact is geblokkeerd van deze node."
+
+#: mod/admin.php:498
+msgid "Blocked Remote Contacts"
+msgstr "Geblokkeerde Remote Contacts"
+
+#: mod/admin.php:499
+msgid "Block New Remote Contact"
+msgstr "Blokkeer Nieuwe Remote Contacten"
+
+#: mod/admin.php:500
+msgid "Photo"
+msgstr "Foto"
+
+#: mod/admin.php:500 mod/profiles.php:391
+msgid "Address"
+msgstr "Adres"
+
+#: mod/admin.php:508
+#, php-format
+msgid "%s total blocked contact"
+msgid_plural "%s total blocked contacts"
+msgstr[0] "%s geblokkeerde contacten in totaal"
+msgstr[1] "%s geblokkeerde contacten in totaal"
+
+#: mod/admin.php:510
+msgid "URL of the remote contact to block."
+msgstr "URL van de remote contact die je wil blokkeren."
+
+#: mod/admin.php:532
+msgid "Delete this Item"
+msgstr "Verwijder dit Item"
+
+#: mod/admin.php:533
+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 "Op deze pagina kan je een item van je node verwijderen. Als het item een bericht is op het eerste niveau, dan zal de hele gesprek verwijderd worden."
+
+#: mod/admin.php:534
+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 "Je moet de GUID van het item kennen. Je kan het terugvinden bvb. door te kijken naar de getoonde URL. Het laatste deel van http://example.com/display/123456 is de GUID, hier 123456."
+
+#: mod/admin.php:535
+msgid "GUID"
+msgstr "GUID"
+
+#: mod/admin.php:535
+msgid "The GUID of the item you want to delete."
+msgstr "De GUID van het item dat je wil verwijderen."
+
+#: mod/admin.php:569
+msgid "Item marked for deletion."
+msgstr "Item gemarkeerd om te verwijderen."
+
+#: mod/admin.php:640
+msgid "unknown"
+msgstr "onbekend"
+
+#: mod/admin.php:716
+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 "Deze pagina toont je statistieken van het gekende deel van het gefedereerde sociale netwerk waarvan je Friendica node deel uitmaakt. Deze statistieken zijn niet volledig maar reflecteren het deel van het network dat jouw node kent."
+
+#: mod/admin.php:717
+msgid ""
+"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
+"will improve the data displayed here."
+msgstr "Het <em>Automatisch Achterhaalde Contact Gids</em> feature is niet geactiveerd, het zal de hier getoonde informatie verbeteren."
+
+#: mod/admin.php:729
+#, php-format
+msgid ""
+"Currently this node is aware of %d nodes with %d registered users from the "
+"following platforms:"
+msgstr "Op dit moment kent deze node %d nodes met %d geregistreerde gebruikers op basis van de volgende patformen:"
+
+#: mod/admin.php:768 mod/admin.php:809
+msgid "ID"
+msgstr "ID"
+
+#: mod/admin.php:769
+msgid "Recipient Name"
+msgstr "Naam van de Ontvanger"
+
+#: mod/admin.php:770
+msgid "Recipient Profile"
+msgstr "Profiel van de Ontvanger"
+
+#: mod/admin.php:772 mod/admin.php:811
+msgid "Created"
+msgstr "Aangemaakt"
+
+#: mod/admin.php:773
+msgid "Last Tried"
+msgstr "Laatste poging"
+
+#: mod/admin.php:774
+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 "Deze pagina lijst de inhoud van de wachtrij op voor uitgaande berichten. Dit zijn berichten waarvoor de initiële aflevering faalde. Ze zullen later opnieuw verzonden worden en uiteindelijk verwijderd worden als de aflevering permanent faalt."
+
+#: mod/admin.php:807
+msgid "Inspect Worker Queue"
+msgstr "Taakwachtrij inspecteren"
+
+#: mod/admin.php:810
+msgid "Job Parameters"
+msgstr "Taak parameters"
+
+#: mod/admin.php:812
+msgid "Priority"
+msgstr "Prioriteit"
+
+#: mod/admin.php:813
+msgid ""
+"This page lists the currently queued worker jobs. These jobs are handled by "
+"the worker cronjob you've set up during install."
+msgstr "Deze pagina toont alle taken in de wachtrij. Deze taken worden behandeld door de geplande taak die je hebt ingesteld tijdens installatie."
+
+#: mod/admin.php:837
+#, php-format
+msgid ""
+"Your DB still runs with MyISAM tables. You should change the engine type to "
+"InnoDB. As Friendica will use InnoDB only features in the future, you should"
+" change this! See <a href=\"%s\">here</a> for a guide that may be helpful "
+"converting the table engines. You may also use the command <tt>php "
+"bin/console.php dbstructure toinnodb</tt> of your Friendica installation for"
+" an automatic conversion.<br />"
+msgstr "Je DB opereert nog met MyISAM tabellen. Best is van engine te veranderen naar InnoDB. Aangezien Friendica in de toekomst gebruik zal maken van InnoDB features, zou je dit best aanpassen! Zie <a href=\"%s\">hier</a> voor een gids die je kan helpen om de tabel engines te converteren. Je kan ook het commando<tt>php bin/console.php dbstructure toinnodb</tt> van je Friendica installatie gebruiken voor een automatische conversie.<br />"
+
+#: mod/admin.php:844
+#, 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 "Er is een nieuwe versie van Friendica beschikbaar om te downloaden. Je huidige versie is %1$s, upstream versie is %2$s"
+
+#: mod/admin.php:854
+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 "Database update is mislukt. Gelieve  \"php bin/console.php dbstructure update\" vanaf de command line uit te voeren en de foutmeldingen die zouden kunnen verschijnen na te kijken."
+
+#: mod/admin.php:860
+msgid "The worker was never executed. Please check your database structure!"
+msgstr "De worker werd nooit uitgevoerd. Best je database structuur eens nakijken!"
+
+#: mod/admin.php:863
+#, php-format
+msgid ""
+"The last worker execution was on %s UTC. This is older than one hour. Please"
+" check your crontab settings."
+msgstr "De laatste worker uitvoering was op %s UTC. Dit is langer dan 1 uur geleden. Best je crontab instellingen nakijken."
+
+#: mod/admin.php:869
+#, php-format
+msgid ""
+"Friendica's configuration now is stored in config/local.ini.php, please copy"
+" config/local-sample.ini.php and move your config from "
+"<code>.htconfig.php</code>. See <a href=\"%s\">the Config help page</a> for "
+"help with the transition."
+msgstr "Het configuratiebestand bevind zich nu in config/local.ini.php. Kopieer het bestand config/local-sample.ini.php en verplaats je configuratie uit <code>.htconfig.php</code>. Ga naar de<a href=\"%s\">configuratie help pagina</a> voor hulp bij transitie."
+
+#: mod/admin.php:876
+#, php-format
+msgid ""
+"<a href=\"%s\">%s</a> is not reachable on your system. This is a servere "
+"configuration issue that prevents the communication.. See <a href=\"%s\">the"
+" installation page</a> for help."
+msgstr "<a href=\"%s\">%s</a> is niet bereikbaar op uw systeem. Dit is een ernstig configuratieprobleem dat communicatie tussen nodes verhinderd. Bezoek <a href=\"%s\">de installatiepagina</a>voor help."
+
+#: mod/admin.php:882
+msgid "Normal Account"
+msgstr "Normaal account"
+
+#: mod/admin.php:883
+msgid "Automatic Follower Account"
+msgstr "Automatische Volger Account"
+
+#: mod/admin.php:884
+msgid "Public Forum Account"
+msgstr "Publiek Forum account"
+
+#: mod/admin.php:885
+msgid "Automatic Friend Account"
+msgstr "Automatisch Vriendschapsaccount"
+
+#: mod/admin.php:886
+msgid "Blog Account"
+msgstr "Blog Account"
+
+#: mod/admin.php:887
+msgid "Private Forum Account"
+msgstr "Privé Forum Account"
+
+#: mod/admin.php:909
+msgid "Message queues"
+msgstr "Bericht-wachtrijen"
+
+#: mod/admin.php:915
+msgid "Summary"
+msgstr "Samenvatting"
+
+#: mod/admin.php:917
+msgid "Registered users"
+msgstr "Geregistreerde gebruikers"
+
+#: mod/admin.php:919
+msgid "Pending registrations"
+msgstr "Registraties die in de wacht staan"
+
+#: mod/admin.php:920
+msgid "Version"
+msgstr "Versie"
+
+#: mod/admin.php:925
+msgid "Active addons"
+msgstr "Actieve addons"
+
+#: mod/admin.php:956
+msgid "Can not parse base url. Must have at least <scheme>://<domain>"
+msgstr "Kan de basis url niet verwerken. Moet minstens zijn <scheme>://<domain>"
+
+#: mod/admin.php:1289
+msgid "Site settings updated."
+msgstr "Site instellingen opgeslagen"
+
+#: mod/admin.php:1345
+msgid "No community page for local users"
+msgstr "Geen groepspagina voor lokale gebruikers"
+
+#: mod/admin.php:1346
+msgid "No community page"
+msgstr "Geen groepspagina"
+
+#: mod/admin.php:1347
+msgid "Public postings from users of this site"
+msgstr "Publieke berichten van gebruikers van deze site"
+
+#: mod/admin.php:1348
+msgid "Public postings from the federated network"
+msgstr "Publieke berichten van het gefedereerde netwerk"
+
+#: mod/admin.php:1349
+msgid "Public postings from local users and the federated network"
+msgstr "Publieke berichten van lokale gebruikers en van het gefedereerde netwerk"
+
+#: mod/admin.php:1353 mod/admin.php:1520 mod/admin.php:1530
+#: mod/contacts.php:577
+msgid "Disabled"
+msgstr "Uitgeschakeld"
+
+#: mod/admin.php:1355
+msgid "Users, Global Contacts"
+msgstr "Gebruikers, Globale contacten"
+
+#: mod/admin.php:1356
+msgid "Users, Global Contacts/fallback"
+msgstr "Gebruikers, Globale Contacten/noodoplossing"
+
+#: mod/admin.php:1360
+msgid "One month"
+msgstr "Een maand"
+
+#: mod/admin.php:1361
+msgid "Three months"
+msgstr "Drie maanden"
+
+#: mod/admin.php:1362
+msgid "Half a year"
+msgstr "Een half jaar"
+
+#: mod/admin.php:1363
+msgid "One year"
+msgstr "Een jaar"
+
+#: mod/admin.php:1368
+msgid "Multi user instance"
+msgstr "Server voor meerdere gebruikers"
+
+#: mod/admin.php:1394
+msgid "Closed"
+msgstr "Gesloten"
+
+#: mod/admin.php:1395
+msgid "Requires approval"
+msgstr "Toestemming vereist"
+
+#: mod/admin.php:1396
+msgid "Open"
+msgstr "Open"
+
+#: mod/admin.php:1400
+msgid "No SSL policy, links will track page SSL state"
+msgstr "Geen SSL beleid, links zullen SSL status van pagina volgen"
+
+#: mod/admin.php:1401
+msgid "Force all links to use SSL"
+msgstr "Verplicht alle links om SSL te gebruiken"
+
+#: mod/admin.php:1402
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+msgstr "Zelf-ondertekend certificaat, gebruik SSL alleen voor lokale links (afgeraden)"
+
+#: mod/admin.php:1406
+msgid "Don't check"
+msgstr "Geen rekening mee houden"
+
+#: mod/admin.php:1407
+msgid "check the stable version"
+msgstr "Neem de stabiele versie in rekening"
+
+#: mod/admin.php:1408
+msgid "check the development version"
+msgstr "Neem de ontwikkel versie in rekening"
+
+#: mod/admin.php:1427
+msgid "Republish users to directory"
+msgstr "Opnieuw de gebruikers naar de gids publiceren"
+
+#: mod/admin.php:1429
+msgid "File upload"
+msgstr "Uploaden bestand"
+
+#: mod/admin.php:1430
+msgid "Policies"
+msgstr "Beleid"
+
+#: mod/admin.php:1431 mod/contacts.php:926 mod/events.php:535
+#: src/Model/Profile.php:852
+msgid "Advanced"
+msgstr "Geavanceerd"
+
+#: mod/admin.php:1432
+msgid "Auto Discovered Contact Directory"
+msgstr "Automatisch Achterhaalde Contact Gids"
+
+#: mod/admin.php:1433
+msgid "Performance"
+msgstr "Performantie"
+
+#: mod/admin.php:1434
+msgid "Worker"
+msgstr "Worker"
+
+#: mod/admin.php:1435
+msgid "Message Relay"
+msgstr "Boodschap Relais"
+
+#: mod/admin.php:1436
+msgid ""
+"Relocate - WARNING: advanced function. Could make this server unreachable."
+msgstr "Verhuizen - WAARSCHUWING: geavanceerde functie. Zou deze server onbereikbaar kunnen maken."
+
+#: mod/admin.php:1439
+msgid "Site name"
+msgstr "Site naam"
+
+#: mod/admin.php:1440
+msgid "Host name"
+msgstr "Host naam"
+
+#: mod/admin.php:1441
+msgid "Sender Email"
+msgstr "Verzender Email"
+
+#: mod/admin.php:1441
+msgid ""
+"The email address your server shall use to send notification emails from."
+msgstr "Het email adres als afzender van notificatie emails."
+
+#: mod/admin.php:1442
+msgid "Banner/Logo"
+msgstr "Banner/Logo"
+
+#: mod/admin.php:1443
+msgid "Shortcut icon"
+msgstr "Snelkoppeling icoon"
+
+#: mod/admin.php:1443
+msgid "Link to an icon that will be used for browsers."
+msgstr "Link naar een icoon dat zal gebruikt worden voor browsers."
+
+#: mod/admin.php:1444
+msgid "Touch icon"
+msgstr "Pictogram voor smartphones"
+
+#: mod/admin.php:1444
+msgid "Link to an icon that will be used for tablets and mobiles."
+msgstr "Link naar een icoon dat zal gebruikt worden voor tablets en mobiele telefoons."
+
+#: mod/admin.php:1445
+msgid "Additional Info"
+msgstr "Bijkomende Info"
+
+#: mod/admin.php:1445
+#, php-format
+msgid ""
+"For public servers: you can add additional information here that will be "
+"listed at %s/servers."
+msgstr "Voor publieke servers: je kan bijkomende informatie hier toevoegen die zal opgelijst zijn op %s/servers."
+
+#: mod/admin.php:1446
+msgid "System language"
+msgstr "Systeemtaal"
+
+#: mod/admin.php:1447
+msgid "System theme"
+msgstr "Systeem thema"
+
+#: mod/admin.php:1447
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
+msgstr "Standaard systeem thema - kan door gebruikersprofielen veranderd worden - <a href='#' id='cnftheme'>verander thema instellingen</a>"
+
+#: mod/admin.php:1448
+msgid "Mobile system theme"
+msgstr "Mobiel systeem thema"
+
+#: mod/admin.php:1448
+msgid "Theme for mobile devices"
+msgstr "Thema voor mobiele apparaten"
+
+#: mod/admin.php:1449
+msgid "SSL link policy"
+msgstr "Beleid SSL-links"
+
+#: mod/admin.php:1449
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr "Bepaald of gegenereerde verwijzingen verplicht SSL moeten gebruiken"
+
+#: mod/admin.php:1450
+msgid "Force SSL"
+msgstr "Dwing SSL af"
+
+#: mod/admin.php:1450
+msgid ""
+"Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
+" to endless loops."
+msgstr "Forceer alle Niet-SSL aanvragen naar SSL - Pas op: dit kan op sommige systeem resulteren in oneindige lussen."
+
+#: mod/admin.php:1451
+msgid "Hide help entry from navigation menu"
+msgstr "Verberg de 'help' uit het navigatiemenu"
+
+#: mod/admin.php:1451
+msgid ""
+"Hides the menu entry for the Help pages from the navigation menu. You can "
+"still access it calling /help directly."
+msgstr "Verbergt het menu-item voor de Help pagina's uit het navigatiemenu. Je kunt ze nog altijd vinden door /help direct in te geven."
+
+#: mod/admin.php:1452
+msgid "Single user instance"
+msgstr "Server voor één gebruiker"
+
+#: mod/admin.php:1452
+msgid "Make this instance multi-user or single-user for the named user"
+msgstr "Stel deze server in voor meerdere gebruikers, of enkel voor de geselecteerde gebruiker."
+
+#: mod/admin.php:1453
+msgid "Maximum image size"
+msgstr "Maximum afbeeldingsgrootte"
+
+#: mod/admin.php:1453
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr "Maximum afmeting in bytes van afbeeldingen. Standaard is 0, dus geen beperking."
+
+#: mod/admin.php:1454
+msgid "Maximum image length"
+msgstr "Maximum afbeeldingslengte"
+
+#: mod/admin.php:1454
+msgid ""
+"Maximum length in pixels of the longest side of uploaded images. Default is "
+"-1, which means no limits."
+msgstr "Maximum lengte in pixels van de langste kant van afbeeldingen. Standaard is -1, dus geen beperkingen."
+
+#: mod/admin.php:1455
+msgid "JPEG image quality"
+msgstr "JPEG afbeeldingskwaliteit"
+
+#: mod/admin.php:1455
+msgid ""
+"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
+"100, which is full quality."
+msgstr "JPEGS zullen met deze kwaliteitsinstelling bewaard worden [0-100]. Standaard is 100, dit is volledige kwaliteit."
+
+#: mod/admin.php:1457
+msgid "Register policy"
+msgstr "Registratiebeleid"
+
+#: mod/admin.php:1458
+msgid "Maximum Daily Registrations"
+msgstr "Maximum aantal registraties per dag"
+
+#: mod/admin.php:1458
+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 "Als registratie hierboven is toegelaten, zet dit het maximum aantal registraties van nieuwe gebruikers per dag. Als registratie niet is toegelaten heeft deze instelling geen effect."
+
+#: mod/admin.php:1459
+msgid "Register text"
+msgstr "Registratietekst"
+
+#: mod/admin.php:1459
+msgid ""
+"Will be displayed prominently on the registration page. You can use BBCode "
+"here."
+msgstr "Zal prominent op de registratie pagina getoond worden. Je kan hierin BBCode gebruiken."
+
+#: mod/admin.php:1460
+msgid "Forbidden Nicknames"
+msgstr "Verboden bijnamen"
+
+#: mod/admin.php:1460
+msgid ""
+"Comma separated list of nicknames that are forbidden from registration. "
+"Preset is a list of role names according RFC 2142."
+msgstr "Kommagescheiden lijst van bijnamen die verboden zijn voor registratie. De lijst uit RFC2142 is op voorhand ingesteld."
+
+#: mod/admin.php:1461
+msgid "Accounts abandoned after x days"
+msgstr "Verlaten accounts na x dagen"
+
+#: mod/admin.php:1461
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr "Dit zal geen systeembronnen verspillen aan het nakijken van externe sites voor verlaten accounts. Geef 0 is voor geen tijdslimiet."
+
+#: mod/admin.php:1462
+msgid "Allowed friend domains"
+msgstr "Toegelaten vriend domeinen"
+
+#: mod/admin.php:1462
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr "Komma-gescheiden lijst van domeinen die een vriendschapsband met deze website mogen aangaan. Jokers zijn toegelaten. Laat leeg om alle domeinen toe te laten."
+
+#: mod/admin.php:1463
+msgid "Allowed email domains"
+msgstr "Toegelaten e-mail domeinen"
+
+#: mod/admin.php:1463
+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 "Door komma's gescheiden lijst met e-maildomeinen die op deze website mogen registeren. Wildcards zijn toegestaan.\nLeeg laten om alle domeinen toe te staan."
+
+#: mod/admin.php:1464
+msgid "No OEmbed rich content"
+msgstr "Geen OEmbed richt content"
+
+#: mod/admin.php:1464
+msgid ""
+"Don't show the rich content (e.g. embedded PDF), except from the domains "
+"listed below."
+msgstr "Toon geen rich content (bvb. embedded PDF), behalve van domeinen hieronder opgelijst."
+
+#: mod/admin.php:1465
+msgid "Allowed OEmbed domains"
+msgstr "Sta OEmbed domeinen toe"
+
+#: mod/admin.php:1465
+msgid ""
+"Comma separated list of domains which oembed content is allowed to be "
+"displayed. Wildcards are accepted."
+msgstr "Met komma's gescheiden lijst van domeinen waarvoor oembed content mag getoond worden. Wildcards zijn toegelaten."
+
+#: mod/admin.php:1466
+msgid "Block public"
+msgstr "Openbare toegang blokkeren"
+
+#: mod/admin.php:1466
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr "Kruis dit aan om alle openbare persoonlijke pagina's alleen toegankelijk te maken voor ingelogde gebruikers."
+
+#: mod/admin.php:1467
+msgid "Force publish"
+msgstr "Dwing publiceren af"
+
+#: mod/admin.php:1467
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr "Kruis dit aan om af te dwingen dat alle profielen op deze website in de gids van deze website gepubliceerd worden."
+
+#: mod/admin.php:1467
+msgid "Enabling this may violate privacy laws like the GDPR"
+msgstr "Dit activeren zou privacy wetten zoals GDPR (AVG) kunnen overtreden"
+
+#: mod/admin.php:1468
+msgid "Global directory URL"
+msgstr "Algemene gids URL"
+
+#: mod/admin.php:1468
+msgid ""
+"URL to the global directory. If this is not set, the global directory is "
+"completely unavailable to the application."
+msgstr "URL naar de globale gids. Als dit niet geconfigureerd is, dan zal de globale gids volledig onbeschikbaar zijn voor de applicatie."
+
+#: mod/admin.php:1469
+msgid "Private posts by default for new users"
+msgstr "Privéberichten als standaard voor nieuwe gebruikers"
+
+#: mod/admin.php:1469
+msgid ""
+"Set default post permissions for all new members to the default privacy "
+"group rather than public."
+msgstr "Stel de standaardrechten van berichten voor nieuwe leden op de standaard privacygroep in, in plaats van openbaar."
+
+#: mod/admin.php:1470
+msgid "Don't include post content in email notifications"
+msgstr "De inhoud van het bericht niet insluiten bij e-mailnotificaties"
+
+#: mod/admin.php:1470
+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 "De inhoud van berichten/commentaar/privéberichten/enzovoort  niet insluiten in e-mailnotificaties die door deze website verzonden worden, voor de bescherming van je privacy."
+
+#: mod/admin.php:1471
+msgid "Disallow public access to addons listed in the apps menu."
+msgstr "Publieke toegang ontzeggen tot addons die opgelijst zijn in het applicatie menu."
+
+#: mod/admin.php:1471
+msgid ""
+"Checking this box will restrict addons listed in the apps menu to members "
+"only."
+msgstr "Dit vakje aanvinken zal de lijst van addons in het applicatie menu beperken tot alleen leden."
+
+#: mod/admin.php:1472
+msgid "Don't embed private images in posts"
+msgstr "Privé beelden in berichten niet inwerken"
+
+#: mod/admin.php:1472
+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 "Vervang lokaal gehoste privé foto's in berichten niet door een ingewerkte kopie van het beeld. Dit betekent dat contacten die berichten krijgen met privé foto's zullen moeten authentificeren en elk beeld apart laden, wat een tijdje kan duren."
+
+#: mod/admin.php:1473
+msgid "Explicit Content"
+msgstr "Expliciete inhoud"
+
+#: mod/admin.php:1473
+msgid ""
+"Set this to announce that your node is used mostly for explicit content that"
+" might not be suited for minors. This information will be published in the "
+"node information and might be used, e.g. by the global directory, to filter "
+"your node from listings of nodes to join. Additionally a note about this "
+"will be shown at the user registration page."
+msgstr "Vink dit aan om aan te duiden dat deze node veel expliciet materiaal verspreid en niet bedoeld is voor minderjarigen. Deze info zal gepubliceert worden bij de node-info en kan vb. gebruikt worden voor een filter in de globale lijst. Dit word ook getoont naar de gebruiker op de registratie pagina."
+
+#: mod/admin.php:1474
+msgid "Allow Users to set remote_self"
+msgstr "Sta Gebruikers toe om remote_self te configureren"
+
+#: mod/admin.php:1474
+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 "Als je dit aanvinkt, dan mag elke gebruiker elke contact als remote_self aanduiden in de 'herstel contact' dialoog. Deze vlag aanzetten voor een contact zorgt ervoor dat elke bericht van dit contact gespiegeld wordt in de gebruiker zijn of haar stroom. "
+
+#: mod/admin.php:1475
+msgid "Block multiple registrations"
+msgstr "Blokkeer meerdere registraties"
+
+#: mod/admin.php:1475
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr "Laat niet toe dat gebruikers meerdere accounts aanmaken."
+
+#: mod/admin.php:1476
+msgid "OpenID support"
+msgstr "OpenID ondersteuning"
+
+#: mod/admin.php:1476
+msgid "OpenID support for registration and logins."
+msgstr "OpenID ondersteuning voor registraties en logins."
+
+#: mod/admin.php:1477
+msgid "Fullname check"
+msgstr "Controleer volledige naam"
+
+#: mod/admin.php:1477
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
+msgstr "Verplicht gebruikers om zich te registreren met een spatie tussen voornaam en achternaam, als anti-spam maatregel"
+
+#: mod/admin.php:1478
+msgid "Community pages for visitors"
+msgstr "Groepspagina voor bezoekers"
+
+#: mod/admin.php:1478
+msgid ""
+"Which community pages should be available for visitors. Local users always "
+"see both pages."
+msgstr "Welke groepspagina's moeten beschikbaar zijn voor bezoekers. Lokale gebruikers zien altijd beide pagina's."
+
+#: mod/admin.php:1479
+msgid "Posts per user on community page"
+msgstr "Berichten per gebruiker op de groepspagina"
+
+#: mod/admin.php:1479
+msgid ""
+"The maximum number of posts per user on the community page. (Not valid for "
+"'Global Community')"
+msgstr "Het maximum aantal berichten per gebruiker op de groepspagina. (Niet geldig voor 'Globale Gemeenschap')"
+
+#: mod/admin.php:1480
+msgid "Enable OStatus support"
+msgstr "OStatus ondersteuning activeren"
+
+#: mod/admin.php:1480
+msgid ""
+"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
+"communications in OStatus are public, so privacy warnings will be "
+"occasionally displayed."
+msgstr "Verschaf ingebouwde OStatus (StatusNet, GNU Social enz.) compatibiliteit. Alle communicatie in OStatus is publiek, dus privacy waarschuwingen zullen occasioneel getoond worden."
+
+#: mod/admin.php:1481
+msgid "Only import OStatus threads from our contacts"
+msgstr "Alleen OStatus gesprekken importeren van onze contacten"
+
+#: mod/admin.php:1481
+msgid ""
+"Normally we import every content from our OStatus contacts. With this option"
+" we only store threads that are started by a contact that is known on our "
+"system."
+msgstr "Normaalgezien importeren we alle content van onze OStatus contacten. Met deze optie slaan we alleen gesprekken op die gestart zijn door een contact dat gekend is in ons systeem."
+
+#: mod/admin.php:1482
+msgid "OStatus support can only be enabled if threading is enabled."
+msgstr "OStatus ondersteuning kan alleen geactiveerd worden als de gespreksstroom geactiveerd is."
+
+#: mod/admin.php:1484
+msgid ""
+"Diaspora support can't be enabled because Friendica was installed into a sub"
+" directory."
+msgstr "Diaspora ondersteuning is niet mogelijk omdat Friendica in een sub folder geïnstalleerd is."
+
+#: mod/admin.php:1485
+msgid "Enable Diaspora support"
+msgstr "Diaspora ondersteuning activeren"
+
+#: mod/admin.php:1485
+msgid "Provide built-in Diaspora network compatibility."
+msgstr "Bied ingebouwde ondersteuning voor het Diaspora netwerk."
+
+#: mod/admin.php:1486
+msgid "Only allow Friendica contacts"
+msgstr "Laat alleen Friendica contacten toe"
+
+#: mod/admin.php:1486
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr "Alle contacten moeten een Friendica protocol gebruiken. Alle andere ingebouwde communicatieprotocols worden uitgeschakeld."
+
+#: mod/admin.php:1487
+msgid "Verify SSL"
+msgstr "Controleer SSL"
+
+#: mod/admin.php:1487
+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 "Als je wilt kun je striktere certificaat controle activeren. Dit betekent dat je (totaal) niet kunt connecteren met sites die zelf-ondertekende SSL certificaten gebruiken."
+
+#: mod/admin.php:1488
+msgid "Proxy user"
+msgstr "Proxy-gebruiker"
+
+#: mod/admin.php:1489
+msgid "Proxy URL"
+msgstr "Proxy-URL"
+
+#: mod/admin.php:1490
+msgid "Network timeout"
+msgstr "Netwerk timeout"
+
+#: mod/admin.php:1490
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr "Waarde is in seconden. Zet op 0 voor onbeperkt (niet aanbevolen)."
+
+#: mod/admin.php:1491
+msgid "Maximum Load Average"
+msgstr "Maximum gemiddelde belasting"
+
+#: mod/admin.php:1491
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr "Maximum systeembelasting voordat aflever- en poll-processen uitgesteld worden - standaard 50."
+
+#: mod/admin.php:1492
+msgid "Maximum Load Average (Frontend)"
+msgstr "Maximum Gemiddelde Belasting (Frontend)"
+
+#: mod/admin.php:1492
+msgid "Maximum system load before the frontend quits service - default 50."
+msgstr "Maximum systeem belasting wanneer de frontend ermee ophoudt - standaard waarde 50."
+
+#: mod/admin.php:1493
+msgid "Minimal Memory"
+msgstr "Minimaal Geheugen"
+
+#: mod/admin.php:1493
+msgid ""
+"Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
+"default 0 (deactivated)."
+msgstr "Minimum vrij geheugen in MB voor de worker. Toegang nodig tot /proc/meminfo - standaard waarde 0 (gedeactiveerd)."
+
+#: mod/admin.php:1494
+msgid "Maximum table size for optimization"
+msgstr "Maximum tabel grootte voor optimisatie"
+
+#: mod/admin.php:1494
+msgid ""
+"Maximum table size (in MB) for the automatic optimization. Enter -1 to "
+"disable it."
+msgstr "Maximum tabel grootte (in MB) voor de automatisch optimisatie. Geef -1 op om dit te deactiveren."
+
+#: mod/admin.php:1495
+msgid "Minimum level of fragmentation"
+msgstr "Minimum niveau van fragmentatie"
+
+#: mod/admin.php:1495
+msgid ""
+"Minimum fragmenation level to start the automatic optimization - default "
+"value is 30%."
+msgstr "Minimum fragmentatie niveau om de automatische optimisatie te starten - standaard waarde is 30%."
+
+#: mod/admin.php:1497
+msgid "Periodical check of global contacts"
+msgstr "Regematige controle van de globale contacten"
+
+#: mod/admin.php:1497
+msgid ""
+"If enabled, the global contacts are checked periodically for missing or "
+"outdated data and the vitality of the contacts and servers."
+msgstr "Als dit geactiveerd is, dan worden de globale contacten regelmatig gecheckt naar ontbrekende of verlopen data and the vitaliteit van de contacten en servers."
+
+#: mod/admin.php:1498
+msgid "Days between requery"
+msgstr "Dagen tussen herbevraging"
+
+#: mod/admin.php:1498
+msgid "Number of days after which a server is requeried for his contacts."
+msgstr "Aantal dagen waarna de server opnieuw bevraagd wordt naar zijn contacten."
+
+#: mod/admin.php:1499
+msgid "Discover contacts from other servers"
+msgstr "Ontdek contacten van andere servers"
+
+#: mod/admin.php:1499
+msgid ""
+"Periodically query other servers for contacts. You can choose between "
+"'users': the users on the remote system, 'Global Contacts': active contacts "
+"that are known on the system. The fallback is meant for Redmatrix servers "
+"and older friendica servers, where global contacts weren't available. The "
+"fallback increases the server load, so the recommened setting is 'Users, "
+"Global Contacts'."
+msgstr "Bevraag andere servers regelmatig naar contacten. Je kan kiezen tussen 'gebruikers': de gebruikers op het remote systeem, 'Globale contacten': actieve contacten die gekend zijn op het systeem. De noodoplossing is bedoeld voor Redmatrix servers en oude Friendica servers, waarop globale contacten niet bestonden. De noodoplossing veroorzaakt meer belasting van de server, dus de aanbevolen configuratie is 'Gebruikers, Globale contacten'."
+
+#: mod/admin.php:1500
+msgid "Timeframe for fetching global contacts"
+msgstr "Tijdspanne voor het ophalen van globale contacten"
+
+#: mod/admin.php:1500
+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 "Wanneer ontdekking is geactiveerd, dan definieert deze waarde de tijdspanne voor de activiteit van globale contacten die opgehaald worden van andere servers."
+
+#: mod/admin.php:1501
+msgid "Search the local directory"
+msgstr "Doorzoek de lokale gids"
+
+#: mod/admin.php:1501
+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 "Doorzoek de lokale gids in plaats van de globale gids. Bij lokale doorzoeking wordt elke opzoeking in de globale gids op de achtergrond uitgevoerd. Dit verbetert de zoekresultaten wanneer de zoekopdracht herhaald wordt."
+
+#: mod/admin.php:1503
+msgid "Publish server information"
+msgstr "Publiceer server informatie"
+
+#: mod/admin.php:1503
+msgid ""
+"If enabled, general server and usage data will be published. The data "
+"contains the name and version of the server, number of users with public "
+"profiles, number of posts and the activated protocols and connectors. See <a"
+" href='http://the-federation.info/'>the-federation.info</a> for details."
+msgstr "Als deze optie geactiveerd is, dan zal algemene server en gebruiksdata gepubliceerd worden. De data bevat de naam en versie van de server, het aantal gebruikers met publieke profielen, het aantal berichten en de geactiveerd protocollen en connectoren. Zie <a href='http://the-federation.info/'>the-federation.info</a> voor details."
+
+#: mod/admin.php:1505
+msgid "Check upstream version"
+msgstr "Controleer upstream versie"
+
+#: mod/admin.php:1505
+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 "Activeer het controleren op nieuwe versies van Friendica bij github. Als er een nieuwe versie is, dan word je geïnformeerd in the administratie paneel."
+
+#: mod/admin.php:1506
+msgid "Suppress Tags"
+msgstr "Onderdruk Tags"
+
+#: mod/admin.php:1506
+msgid "Suppress showing a list of hashtags at the end of the posting."
+msgstr "Onderdruk het tonen van een lijst van hastags op het einde van het bericht."
+
+#: mod/admin.php:1507
+msgid "Clean database"
+msgstr "Database opruimen"
+
+#: mod/admin.php:1507
+msgid ""
+"Remove old remote items, orphaned database records and old content from some"
+" other helper tables."
+msgstr "Verwijder oude remote items, database weesrecords en oude content van andere helper tabellen."
+
+#: mod/admin.php:1508
+msgid "Lifespan of remote items"
+msgstr "Levensduur van remote items"
+
+#: mod/admin.php:1508
+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 "Als de database opruiming is geactiveerd, dan definieert dit na hoeveel dagen remote items verwijderd zullen worden. Eigen items, en gemarkeerde of opgeslagen items worden altijd behouden. 0 deactiveert dit gedrag."
+
+#: mod/admin.php:1509
+msgid "Lifespan of unclaimed items"
+msgstr "Levensduur van niet geclaimde items"
+
+#: mod/admin.php:1509
+msgid ""
+"When the database cleanup is enabled, this defines the days after which "
+"unclaimed remote items (mostly content from the relay) will be deleted. "
+"Default value is 90 days. Defaults to the general lifespan value of remote "
+"items if set to 0."
+msgstr "Als de database opruiming geactiveerd is, dan definieert dit na hoeveel dagen ongeclaimde remote items (meestal content van een relais) zal verwijderd worden. Standaard waarde is 90 dagen. Als de waarde 0 is, dan is de waarde gelijk aan de algemene levensduur van remote items."
+
+#: mod/admin.php:1510
+msgid "Path to item cache"
+msgstr "Pad naar cache voor items"
+
+#: mod/admin.php:1510
+msgid "The item caches buffers generated bbcode and external images."
+msgstr "Item caches bufferen gegenereerde bbcodes en externe beelden."
+
+#: mod/admin.php:1511
+msgid "Cache duration in seconds"
+msgstr "Cache tijdsduur in seconden"
+
+#: mod/admin.php:1511
+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 "Hoe lang moeten de cache bestanden bijgehouden worden? Standaard waarde is 86400 seconden (een dag). Zet de waarde op -1 om de item cache te deactiveren."
+
+#: mod/admin.php:1512
+msgid "Maximum numbers of comments per post"
+msgstr "Maximum aantal reacties per bericht"
+
+#: mod/admin.php:1512
+msgid "How much comments should be shown for each post? Default value is 100."
+msgstr "Hoeveel reacties moeten getoond worden per bericht? Standaard waarde is 100."
+
+#: mod/admin.php:1513
+msgid "Temp path"
+msgstr "Tijdelijk pad"
+
+#: mod/admin.php:1513
+msgid ""
+"If you have a restricted system where the webserver can't access the system "
+"temp path, enter another path here."
+msgstr "Als je een systeem met restricties hebt waarbij de webserver geen toegang heeft tot het systeem pad, geef hier dan een ander pad in. "
+
+#: mod/admin.php:1514
+msgid "Base path to installation"
+msgstr "Basispad voor installatie"
+
+#: mod/admin.php:1514
+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 "Als het systeem het correcte pad naar je installatie niet kan detecteren, geef hier dan het correcte pad in. Deze instelling zou alleen geconfigureerd moeten worden als je een systeem met restricties hebt en symbolische links naar je webroot."
+
+#: mod/admin.php:1515
+msgid "Disable picture proxy"
+msgstr "Schakel beeld proxy uit"
+
+#: mod/admin.php:1515
+msgid ""
+"The picture proxy increases performance and privacy. It shouldn't be used on"
+" systems with very low bandwidth."
+msgstr "De beeld proxy verhoogt de performantie en privacy. Gebruik dit niet op systemen met erg lage bandbreedte."
+
+#: mod/admin.php:1516
+msgid "Only search in tags"
+msgstr "Zoek alleen in tags"
+
+#: mod/admin.php:1516
+msgid "On large systems the text search can slow down the system extremely."
+msgstr "Het opzoeken van tekst kan grote systemen extreem vertragen."
+
+#: mod/admin.php:1518
+msgid "New base url"
+msgstr "Nieuwe basis url"
+
+#: mod/admin.php:1518
+msgid ""
+"Change base url for this server. Sends relocate message to all Friendica and"
+" Diaspora* contacts of all users."
+msgstr "Verander de basis url voor deze server. Stuurt een verhuis boodschap naar all Friendica en Diaspora* contacten."
+
+#: mod/admin.php:1520
+msgid "RINO Encryption"
+msgstr "RINO encryptie"
+
+#: mod/admin.php:1520
+msgid "Encryption layer between nodes."
+msgstr "Encryptie laag tussen nodes."
+
+#: mod/admin.php:1520
+msgid "Enabled"
+msgstr "Geactiveerd"
+
+#: mod/admin.php:1522
+msgid "Maximum number of parallel workers"
+msgstr "Maximum aantal parallelle workers"
+
+#: mod/admin.php:1522
+#, php-format
+msgid ""
+"On shared hosters set this to %d. On larger systems, values of %d are great."
+" Default value is %d."
+msgstr "Op gedeelde hosts zet dit op %d. Op grotere systemen, waarden als %d zijn goed. standaard waarde is %d"
+
+#: mod/admin.php:1523
+msgid "Don't use 'proc_open' with the worker"
+msgstr "Gebruik 'proc_open' niet met de worker"
+
+#: mod/admin.php:1523
+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 "Activeer dit als je systeem het gebruik van 'proc_open' niet toelaat. Dit kan het geval zijn op gedeelde hosts. Als dit geactiveerd is, dan verhoog je best ook de frequentie van de oproepen naar de workers in je crontab."
+
+#: mod/admin.php:1524
+msgid "Enable fastlane"
+msgstr "Activeer fastlane"
+
+#: mod/admin.php:1524
+msgid ""
+"When enabed, the fastlane mechanism starts an additional worker if processes"
+" with higher priority are blocked by processes of lower priority."
+msgstr "Als deze parameter geactiveerd is, dan start het fastlane mechanisme een bijkomende worker als processen met hogere prioriteit geblokkeerd worden door processen met een lagere prioriteit."
+
+#: mod/admin.php:1525
+msgid "Enable frontend worker"
+msgstr "Activeer frontend worker"
+
+#: mod/admin.php:1525
+#, php-format
+msgid ""
+"When enabled the Worker process is triggered when backend access is "
+"performed \\x28e.g. messages being delivered\\x29. On smaller sites you "
+"might want to call %s/worker on a regular basis via an external cron job. "
+"You should only enable this option if you cannot utilize cron/scheduled jobs"
+" on your server."
+msgstr "Als deze parameter geactiveerd is, dan wordt het Worker proces getriggerd wanneer toegang wordt verkregen tot de backend \\x28bvb. boodschappen die geleverd worden\\x29. Op kleinere sites zal je mogelijks opteren om %s/worker op regelmatige basis via een externe geplande taak op te roepen. Activeer deze optie alleen als je cron/geplande taken op je server niet kan gebruiken."
+
+#: mod/admin.php:1527
+msgid "Subscribe to relay"
+msgstr "Schrijf in op relais"
+
+#: mod/admin.php:1527
+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 "Activeert het ontvangen van publieke berichten vanwege de relais. Ze zullen inbegrepen zijn in de zoekresultaten, tags waarop je ingeschreven bent en op de globale groepspagina."
+
+#: mod/admin.php:1528
+msgid "Relay server"
+msgstr "Relais server"
+
+#: mod/admin.php:1528
+msgid ""
+"Address of the relay server where public posts should be send to. For "
+"example https://relay.diasp.org"
+msgstr "Adres van de relais server waar publieke berichten naartoe moeten gezonden worden. Bijvoorbeeld https://relay.diasp.org"
+
+#: mod/admin.php:1529
+msgid "Direct relay transfer"
+msgstr "Directe relais transfer"
+
+#: mod/admin.php:1529
+msgid ""
+"Enables the direct transfer to other servers without using the relay servers"
+msgstr "Activeert directe relais transfer naar andere servers zonder gebruik van relais servers"
+
+#: mod/admin.php:1530
+msgid "Relay scope"
+msgstr "Scope van de relais"
+
+#: mod/admin.php:1530
+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 "Kan 'alle' of 'tags' zijn. 'alle' betekent dat elk publiek bericht ontvangen moet worden. 'tags' betekent dat alleen berichten met geselecteerde tags moeten ontvangen worden."
+
+#: mod/admin.php:1530
+msgid "all"
+msgstr "alle"
+
+#: mod/admin.php:1530
+msgid "tags"
+msgstr "tags"
+
+#: mod/admin.php:1531
+msgid "Server tags"
+msgstr "Server tags"
+
+#: mod/admin.php:1531
+msgid "Comma separated list of tags for the 'tags' subscription."
+msgstr "Door komma's gescheiden lijst van tags voor de 'tags' inschrijving."
+
+#: mod/admin.php:1532
+msgid "Allow user tags"
+msgstr "Sta gebruiker tags toe."
+
+#: mod/admin.php:1532
+msgid ""
+"If enabled, the tags from the saved searches will used for the 'tags' "
+"subscription in addition to the 'relay_server_tags'."
+msgstr "Als deze parameter geactiveerd is, dan zullen de tags uit de opgeslagen zoekresultaten gebruikt worden voor de 'tags' inschrijving bovenop de 'relais_server_tags'."
+
+#: mod/admin.php:1535
+msgid "Start Relocation"
+msgstr "Start verhuis"
+
+#: mod/admin.php:1561
+msgid "Update has been marked successful"
+msgstr "Wijziging succesvol gemarkeerd "
+
+#: mod/admin.php:1568
+#, php-format
+msgid "Database structure update %s was successfully applied."
+msgstr "Database structuur update %s werd met succes toegepast."
+
+#: mod/admin.php:1571
+#, php-format
+msgid "Executing of database structure update %s failed with error: %s"
+msgstr "Uitvoering van de database structuur update %s is mislukt met fout: %s"
+
+#: mod/admin.php:1587
+#, php-format
+msgid "Executing %s failed with error: %s"
+msgstr "Uitvoering van %s mislukt met fout: %s"
+
+#: mod/admin.php:1589
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr "Wijziging %s geslaagd."
+
+#: mod/admin.php:1592
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr "Wijziging %s gaf geen status terug. We weten niet of de wijziging geslaagd is."
+
+#: mod/admin.php:1595
+#, php-format
+msgid "There was no additional update function %s that needed to be called."
+msgstr "Er was geen bijkomende update functie %s die moest opgeroepen worden."
+
+#: mod/admin.php:1618
+msgid "No failed updates."
+msgstr "Geen mislukte wijzigingen"
+
+#: mod/admin.php:1619
+msgid "Check database structure"
+msgstr "Controleer de database structuur"
+
+#: mod/admin.php:1624
+msgid "Failed Updates"
+msgstr "Mislukte wijzigingen"
+
+#: mod/admin.php:1625
+msgid ""
+"This does not include updates prior to 1139, which did not return a status."
+msgstr "Dit is zonder de wijzigingen voor 1139, welke geen status teruggaven."
+
+#: mod/admin.php:1626
+msgid "Mark success (if update was manually applied)"
+msgstr "Markeren als succes (als aanpassing manueel doorgevoerd werd)"
+
+#: mod/admin.php:1627
+msgid "Attempt to execute this update step automatically"
+msgstr "Probeer deze stap automatisch uit te voeren"
+
+#: mod/admin.php:1666
+#, php-format
+msgid ""
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tthe administrator of %2$s has set up an account for you."
+msgstr "\n\t\t\tBeste %1$s,\n\t\t\t\tde beheerder van %2$s heeft een account aangemaakt voor jou."
+
+#: mod/admin.php:1669
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe login details are as follows:\n"
+"\n"
+"\t\t\tSite Location:\t%1$s\n"
+"\t\t\tLogin Name:\t\t%2$s\n"
+"\t\t\tPassword:\t\t%3$s\n"
+"\n"
+"\t\t\tYou may change your password from your account \"Settings\" page after logging\n"
+"\t\t\tin.\n"
+"\n"
+"\t\t\tPlease take a few moments to review the other account settings on that page.\n"
+"\n"
+"\t\t\tYou may also wish to add some basic information to your default profile\n"
+"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
+"\n"
+"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
+"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
+"\t\t\tperhaps what country you live in; if you do not wish to be more specific\n"
+"\t\t\tthan that.\n"
+"\n"
+"\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
+"\t\t\tIf you are new and do not know anybody here, they may help\n"
+"\t\t\tyou to make some new and interesting friends.\n"
+"\n"
+"\t\t\tIf you ever want to delete your account, you can do so at %1$s/removeme\n"
+"\n"
+"\t\t\tThank you and welcome to %4$s."
+msgstr "\n\t\t\tDe login details zijn de volgende:\n\n\t\t\tSite Locatie:\t%1$s\n\t\t\tLogin Naam:\t\t%2$s\n\t\t\tPaswoord:\t\t%3$s\n\n\t\t\tJe kan je paswoord in je account \"Instellingen\" pagina aanpassen \nnadat je ingelogd bent\n\t\t\tNeem alstublieft een ogenblik om de andere account instellingen op die pagina na te kijken.\n\n\t\t\tMisschien wil je ook wat basis informatie toevoegen aan je standaard profiel\n\t\t\t(op de \"Profielen\" pagina) zodat anderen je gemakkelijk kunnen terugvinden.\n\n\t\t\tWe raden aan je volledige naam in te stellen, een profiel foto toe te voegen,\n\t\t\tenkele \"sleutelwoorden\" toe te voegen (zeer handig om nieuwe vrienden te maken) - en\n\t\t\tmisschien ook in welk land je woont; als je liever niet specifieker \nbent dan dat.\n\n\n\t\t\tWe respecteren ten volle je recht op privacy, en geen van deze items is verplicht.\n\t\t\tAls je nieuw bent hier en niemand kent, dan kunnen zij je mogelijks helpen\n\t\t\tom enkele nieuwe en interessante vrienden te leren kennen.\n\n\t\t\tAls je ooit je account wil verwijderen, dan kan dat via %1$s/removeme\n\n\t\t\tBedankt en welkom bij %4$s."
+
+#: mod/admin.php:1706 src/Model/User.php:707
+#, php-format
+msgid "Registration details for %s"
+msgstr "Registratie details voor %s"
+
+#: mod/admin.php:1716
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] "%s gebruiker geblokkeerd/niet geblokkeerd"
+msgstr[1] "%s gebruikers geblokkeerd/niet geblokkeerd"
+
+#: mod/admin.php:1722
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] "%s gebruiker verwijderd"
+msgstr[1] "%s gebruikers verwijderd"
+
+#: mod/admin.php:1769
+#, php-format
+msgid "User '%s' deleted"
+msgstr "Gebruiker '%s' verwijderd"
+
+#: mod/admin.php:1777
+#, php-format
+msgid "User '%s' unblocked"
+msgstr "Gebruiker '%s' niet meer geblokkeerd"
+
+#: mod/admin.php:1777
+#, php-format
+msgid "User '%s' blocked"
+msgstr "Gebruiker '%s' geblokkeerd"
+
+#: mod/admin.php:1838
+msgid "Private Forum"
+msgstr "Privé Forum"
+
+#: mod/admin.php:1890 mod/admin.php:1901 mod/admin.php:1915 mod/admin.php:1933
+#: src/Content/ContactSelector.php:81
+msgid "Email"
+msgstr "E-mail"
+
+#: mod/admin.php:1890 mod/admin.php:1915
+msgid "Register date"
+msgstr "Registratiedatum"
+
+#: mod/admin.php:1890 mod/admin.php:1915
+msgid "Last login"
+msgstr "Laatste login"
+
+#: mod/admin.php:1890 mod/admin.php:1915
+msgid "Last item"
+msgstr "Laatste item"
+
+#: mod/admin.php:1890
+msgid "Type"
+msgstr "Type"
+
+#: mod/admin.php:1897
+msgid "Add User"
+msgstr "Gebruiker toevoegen"
+
+#: mod/admin.php:1899
+msgid "User registrations waiting for confirm"
+msgstr "Gebruikersregistraties wachten op een bevestiging"
+
+#: mod/admin.php:1900
+msgid "User waiting for permanent deletion"
+msgstr "Gebruiker wacht op permanente verwijdering"
+
+#: mod/admin.php:1901
+msgid "Request date"
+msgstr "Registratiedatum"
+
+#: mod/admin.php:1902
+msgid "No registrations."
+msgstr "Geen registraties."
+
+#: mod/admin.php:1903
+msgid "Note from the user"
+msgstr "Nota van de gebruiker"
+
+#: mod/admin.php:1905
+msgid "Deny"
+msgstr "Weiger"
+
+#: mod/admin.php:1908
+msgid "User blocked"
+msgstr "Gebruiker geblokeerd"
+
+#: mod/admin.php:1910
+msgid "Site admin"
+msgstr "Sitebeheerder"
+
+#: mod/admin.php:1911
+msgid "Account expired"
+msgstr "Account verlopen"
+
+#: mod/admin.php:1914
+msgid "New User"
+msgstr "Nieuwe gebruiker"
+
+#: mod/admin.php:1915
+msgid "Deleted since"
+msgstr "Verwijderd sinds"
+
+#: mod/admin.php:1920
+msgid ""
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Geselecteerde gebruikers zullen verwijderd worden!\\n\\nAlles wat deze gebruikers gepost hebben op deze website zal permanent verwijderd worden!\\n\\nBen je zeker?"
+
+#: mod/admin.php:1921
+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 "De gebruiker {0} zal verwijderd worden!\\n\\nAlles wat deze gebruiker gepost heeft op deze website zal permanent verwijderd worden!\\n\\nBen je zeker?"
+
+#: mod/admin.php:1931
+msgid "Name of the new user."
+msgstr "Naam van nieuwe gebruiker"
+
+#: mod/admin.php:1932
+msgid "Nickname"
+msgstr "Bijnaam"
+
+#: mod/admin.php:1932
+msgid "Nickname of the new user."
+msgstr "Bijnaam van nieuwe gebruiker"
+
+#: mod/admin.php:1933
+msgid "Email address of the new user."
+msgstr "E-mailadres van nieuwe gebruiker"
+
+#: mod/admin.php:1975
+#, php-format
+msgid "Addon %s disabled."
+msgstr "Addon %s gedeactiveerd"
+
+#: mod/admin.php:1979
+#, php-format
+msgid "Addon %s enabled."
+msgstr "Addon %s geactiveerd"
+
+#: mod/admin.php:1989 mod/admin.php:2238
+msgid "Disable"
+msgstr "Uitschakelen"
+
+#: mod/admin.php:1992 mod/admin.php:2241
+msgid "Enable"
+msgstr "Inschakelen"
+
+#: mod/admin.php:2014 mod/admin.php:2284
+msgid "Toggle"
+msgstr "Schakelaar"
+
+#: mod/admin.php:2022 mod/admin.php:2293
+msgid "Author: "
+msgstr "Auteur:"
+
+#: mod/admin.php:2023 mod/admin.php:2294
+msgid "Maintainer: "
+msgstr "Onderhoud:"
+
+#: mod/admin.php:2075
+msgid "Reload active addons"
+msgstr "Herlaad actieve addons"
+
+#: mod/admin.php:2080
+#, php-format
+msgid ""
+"There are currently no addons available on your node. You can find the "
+"official addon repository at %1$s and might find other interesting addons in"
+" the open addon registry at %2$s"
+msgstr "Er zijn op je node momenteel geen addons beschikbaar. Je kan de officiële addon repository vinden op %1$s en je kan mogelijks nog andere interessante addons vinden in de open addon registry op %2$s"
+
+#: mod/admin.php:2200
+msgid "No themes found."
+msgstr "Geen thema's gevonden."
+
+#: mod/admin.php:2275
+msgid "Screenshot"
+msgstr "Schermafdruk"
+
+#: mod/admin.php:2329
+msgid "Reload active themes"
+msgstr "Herlaad actieve thema's"
+
+#: mod/admin.php:2334
+#, php-format
+msgid "No themes found on the system. They should be placed in %1$s"
+msgstr "Geen thema's gevonden op het systeem. Ze zouden zich moeten bevinden in %1$s"
+
+#: mod/admin.php:2335
+msgid "[Experimental]"
+msgstr "[Experimenteel]"
+
+#: mod/admin.php:2336
+msgid "[Unsupported]"
+msgstr "[Niet ondersteund]"
+
+#: mod/admin.php:2360
+msgid "Log settings updated."
+msgstr "Log instellingen opgeslagen"
+
+#: mod/admin.php:2393
+msgid "PHP log currently enabled."
+msgstr "PHP log momenteel geactiveerd"
+
+#: mod/admin.php:2395
+msgid "PHP log currently disabled."
+msgstr "PHP log momenteel gedeactiveerd"
+
+#: mod/admin.php:2404
+msgid "Clear"
+msgstr "Wis"
+
+#: mod/admin.php:2408
+msgid "Enable Debugging"
+msgstr "Activeer Debugging"
+
+#: mod/admin.php:2409
+msgid "Log file"
+msgstr "Logbestand"
+
+#: mod/admin.php:2409
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
+msgstr "De webserver moet hier kunnen schrijven. Relatief t.o.v. de hoogste folder binnen je Friendica-installatie."
+
+#: mod/admin.php:2410
+msgid "Log level"
+msgstr "Log niveau"
+
+#: mod/admin.php:2412
+msgid "PHP logging"
+msgstr "PHP logging"
+
+#: mod/admin.php:2413
+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 "
+"the 'error_log' line is relative to the friendica top-level directory and "
+"must be writeable by the web server. The option '1' for 'log_errors' and "
+"'display_errors' is to enable these options, set to '0' to disable them."
+msgstr "Om logging van PHP fouten en waarschuwingen te activeren, kan je het volgende toevoegen aan het begin van je index.php bestand van je installatie. De naam van het bestand die ingesteld is in de 'error_log' lijn is relatief tegenover de friendica top-level folder en de server moet erin kunnen schrijven. De optie '1' voor 'log_errors' en 'display_errors' activeert deze opties, configureer '0' om ze te deactiveren. "
+
+#: mod/admin.php:2444
+#, 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 "Fout bij het openen van log file <strong>%1$s</strong> .\\r\\n<br/>Kijk na of bestand %1$s bestaat en mag gelezen worden."
+
+#: mod/admin.php:2448
+#, 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 "Kon log file <strong>%1$s</strong> niet openen.\\r\\n<br/>Kijk na of bestand %1$s mag gelezen worden."
+
+#: mod/admin.php:2540
+#, php-format
+msgid "Lock feature %s"
+msgstr "Fixeer feature %s "
+
+#: mod/admin.php:2548
+msgid "Manage Additional Features"
+msgstr "Beheer Bijkomende Features"
+
+#: mod/openid.php:29
+msgid "OpenID protocol error. No ID returned."
+msgstr "OpenID protocol fout. Geen ID Gevonden."
+
+#: mod/openid.php:66
+msgid ""
+"Account not found and OpenID registration is not permitted on this site."
+msgstr "Account niet gevonden, en OpenID-registratie is niet toegelaten op deze website."
+
+#: mod/openid.php:116 src/Module/Login.php:85 src/Module/Login.php:134
+msgid "Login failed."
+msgstr "Login mislukt."
+
+#: mod/dfrn_request.php:94
+msgid "This introduction has already been accepted."
+msgstr "Verzoek is al goedgekeurd"
+
+#: mod/dfrn_request.php:112 mod/dfrn_request.php:353
+msgid "Profile location is not valid or does not contain profile information."
+msgstr "Profiel is ongeldig of bevat geen informatie"
+
+#: mod/dfrn_request.php:116 mod/dfrn_request.php:357
+msgid "Warning: profile location has no identifiable owner name."
+msgstr "Waarschuwing: de profiellocatie heeft geen identificeerbare eigenaar."
+
+#: mod/dfrn_request.php:119 mod/dfrn_request.php:360
+msgid "Warning: profile location has no profile photo."
+msgstr "Waarschuwing: Profieladres heeft geen profielfoto."
+
+#: mod/dfrn_request.php:123 mod/dfrn_request.php:364
+#, 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] "De %d vereiste parameter is niet op het gegeven adres gevonden"
+msgstr[1] "De %d vereiste parameters zijn niet op het gegeven adres gevonden"
+
+#: mod/dfrn_request.php:161
+msgid "Introduction complete."
+msgstr "Verzoek voltooid."
+
+#: mod/dfrn_request.php:197
+msgid "Unrecoverable protocol error."
+msgstr "Onherstelbare protocolfout. "
+
+#: mod/dfrn_request.php:224
+msgid "Profile unavailable."
+msgstr "Profiel onbeschikbaar"
+
+#: mod/dfrn_request.php:246
+#, php-format
+msgid "%s has received too many connection requests today."
+msgstr "%s heeft te veel verzoeken gehad vandaag."
+
+#: mod/dfrn_request.php:247
+msgid "Spam protection measures have been invoked."
+msgstr "Beveiligingsmaatregelen tegen spam zijn in werking getreden."
+
+#: mod/dfrn_request.php:248
+msgid "Friends are advised to please try again in 24 hours."
+msgstr "Wij adviseren vrienden om het over 24 uur nog een keer te proberen."
+
+#: mod/dfrn_request.php:274
+msgid "Invalid locator"
+msgstr "Ongeldige plaatsbepaler"
+
+#: mod/dfrn_request.php:310
+msgid "You have already introduced yourself here."
+msgstr "Je hebt jezelf hier al voorgesteld."
+
+#: mod/dfrn_request.php:313
+#, php-format
+msgid "Apparently you are already friends with %s."
+msgstr "Blijkbaar ben je al bevriend met %s."
+
+#: mod/dfrn_request.php:333
+msgid "Invalid profile URL."
+msgstr "Ongeldig profiel adres."
+
+#: mod/dfrn_request.php:339 src/Model/Contact.php:1577
+msgid "Disallowed profile URL."
+msgstr "Niet toegelaten profiel adres."
+
+#: mod/dfrn_request.php:412 mod/contacts.php:235
+msgid "Failed to update contact record."
+msgstr "Ik kon de contactgegevens niet aanpassen."
+
+#: mod/dfrn_request.php:432
+msgid "Your introduction has been sent."
+msgstr "Je verzoek is verzonden."
+
+#: mod/dfrn_request.php:470
+msgid ""
+"Remote subscription can't be done for your network. Please subscribe "
+"directly on your system."
+msgstr "Remote inschrijving kan niet op jouw netwerk. Gelieve direct op je systeem in te schrijven."
+
+#: mod/dfrn_request.php:486
+msgid "Please login to confirm introduction."
+msgstr "Log in om je verzoek te bevestigen."
+
+#: mod/dfrn_request.php:494
+msgid ""
+"Incorrect identity currently logged in. Please login to "
+"<strong>this</strong> profile."
+msgstr "Je huidige identiteit is niet de juiste. Log met <strong>dit</strong> profiel in."
+
+#: mod/dfrn_request.php:508 mod/dfrn_request.php:525
+msgid "Confirm"
+msgstr "Bevestig"
+
+#: mod/dfrn_request.php:520
+msgid "Hide this contact"
+msgstr "Verberg dit contact"
+
+#: mod/dfrn_request.php:523
+#, php-format
+msgid "Welcome home %s."
+msgstr "Welkom terug %s."
+
+#: mod/dfrn_request.php:524
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
+msgstr "Bevestig je vriendschaps-/connectieverzoek voor %s."
+
+#: mod/dfrn_request.php:634
+msgid ""
+"Please enter your 'Identity Address' from one of the following supported "
+"communications networks:"
+msgstr "Vul hier uw 'Identiteitsadres' in van een van de volgende ondersteunde communicatienetwerken:"
+
+#: mod/dfrn_request.php:637
+#, 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 "Als je nog geen lid bent van het vrije sociale web, <a href=\"%s\">volg dan deze link om een publieke Friendica site te vinden en vervoeg ons vandaag</a>"
+
+#: mod/dfrn_request.php:642
+msgid "Friend/Connection Request"
+msgstr "Vriendschaps-/connectieverzoek"
+
+#: mod/dfrn_request.php:643
+msgid ""
+"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
+"testuser@gnusocial.de"
+msgstr "Voorbeelden: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de"
+
+#: mod/dfrn_request.php:644 mod/follow.php:149
+msgid "Please answer the following:"
+msgstr "Beantwoord het volgende:"
+
+#: mod/dfrn_request.php:645 mod/follow.php:150
+#, php-format
+msgid "Does %s know you?"
+msgstr "Kent %s jou?"
+
+#: mod/dfrn_request.php:646 mod/follow.php:151
+msgid "Add a personal note:"
+msgstr "Voeg een persoonlijke opmerking toe:"
+
+#: mod/dfrn_request.php:648 src/Content/ContactSelector.php:78
+msgid "Friendica"
+msgstr "Friendica"
+
+#: mod/dfrn_request.php:649
+msgid "GNU Social (Pleroma, Mastodon)"
+msgstr "GNU Social (Pleroma, Mastodon)"
+
+#: mod/dfrn_request.php:650
+msgid "Diaspora (Socialhome, Hubzilla)"
+msgstr "Diaspora (Socialhome, Hubzilla)"
+
+#: mod/dfrn_request.php:651
+#, php-format
+msgid ""
+" - please do not use this form.  Instead, enter %s into your Diaspora search"
+" bar."
+msgstr "- Gebruik niet dit formulier. Vul %s in in je Diaspora zoekbalk."
+
+#: mod/api.php:85 mod/api.php:107
+msgid "Authorize application connection"
+msgstr "Verbinding met de applicatie goedkeuren"
+
+#: mod/api.php:86
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Keer terug naar jouw app en voeg deze beveiligingscode in:"
+
+#: mod/api.php:95
+msgid "Please login to continue."
+msgstr "Log in om verder te gaan."
+
+#: mod/api.php:109
+msgid ""
+"Do you want to authorize this application to access your posts and contacts,"
+" and/or create new posts for you?"
+msgstr "Wil je deze toepassing toestemming geven om jouw berichten en contacten in te kijken, en/of nieuwe berichten in jouw plaats aan te maken?"
+
+#: mod/profile_photo.php:55
+msgid "Image uploaded but image cropping failed."
+msgstr "Afbeelding opgeladen, maar bijsnijden mislukt."
+
+#: mod/profile_photo.php:87 mod/profile_photo.php:96 mod/profile_photo.php:105
+#: mod/profile_photo.php:313
+#, php-format
+msgid "Image size reduction [%s] failed."
+msgstr "Verkleining van de afbeelding [%s] mislukt."
+
+#: mod/profile_photo.php:124
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Shift-herlaad de pagina, of maak de browser cache leeg als nieuwe foto's niet onmiddellijk verschijnen."
+
+#: mod/profile_photo.php:132
+msgid "Unable to process image"
+msgstr "Ik kan de afbeelding niet verwerken"
+
+#: mod/profile_photo.php:244
+msgid "Upload File:"
+msgstr "Upload bestand:"
+
+#: mod/profile_photo.php:245
+msgid "Select a profile:"
+msgstr "Kies een profiel:"
+
+#: mod/profile_photo.php:247 mod/fbrowser.php:106 mod/fbrowser.php:137
+msgid "Upload"
+msgstr "Uploaden"
+
+#: mod/profile_photo.php:250
+msgid "or"
+msgstr "of"
+
+#: mod/profile_photo.php:251
+msgid "skip this step"
+msgstr "Deze stap overslaan"
+
+#: mod/profile_photo.php:251
+msgid "select a photo from your photo albums"
+msgstr "Kies een foto uit je fotoalbums"
+
+#: mod/profile_photo.php:264
+msgid "Crop Image"
+msgstr "Afbeelding bijsnijden"
+
+#: mod/profile_photo.php:265
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Pas het afsnijden van de afbeelding aan voor het beste resultaat."
+
+#: mod/profile_photo.php:267
+msgid "Done Editing"
+msgstr "Wijzigingen compleet"
+
+#: mod/profile_photo.php:303
+msgid "Image uploaded successfully."
+msgstr "Uploaden van afbeelding gelukt."
+
+#: mod/wall_attach.php:107
+msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
+msgstr "Sorry, je op te laden bestand is groter dan deze PHP configuratie toelaat"
+
+#: mod/wall_attach.php:107
+msgid "Or - did you try to upload an empty file?"
+msgstr "Of - probeerde je een lege file op te laden?"
+
+#: mod/wall_attach.php:118
+#, php-format
+msgid "File exceeds size limit of %s"
+msgstr "Bestand is groter dan de limiet ( %s )"
+
+#: mod/wall_attach.php:142 mod/wall_attach.php:158
+msgid "File upload failed."
+msgstr "Uploaden van bestand mislukt."
+
+#: mod/item.php:117
+msgid "Unable to locate original post."
+msgstr "Ik kan de originele post niet meer vinden."
+
+#: mod/item.php:285
+msgid "Empty post discarded."
+msgstr "Lege post weggegooid."
+
+#: mod/item.php:809
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendica social "
+"network."
+msgstr "Dit bericht werd naar jou gestuurd door %s, een lid van het Friendica sociale netwerk."
+
+#: mod/item.php:811
+#, php-format
+msgid "You may visit them online at %s"
+msgstr "Je kunt ze online bezoeken op %s"
+
+#: mod/item.php:812
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
+msgstr "Contacteer de afzender door op dit bericht te antwoorden als je deze berichten niet wilt ontvangen."
+
+#: mod/item.php:816
+#, php-format
+msgid "%s posted an update."
+msgstr "%s heeft een wijziging geplaatst."
+
+#: mod/help.php:49
+msgid "Help:"
+msgstr "Help:"
+
+#: mod/uimport.php:72
+msgid "Move account"
+msgstr "Account verplaatsen"
+
+#: mod/uimport.php:73
+msgid "You can import an account from another Friendica server."
+msgstr "Je kunt een account van een andere Friendica server importeren."
+
+#: mod/uimport.php:74
+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 "Je moet je account bij de oude server exporteren, en hier uploaden. We zullen je oude account hier opnieuw aanmaken, met al je contacten. We zullen ook proberen om je vrienden in te lichten dat je naar hier verhuisd bent."
+
+#: mod/uimport.php:75
+msgid ""
+"This feature is experimental. We can't import contacts from the OStatus "
+"network (GNU Social/Statusnet) or from Diaspora"
+msgstr "Dit feature is experimenteel. We kunnen contacten van het OStatus netwerk (GNU Social/Statusnet) of van Diaspora niet importeren."
+
+#: mod/uimport.php:76
+msgid "Account file"
+msgstr "Account bestand"
+
+#: mod/uimport.php:76
+msgid ""
+"To export your account, go to \"Settings->Export your personal data\" and "
+"select \"Export account\""
+msgstr "Om je account te exporteren, ga naar \"Instellingen->Exporteer je persoonlijke data\" en selecteer \"Exporteer account\""
+
+#: mod/profperm.php:35 mod/profperm.php:68
+msgid "Invalid profile identifier."
+msgstr "Ongeldige profiel-identificatie."
+
+#: mod/profperm.php:114
+msgid "Profile Visibility Editor"
+msgstr "Profiel Zichtbaarheid Editor"
+
+#: mod/profperm.php:127
+msgid "Visible To"
+msgstr "Zichtbaar voor"
+
+#: mod/profperm.php:143
+msgid "All Contacts (with secure profile access)"
+msgstr "Alle contacten (met veilige profieltoegang)"
+
+#: mod/cal.php:277 mod/events.php:391
+msgid "View"
+msgstr "Beeld"
+
+#: mod/cal.php:278 mod/events.php:393
+msgid "Previous"
+msgstr "Vorige"
+
+#: mod/cal.php:282 mod/events.php:399 src/Model/Event.php:421
+msgid "today"
+msgstr "vandaag"
+
+#: mod/cal.php:283 mod/events.php:400 src/Util/Temporal.php:304
+#: src/Model/Event.php:422
+msgid "month"
+msgstr "maand"
+
+#: mod/cal.php:284 mod/events.php:401 src/Util/Temporal.php:305
+#: src/Model/Event.php:423
+msgid "week"
+msgstr "week"
+
+#: mod/cal.php:285 mod/events.php:402 src/Util/Temporal.php:306
+#: src/Model/Event.php:424
+msgid "day"
+msgstr "dag"
+
+#: mod/cal.php:286 mod/events.php:403
+msgid "list"
+msgstr "lijst"
+
+#: mod/cal.php:299 src/Core/Console/NewPassword.php:68 src/Model/User.php:221
+msgid "User not found"
+msgstr "Gebruiker niet gevonden"
+
+#: mod/cal.php:315
+msgid "This calendar format is not supported"
+msgstr "Dit kalender formaat is niet ondersteund"
+
+#: mod/cal.php:317
+msgid "No exportable data found"
+msgstr "Geen exporteerbare data gevonden"
+
+#: mod/cal.php:334
+msgid "calendar"
+msgstr "kalender"
+
+#: mod/regmod.php:70
+msgid "Account approved."
+msgstr "Account goedgekeurd."
+
+#: mod/regmod.php:95
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registratie ingetrokken voor %s"
+
+#: mod/regmod.php:102
+msgid "Please login."
+msgstr "Inloggen."
+
+#: mod/editpost.php:26 mod/editpost.php:36
+msgid "Item not found"
+msgstr "Item niet gevonden"
+
+#: mod/editpost.php:43
+msgid "Edit post"
+msgstr "Bericht bewerken"
+
+#: mod/editpost.php:125 src/Core/ACL.php:304
+msgid "CC: email addresses"
+msgstr "CC: e-mailadressen"
+
+#: mod/editpost.php:132 src/Core/ACL.php:305
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Voorbeeld: bob@voorbeeld.nl, an@voorbeeld.be"
+
+#: mod/apps.php:19
+msgid "Applications"
+msgstr "Toepassingen"
+
+#: mod/apps.php:22
+msgid "No installed applications."
+msgstr "Geen toepassingen geïnstalleerd"
+
+#: mod/feedtest.php:21
+msgid "You must be logged in to use this module"
+msgstr "Je moet ingelogd zijn om deze module te gebruiken"
+
+#: mod/feedtest.php:49
+msgid "Source URL"
+msgstr "Bron URL"
+
+#: mod/fsuggest.php:72
+msgid "Friend suggestion sent."
+msgstr "Vriendschapsvoorstel verzonden."
+
+#: mod/fsuggest.php:101
+msgid "Suggest Friends"
+msgstr "Stel vrienden voor"
+
+#: mod/fsuggest.php:103
+#, php-format
+msgid "Suggest a friend for %s"
+msgstr "Stel een vriend voor aan %s"
+
+#: mod/maintenance.php:24
+msgid "System down for maintenance"
+msgstr "Systeem onbeschikbaar wegens onderhoud"
+
+#: mod/profile.php:38 src/Model/Profile.php:115
+msgid "Requested profile is not available."
+msgstr "Gevraagde profiel is niet beschikbaar."
+
+#: mod/profile.php:79 mod/profile.php:82 src/Protocol/OStatus.php:1275
+#, php-format
+msgid "%s's timeline"
+msgstr "Tijdslijn van %s"
+
+#: mod/profile.php:80 src/Protocol/OStatus.php:1276
+#, php-format
+msgid "%s's posts"
+msgstr "Berichten van %s"
+
+#: mod/profile.php:81 src/Protocol/OStatus.php:1277
+#, php-format
+msgid "%s's comments"
+msgstr "reactie van %s"
+
+#: mod/allfriends.php:53
+msgid "No friends to display."
+msgstr "Geen vrienden om te laten zien."
+
+#: mod/contacts.php:162
+#, php-format
+msgid "%d contact edited."
+msgid_plural "%d contacts edited."
+msgstr[0] "%d contact bewerkt."
+msgstr[1] "%d contacten bewerkt."
+
+#: mod/contacts.php:189 mod/contacts.php:395
+msgid "Could not access contact record."
+msgstr "Kon geen toegang krijgen tot de contactgegevens"
+
+#: mod/contacts.php:199
+msgid "Could not locate selected profile."
+msgstr "Kon het geselecteerde profiel niet vinden."
+
+#: mod/contacts.php:233
+msgid "Contact updated."
+msgstr "Contact opgeslagen"
+
+#: mod/contacts.php:416
+msgid "Contact has been blocked"
+msgstr "Contact is geblokkeerd"
+
+#: mod/contacts.php:416
+msgid "Contact has been unblocked"
+msgstr "Contact is gedeblokkeerd"
+
+#: mod/contacts.php:426
+msgid "Contact has been ignored"
+msgstr "Contact wordt genegeerd"
+
+#: mod/contacts.php:426
+msgid "Contact has been unignored"
+msgstr "Contact wordt niet meer genegeerd"
+
+#: mod/contacts.php:436
+msgid "Contact has been archived"
+msgstr "Contact is gearchiveerd"
+
+#: mod/contacts.php:436
+msgid "Contact has been unarchived"
+msgstr "Contact is niet meer gearchiveerd"
+
+#: mod/contacts.php:460
+msgid "Drop contact"
+msgstr "Contact vergeten"
+
+#: mod/contacts.php:463 mod/contacts.php:845
+msgid "Do you really want to delete this contact?"
+msgstr "Wil je echt dit contact verwijderen?"
+
+#: mod/contacts.php:481
+msgid "Contact has been removed."
+msgstr "Contact is verwijderd."
+
+#: mod/contacts.php:518
+#, php-format
+msgid "You are mutual friends with %s"
+msgstr "Je bent wederzijds bevriend met %s"
+
+#: mod/contacts.php:523
+#, php-format
+msgid "You are sharing with %s"
+msgstr "Je deelt met %s"
+
+#: mod/contacts.php:528
+#, php-format
+msgid "%s is sharing with you"
+msgstr "%s deelt met jou"
+
+#: mod/contacts.php:552
+msgid "Private communications are not available for this contact."
+msgstr "Privécommunicatie met dit contact is niet beschikbaar."
+
+#: mod/contacts.php:554
+msgid "Never"
+msgstr "Nooit"
+
+#: mod/contacts.php:557
+msgid "(Update was successful)"
+msgstr "(Wijziging is geslaagd)"
+
+#: mod/contacts.php:557
+msgid "(Update was not successful)"
+msgstr "(Wijziging is niet geslaagd)"
+
+#: mod/contacts.php:559 mod/contacts.php:1086
+msgid "Suggest friends"
+msgstr "Stel vrienden voor"
+
+#: mod/contacts.php:563
+#, php-format
+msgid "Network type: %s"
+msgstr "Netwerk type: %s"
+
+#: mod/contacts.php:568
+msgid "Communications lost with this contact!"
+msgstr "Communicatie met dit contact is verbroken!"
+
+#: mod/contacts.php:574
+msgid "Fetch further information for feeds"
+msgstr "Haal meer informatie op van de feeds"
+
+#: mod/contacts.php:576
+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 "Haal informatie op zoals preview beelden, titel en teaser van het feed item. Je kan dit activeren als de feed niet veel tekst bevat. Sleutelwoorden worden opgepikt uit de meta header in het feed item en worden gepost als hash tags."
+
+#: mod/contacts.php:578
+msgid "Fetch information"
+msgstr "Haal informatie op"
+
+#: mod/contacts.php:579
+msgid "Fetch keywords"
+msgstr "Haal sleutelwoorden op"
+
+#: mod/contacts.php:580
+msgid "Fetch information and keywords"
+msgstr "Haal informatie en sleutelwoorden op"
+
+#: mod/contacts.php:617
+msgid "Profile Visibility"
+msgstr "Zichtbaarheid profiel"
+
+#: mod/contacts.php:618
+msgid "Contact Information / Notes"
+msgstr "Contactinformatie / aantekeningen"
+
+#: mod/contacts.php:619
+msgid "Contact Settings"
+msgstr "Contact instellingen"
+
+#: mod/contacts.php:628
+msgid "Contact"
+msgstr "Contact"
+
+#: mod/contacts.php:632
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Kies het profiel dat getoond moet worden wanneer %s je profiel bezoekt. "
+
+#: mod/contacts.php:634
+msgid "Their personal note"
+msgstr "Hun persoonlijke nota"
+
+#: mod/contacts.php:636
+msgid "Edit contact notes"
+msgstr "Wijzig aantekeningen over dit contact"
+
+#: mod/contacts.php:640
+msgid "Block/Unblock contact"
+msgstr "Blokkeer/deblokkeer contact"
+
+#: mod/contacts.php:641
+msgid "Ignore contact"
+msgstr "Negeer contact"
+
+#: mod/contacts.php:642
+msgid "Repair URL settings"
+msgstr "Repareer URL-instellingen"
+
+#: mod/contacts.php:643
+msgid "View conversations"
+msgstr "Toon gesprekken"
+
+#: mod/contacts.php:648
+msgid "Last update:"
+msgstr "Laatste wijziging:"
+
+#: mod/contacts.php:650
+msgid "Update public posts"
+msgstr "Openbare posts aanpassen"
+
+#: mod/contacts.php:652 mod/contacts.php:1096
+msgid "Update now"
+msgstr "Wijzig nu"
+
+#: mod/contacts.php:658 mod/contacts.php:850 mod/contacts.php:1113
+msgid "Unignore"
+msgstr "Negeer niet meer"
+
+#: mod/contacts.php:662
+msgid "Currently blocked"
+msgstr "Op dit moment geblokkeerd"
+
+#: mod/contacts.php:663
+msgid "Currently ignored"
+msgstr "Op dit moment genegeerd"
+
+#: mod/contacts.php:664
+msgid "Currently archived"
+msgstr "Op dit moment gearchiveerd"
+
+#: mod/contacts.php:665
+msgid "Awaiting connection acknowledge"
+msgstr "Wait op bevestiging van de connectie"
+
+#: mod/contacts.php:666
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
+msgstr "Antwoorden of 'vind ik leuk's op je openbare posts <strong>kunnen</strong> nog zichtbaar zijn"
+
+#: mod/contacts.php:667
+msgid "Notification for new posts"
+msgstr "Meldingen voor nieuwe berichten"
+
+#: mod/contacts.php:667
+msgid "Send a notification of every new post of this contact"
+msgstr "Stuur een notificatie voor elk bericht van dit contact"
+
+#: mod/contacts.php:670
+msgid "Blacklisted keywords"
+msgstr "Sleutelwoorden op de zwarte lijst"
+
+#: mod/contacts.php:670
+msgid ""
+"Comma separated list of keywords that should not be converted to hashtags, "
+"when \"Fetch information and keywords\" is selected"
+msgstr "Door komma's gescheiden lijst van sleutelwoorden die niet in hashtags mogen omgezet worden, wanneer \"Haal informatie en sleutelwoorden op\" is geselecteerd"
+
+#: mod/contacts.php:682 src/Model/Profile.php:424
+msgid "XMPP:"
+msgstr "XMPP:"
+
+#: mod/contacts.php:687
+msgid "Actions"
+msgstr "Acties"
+
+#: mod/contacts.php:731
+msgid "Suggestions"
+msgstr "Voorstellen"
+
+#: mod/contacts.php:734
+msgid "Suggest potential friends"
+msgstr "Stel vrienden voor"
+
+#: mod/contacts.php:742
+msgid "Show all contacts"
+msgstr "Toon alle contacten"
+
+#: mod/contacts.php:747
+msgid "Unblocked"
+msgstr "Niet geblokkeerd"
+
+#: mod/contacts.php:750
+msgid "Only show unblocked contacts"
+msgstr "Toon alleen niet-geblokkeerde contacten"
+
+#: mod/contacts.php:755
+msgid "Blocked"
+msgstr "Geblokkeerd"
+
+#: mod/contacts.php:758
+msgid "Only show blocked contacts"
+msgstr "Toon alleen geblokkeerde contacten"
+
+#: mod/contacts.php:763
+msgid "Ignored"
+msgstr "Genegeerd"
+
+#: mod/contacts.php:766
+msgid "Only show ignored contacts"
+msgstr "Toon alleen genegeerde contacten"
+
+#: mod/contacts.php:771
+msgid "Archived"
+msgstr "Gearchiveerd"
+
+#: mod/contacts.php:774
+msgid "Only show archived contacts"
+msgstr "Toon alleen gearchiveerde contacten"
+
+#: mod/contacts.php:779
+msgid "Hidden"
+msgstr "Verborgen"
+
+#: mod/contacts.php:782
+msgid "Only show hidden contacts"
+msgstr "Toon alleen verborgen contacten"
+
+#: mod/contacts.php:840
+msgid "Search your contacts"
+msgstr "Doorzoek je contacten"
+
+#: mod/contacts.php:851 mod/contacts.php:1122
+msgid "Archive"
+msgstr "Archiveer"
+
+#: mod/contacts.php:851 mod/contacts.php:1122
+msgid "Unarchive"
+msgstr "Archiveer niet meer"
+
+#: mod/contacts.php:854
+msgid "Batch Actions"
+msgstr "Bulk Acties"
+
+#: mod/contacts.php:880
+msgid "Conversations started by this contact"
+msgstr "Gesprekken gestart door dit contact"
+
+#: mod/contacts.php:885
+msgid "Posts and Comments"
+msgstr "Berichten en reacties"
+
+#: mod/contacts.php:896 src/Model/Profile.php:886
+msgid "Profile Details"
+msgstr "Profieldetails"
+
+#: mod/contacts.php:908
+msgid "View all contacts"
+msgstr "Alle contacten zien"
+
+#: mod/contacts.php:919
+msgid "View all common friends"
+msgstr "Bekijk alle gemeenschappelijke vrienden"
+
+#: mod/contacts.php:929
+msgid "Advanced Contact Settings"
+msgstr "Geavanceerde instellingen voor contacten"
+
+#: mod/contacts.php:1019
+msgid "Mutual Friendship"
+msgstr "Wederzijdse vriendschap"
+
+#: mod/contacts.php:1024
+msgid "is a fan of yours"
+msgstr "Is een fan van jou"
+
+#: mod/contacts.php:1029
+msgid "you are a fan of"
+msgstr "Jij bent een fan van"
+
+#: mod/contacts.php:1046 mod/photos.php:1494 mod/photos.php:1533
+#: mod/photos.php:1593 src/Object/Post.php:792
+msgid "This is you"
+msgstr "Dit ben jij"
+
+#: mod/contacts.php:1053
+msgid "Edit contact"
+msgstr "Contact bewerken"
+
+#: mod/contacts.php:1107
+msgid "Toggle Blocked status"
+msgstr "Schakel geblokkeerde status"
+
+#: mod/contacts.php:1115
+msgid "Toggle Ignored status"
+msgstr "Schakel negeerstatus"
+
+#: mod/contacts.php:1124
+msgid "Toggle Archive status"
+msgstr "Schakel archiveringsstatus"
+
+#: mod/contacts.php:1132
+msgid "Delete contact"
+msgstr "Verwijder contact"
+
+#: mod/events.php:103 mod/events.php:105
+msgid "Event can not end before it has started."
+msgstr "Gebeurtenis kan niet eindigen voor het begin."
+
+#: mod/events.php:112 mod/events.php:114
+msgid "Event title and start time are required."
+msgstr "Titel en begintijd van de gebeurtenis zijn vereist."
+
+#: mod/events.php:392
+msgid "Create New Event"
+msgstr "Maak een nieuwe gebeurtenis"
+
+#: mod/events.php:509
+msgid "Event details"
+msgstr "Gebeurtenis details"
+
+#: mod/events.php:510
+msgid "Starting date and Title are required."
+msgstr "Start datum en Titel zijn verplicht."
+
+#: mod/events.php:511 mod/events.php:512
+msgid "Event Starts:"
+msgstr "Gebeurtenis begint:"
+
+#: mod/events.php:511 mod/events.php:523 mod/profiles.php:607
+msgid "Required"
+msgstr "Vereist"
+
+#: mod/events.php:513 mod/events.php:529
+msgid "Finish date/time is not known or not relevant"
+msgstr "Einddatum/tijd is niet gekend of niet relevant"
+
+#: mod/events.php:515 mod/events.php:516
+msgid "Event Finishes:"
+msgstr "Gebeurtenis eindigt:"
+
+#: mod/events.php:517 mod/events.php:530
+msgid "Adjust for viewer timezone"
+msgstr "Pas aan aan de tijdzone van de gebruiker"
+
+#: mod/events.php:519
+msgid "Description:"
+msgstr "Beschrijving:"
+
+#: mod/events.php:523 mod/events.php:525
+msgid "Title:"
+msgstr "Titel:"
+
+#: mod/events.php:526 mod/events.php:527
+msgid "Share this event"
+msgstr "Deel deze gebeurtenis"
+
+#: mod/events.php:534 src/Model/Profile.php:851
+msgid "Basic"
+msgstr "Basis"
+
+#: mod/events.php:536 mod/photos.php:1112 mod/photos.php:1448
+#: src/Core/ACL.php:307
+msgid "Permissions"
+msgstr "Rechten"
+
+#: mod/events.php:555
+msgid "Failed to remove event"
+msgstr "Kon remote event niet verwijderen"
+
+#: mod/events.php:557
+msgid "Event removed"
+msgstr "Gebeurtenis verwijderd"
+
+#: mod/follow.php:45
+msgid "The contact could not be added."
+msgstr "Het contact kon niet toegevoegd worden."
+
+#: mod/follow.php:73
+msgid "You already added this contact."
+msgstr "Je hebt deze kontakt al toegevoegd"
+
+#: mod/follow.php:83
+msgid "Diaspora support isn't enabled. Contact can't be added."
+msgstr "Diaspora ondersteuning is niet geactiveerd. Contact kan niet toegevoegd worden."
+
+#: mod/follow.php:90
+msgid "OStatus support is disabled. Contact can't be added."
+msgstr "OStatus ondersteuning is niet geactiveerd. Contact kan niet toegevoegd woren."
+
+#: mod/follow.php:97
+msgid "The network type couldn't be detected. Contact can't be added."
+msgstr "Het type netwerk kon niet gedetecteerd worden. Contact kan niet toegevoegd worden."
+
+#: mod/fbrowser.php:44 mod/fbrowser.php:69 mod/photos.php:198
+#: mod/photos.php:1076 mod/photos.php:1169 mod/photos.php:1186
+#: mod/photos.php:1652 mod/photos.php:1667 src/Model/Photo.php:243
+#: src/Model/Photo.php:252
+msgid "Contact Photos"
+msgstr "Contactfoto's"
+
+#: mod/fbrowser.php:132
+msgid "Files"
+msgstr "Bestanden"
+
+#: mod/oexchange.php:30
+msgid "Post successful."
+msgstr "Bericht succesvol geplaatst."
+
+#: mod/subthread.php:103
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s volgt %3$s van %2$s"
+
+#: mod/credits.php:18
+msgid "Credits"
+msgstr "Credits"
+
+#: 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 "Friendica is een gemeenschapsproject dat niet mogelijk zou zijn zonder de hulp van vele mensen.  Hier is een lijst van alle mensen die aan de code of vertalingen van Friendica hebben meegewerkt.  Allen van harte bedankt!"
+
+#: mod/attach.php:16
+msgid "Item not available."
+msgstr "Item niet beschikbaar"
+
+#: mod/attach.php:26
+msgid "Item was not found."
+msgstr "Item niet gevonden"
+
+#: mod/notify.php:77
+msgid "No more system notifications."
+msgstr "Geen systeemnotificaties meer."
+
+#: mod/community.php:71
+msgid "Community option not available."
+msgstr "Groepsoptie niet beschikbaar"
+
+#: mod/community.php:88
+msgid "Not available."
+msgstr "Niet beschikbaar"
+
+#: mod/community.php:101
+msgid "Local Community"
+msgstr "Lokale Groep"
+
+#: mod/community.php:104
+msgid "Posts from local users on this server"
+msgstr "Berichten van lokale gebruikers op deze server"
+
+#: mod/community.php:112
+msgid "Global Community"
+msgstr "Globale gemeenschap"
+
+#: mod/community.php:115
+msgid "Posts from users of the whole federated network"
+msgstr "Berichten van gebruikers van het hele gefedereerde netwerk"
+
+#: mod/community.php:205
+msgid ""
+"This community stream shows all public posts received by this node. They may"
+" not reflect the opinions of this node’s users."
+msgstr "Deze groepsstroom toont alle publieke berichten die deze node ontvangen heeft. Ze kunnen mogelijks niet de mening van de gebruikers van deze node weerspiegelen."
+
+#: mod/localtime.php:19 src/Model/Event.php:34 src/Model/Event.php:829
+msgid "l F d, Y \\@ g:i A"
+msgstr "l F d, Y \\@ g:i A"
+
+#: mod/localtime.php:33
+msgid "Time Conversion"
+msgstr "Tijdsconversie"
+
+#: mod/localtime.php:35
+msgid ""
+"Friendica provides this service for sharing events with other networks and "
+"friends in unknown timezones."
+msgstr "Friendica biedt deze dienst aan om gebeurtenissen te delen met andere netwerken en vrienden in onbekende tijdzones."
+
+#: mod/localtime.php:39
+#, php-format
+msgid "UTC time: %s"
+msgstr "UTC tijd: %s"
+
+#: mod/localtime.php:42
+#, php-format
+msgid "Current timezone: %s"
+msgstr "Huidige Tijdzone: %s"
+
+#: mod/localtime.php:46
+#, php-format
+msgid "Converted localtime: %s"
+msgstr "Omgerekende lokale tijd: %s"
+
+#: mod/localtime.php:52
+msgid "Please select your timezone:"
+msgstr "Selecteer je tijdzone:"
+
+#: mod/poke.php:188
+msgid "Poke/Prod"
+msgstr "Aanstoten/porren"
+
+#: mod/poke.php:189
+msgid "poke, prod or do other things to somebody"
+msgstr "aanstoten, porren of andere dingen met iemand doen"
+
+#: mod/poke.php:190
+msgid "Recipient"
+msgstr "Ontvanger"
+
+#: mod/poke.php:191
+msgid "Choose what you wish to do to recipient"
+msgstr "Kies wat je met de ontvanger wil doen"
+
+#: mod/poke.php:194
+msgid "Make this post private"
+msgstr "Dit bericht privé maken"
+
+#: mod/invite.php:34
+msgid "Total invitation limit exceeded."
+msgstr "Totale uitnodigingslimiet overschreden."
+
+#: mod/invite.php:56
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s: Geen geldig e-mailadres."
+
+#: mod/invite.php:88
+msgid "Please join us on Friendica"
+msgstr "Kom bij ons op Friendica"
+
+#: mod/invite.php:97
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Uitnodigingslimiet overschreden. Neem contact op met de beheerder van je website."
+
+#: mod/invite.php:101
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s : Aflevering van bericht mislukt."
+
+#: mod/invite.php:105
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d bericht verzonden."
+msgstr[1] "%d berichten verzonden."
+
+#: mod/invite.php:123
+msgid "You have no more invitations available"
+msgstr "Je kunt geen uitnodigingen meer sturen"
+
+#: mod/invite.php:131
+#, php-format
+msgid ""
+"Visit %s for a list of public sites that you can join. Friendica members on "
+"other sites can all connect with each other, as well as with members of many"
+" other social networks."
+msgstr "Bezoek %s voor een lijst van openbare sites waar je je kunt aansluiten. Friendica leden op andere sites kunnen allemaal met elkaar verbonden worden, en ook met leden van verschillende andere sociale netwerken."
+
+#: mod/invite.php:133
+#, php-format
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
+msgstr "Om deze uitnodiging te accepteren kan je je op %s registreren of op een andere vrij toegankelijke Friendica-website."
+
+#: mod/invite.php:134
+#, php-format
+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. See %s for a list of alternate Friendica "
+"sites you can join."
+msgstr "Friendica servers zijn allemaal onderling verbonden om een reusachtig sociaal web te maken met verbeterde privacy, dat eigendom is van en gecontroleerd door zijn leden. Ze kunnen ook verbindingen maken met verschillende traditionele sociale netwerken. Bekijk %s voor een lijst van alternatieve Friendica servers waar je aan kunt sluiten."
+
+#: mod/invite.php:138
+msgid ""
+"Our apologies. This system is not currently configured to connect with other"
+" public sites or invite members."
+msgstr "Onze verontschuldigingen. Dit systeem is momenteel niet ingesteld om verbinding te maken met andere openbare plaatsen of leden uit te nodigen."
+
+#: mod/invite.php:142
+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 "Friendica servers zijn allemaal onderling verbonden om een reusachtig sociaal web te maken met verbeterde privacy, dat eigendom is van en gecontroleerd door zijn leden. Ze kunnen ook verbindingen maken met verschillende traditionele sociale netwerken."
+
+#: mod/invite.php:141
+#, php-format
+msgid "To accept this invitation, please visit and register at %s."
+msgstr "Om deze uitnodiging te accepteren, ga naar en registreer op %s."
+
+#: mod/invite.php:148
+msgid "Send invitations"
+msgstr "Verstuur uitnodigingen"
+
+#: mod/invite.php:149
+msgid "Enter email addresses, one per line:"
+msgstr "Vul e-mailadressen in, één per lijn:"
+
+#: mod/invite.php:150
+msgid ""
+"You are cordially invited to join me and other close friends on Friendica - "
+"and help us to create a better social web."
+msgstr "Ik nodig je vriendelijk uit om bij mij en andere vrienden te komen op Friendica - en ons te helpen om een beter sociaal web te bouwen."
+
+#: mod/invite.php:152
+msgid "You will need to supply this invitation code: $invite_code"
+msgstr "Je zult deze uitnodigingscode moeten invullen: $invite_code"
+
+#: mod/invite.php:152
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
+msgstr "Eens je geregistreerd bent kun je contact leggen met mij via mijn profielpagina op:"
+
+#: mod/invite.php:154
+msgid ""
+"For more information about the Friendica project and why we feel it is "
+"important, please visit http://friendi.ca"
+msgstr "Voor meer informatie over het Friendica project en waarom wij denken dat het belangrijk is kun je http://friendi.ca/ bezoeken"
+
+#: mod/notes.php:42 src/Model/Profile.php:933
+msgid "Personal Notes"
+msgstr "Persoonlijke Nota's"
+
+#: mod/profiles.php:57
+msgid "Profile deleted."
+msgstr "Profiel verwijderd"
+
+#: mod/profiles.php:73 mod/profiles.php:109
+msgid "Profile-"
+msgstr "Profiel-"
+
+#: mod/profiles.php:92 mod/profiles.php:131
+msgid "New profile created."
+msgstr "Nieuw profiel aangemaakt."
+
+#: mod/profiles.php:115
+msgid "Profile unavailable to clone."
+msgstr "Profiel niet beschikbaar om te klonen."
+
+#: mod/profiles.php:203
+msgid "Profile Name is required."
+msgstr "Profielnaam is vereist."
+
+#: mod/profiles.php:344
+msgid "Marital Status"
+msgstr "Echtelijke staat"
+
+#: mod/profiles.php:348
+msgid "Romantic Partner"
+msgstr "Romantische Partner"
+
+#: mod/profiles.php:360
+msgid "Work/Employment"
+msgstr "Werk"
+
+#: mod/profiles.php:363
+msgid "Religion"
+msgstr "Godsdienst"
+
+#: mod/profiles.php:367
+msgid "Political Views"
+msgstr "Politieke standpunten"
+
+#: mod/profiles.php:371
+msgid "Gender"
+msgstr "Geslacht"
+
+#: mod/profiles.php:375
+msgid "Sexual Preference"
+msgstr "Seksuele Voorkeur"
+
+#: mod/profiles.php:379
+msgid "XMPP"
+msgstr "XMPP"
+
+#: mod/profiles.php:383
+msgid "Homepage"
+msgstr "Tijdlijn"
+
+#: mod/profiles.php:387 mod/profiles.php:593
+msgid "Interests"
+msgstr "Interesses"
+
+#: mod/profiles.php:398 mod/profiles.php:589
+msgid "Location"
+msgstr "Plaats"
+
+#: mod/profiles.php:481
+msgid "Profile updated."
+msgstr "Profiel opgeslagen"
+
+#: mod/profiles.php:538
+msgid "Hide contacts and friends:"
+msgstr "Verberg contacten en vrienden:"
+
+#: mod/profiles.php:543
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr "Je vrienden/contacten verbergen voor bezoekers van dit profiel?"
+
+#: mod/profiles.php:563
+msgid "Show more profile fields:"
+msgstr "Toon meer profiel velden:"
+
+#: mod/profiles.php:575
+msgid "Profile Actions"
+msgstr "Profiel Acties"
+
+#: mod/profiles.php:576
+msgid "Edit Profile Details"
+msgstr "Profieldetails bewerken"
+
+#: mod/profiles.php:578
+msgid "Change Profile Photo"
+msgstr "Profielfoto wijzigen"
+
+#: mod/profiles.php:580
+msgid "View this profile"
+msgstr "Dit profiel bekijken"
+
+#: mod/profiles.php:581
+msgid "View all profiles"
+msgstr "Toon alle profielen"
+
+#: mod/profiles.php:582 mod/profiles.php:677 src/Model/Profile.php:393
+msgid "Edit visibility"
+msgstr "Pas zichtbaarheid aan"
+
+#: mod/profiles.php:583
+msgid "Create a new profile using these settings"
+msgstr "Nieuw profiel aanmaken met deze instellingen"
+
+#: mod/profiles.php:584
+msgid "Clone this profile"
+msgstr "Dit profiel klonen"
+
+#: mod/profiles.php:585
+msgid "Delete this profile"
+msgstr "Dit profiel verwijderen"
+
+#: mod/profiles.php:587
+msgid "Basic information"
+msgstr "Basis informatie"
+
+#: mod/profiles.php:588
+msgid "Profile picture"
+msgstr "Profiel foto"
+
+#: mod/profiles.php:590
+msgid "Preferences"
+msgstr "Voorkeuren"
+
+#: mod/profiles.php:591
+msgid "Status information"
+msgstr "Status informatie"
+
+#: mod/profiles.php:592
+msgid "Additional information"
+msgstr "Bijkomende informatie"
+
+#: mod/profiles.php:595
+msgid "Relation"
+msgstr "Relatie"
+
+#: mod/profiles.php:596 src/Util/Temporal.php:81 src/Util/Temporal.php:83
+msgid "Miscellaneous"
+msgstr "Diversen"
+
+#: mod/profiles.php:599
+msgid "Your Gender:"
+msgstr "Je Geslacht:"
+
+#: mod/profiles.php:600
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+msgstr "<span class=\"heart\">&hearts;</span> Echtelijke Staat:"
+
+#: mod/profiles.php:601 src/Model/Profile.php:769
+msgid "Sexual Preference:"
+msgstr "Seksuele Voorkeur:"
+
+#: mod/profiles.php:602
+msgid "Example: fishing photography software"
+msgstr "Voorbeeld: vissen fotografie software"
+
+#: mod/profiles.php:607
+msgid "Profile Name:"
+msgstr "Profiel Naam:"
+
+#: mod/profiles.php:609
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
+msgstr "Dit is jouw <strong>publiek</strong> profiel.<br />Het <strong>kan</strong> zichtbaar zijn voor iedereen op het internet."
+
+#: mod/profiles.php:610
+msgid "Your Full Name:"
+msgstr "Je volledige naam:"
+
+#: mod/profiles.php:611
+msgid "Title/Description:"
+msgstr "Titel/Beschrijving:"
+
+#: mod/profiles.php:614
+msgid "Street Address:"
+msgstr "Postadres:"
+
+#: mod/profiles.php:615
+msgid "Locality/City:"
+msgstr "Gemeente/Stad:"
+
+#: mod/profiles.php:616
+msgid "Region/State:"
+msgstr "Regio/Staat:"
+
+#: mod/profiles.php:617
+msgid "Postal/Zip Code:"
+msgstr "Postcode:"
+
+#: mod/profiles.php:618
+msgid "Country:"
+msgstr "Land:"
+
+#: mod/profiles.php:619 src/Util/Temporal.php:149
+msgid "Age: "
+msgstr "Leeftijd:"
+
+#: mod/profiles.php:622
+msgid "Who: (if applicable)"
+msgstr "Wie: (indien toepasbaar)"
+
+#: mod/profiles.php:622
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Voorbeelden: Kathleen123, Kathleen Peeters, kathleen@voorbeeld.nl"
+
+#: mod/profiles.php:623
+msgid "Since [date]:"
+msgstr "Sinds [datum]:"
+
+#: mod/profiles.php:625
+msgid "Tell us about yourself..."
+msgstr "Vertel iets over jezelf..."
+
+#: mod/profiles.php:626
+msgid "XMPP (Jabber) address:"
+msgstr "XMPP (Jabber) adres:"
+
+#: mod/profiles.php:626
+msgid ""
+"The XMPP address will be propagated to your contacts so that they can follow"
+" you."
+msgstr "Het XMPP adres zal doorgegeven worden aan je contacten zodat zij je kunnen volgen."
+
+#: mod/profiles.php:627
+msgid "Homepage URL:"
+msgstr "Adres tijdlijn:"
+
+#: mod/profiles.php:628 src/Model/Profile.php:777
+msgid "Hometown:"
+msgstr "Woonplaats:"
+
+#: mod/profiles.php:629 src/Model/Profile.php:785
+msgid "Political Views:"
+msgstr "Politieke standpunten:"
+
+#: mod/profiles.php:630
+msgid "Religious Views:"
+msgstr "Geloof:"
+
+#: mod/profiles.php:631
+msgid "Public Keywords:"
+msgstr "Publieke Sleutelwoorden:"
+
+#: mod/profiles.php:631
+msgid "(Used for suggesting potential friends, can be seen by others)"
+msgstr "(Gebruikt om mogelijke vrienden voor te stellen, kan door anderen gezien worden)"
+
+#: mod/profiles.php:632
+msgid "Private Keywords:"
+msgstr "Privé Sleutelwoorden:"
+
+#: mod/profiles.php:632
+msgid "(Used for searching profiles, never shown to others)"
+msgstr "(Gebruikt om profielen te zoeken, nooit aan anderen getoond)"
+
+#: mod/profiles.php:633 src/Model/Profile.php:801
+msgid "Likes:"
+msgstr "Houdt van:"
+
+#: mod/profiles.php:634 src/Model/Profile.php:805
+msgid "Dislikes:"
+msgstr "Houdt niet van:"
+
+#: mod/profiles.php:635
+msgid "Musical interests"
+msgstr "Muzikale interesses"
+
+#: mod/profiles.php:636
+msgid "Books, literature"
+msgstr "Boeken, literatuur"
+
+#: mod/profiles.php:637
+msgid "Television"
+msgstr "Televisie"
+
+#: mod/profiles.php:638
+msgid "Film/dance/culture/entertainment"
+msgstr "Film/dans/cultuur/ontspanning"
+
+#: mod/profiles.php:639
+msgid "Hobbies/Interests"
+msgstr "Hobby's/Interesses"
+
+#: mod/profiles.php:640
+msgid "Love/romance"
+msgstr "Liefde/romance"
+
+#: mod/profiles.php:641
+msgid "Work/employment"
+msgstr "Werk"
+
+#: mod/profiles.php:642
+msgid "School/education"
+msgstr "School/opleiding"
+
+#: mod/profiles.php:643
+msgid "Contact information and Social Networks"
+msgstr "Contactinformatie en sociale netwerken"
+
+#: mod/profiles.php:674 src/Model/Profile.php:389
+msgid "Profile Image"
+msgstr "Profiel afbeelding"
+
+#: mod/profiles.php:676 src/Model/Profile.php:392
+msgid "visible to everybody"
+msgstr "zichtbaar voor iedereen"
+
+#: mod/profiles.php:683
+msgid "Edit/Manage Profiles"
+msgstr "Wijzig/Beheer Profielen"
+
+#: mod/profiles.php:684 src/Model/Profile.php:379 src/Model/Profile.php:401
+msgid "Change profile photo"
+msgstr "Profiel foto wijzigen"
+
+#: mod/profiles.php:685 src/Model/Profile.php:380
+msgid "Create New Profile"
+msgstr "Maak nieuw profiel"
+
+#: mod/photos.php:112 src/Model/Profile.php:894
+msgid "Photo Albums"
+msgstr "Fotoalbums"
+
+#: mod/photos.php:113 mod/photos.php:1708
+msgid "Recent Photos"
+msgstr "Recente foto's"
+
+#: mod/photos.php:116 mod/photos.php:1230 mod/photos.php:1710
+msgid "Upload New Photos"
+msgstr "Nieuwe foto's uploaden"
+
+#: mod/photos.php:190
+msgid "Contact information unavailable"
+msgstr "Contactinformatie niet beschikbaar"
+
+#: mod/photos.php:209
+msgid "Album not found."
+msgstr "Album niet gevonden"
+
+#: mod/photos.php:239 mod/photos.php:252 mod/photos.php:1181
+msgid "Delete Album"
+msgstr "Verwijder album"
+
+#: mod/photos.php:250
+msgid "Do you really want to delete this photo album and all its photos?"
+msgstr "Wil je echt dit fotoalbum en alle foto's erin verwijderen?"
+
+#: mod/photos.php:312 mod/photos.php:324 mod/photos.php:1453
+msgid "Delete Photo"
+msgstr "Verwijder foto"
+
+#: mod/photos.php:322
+msgid "Do you really want to delete this photo?"
+msgstr "Wil je echt deze foto verwijderen?"
+
+#: mod/photos.php:679
+msgid "a photo"
+msgstr "een foto"
+
+#: mod/photos.php:679
+#, php-format
+msgid "%1$s was tagged in %2$s by %3$s"
+msgstr "%1$s is gelabeld in %2$s door %3$s"
+
+#: mod/photos.php:782
+msgid "Image upload didn't complete, please try again"
+msgstr "Opladen van het beeld is niet compleet, probeer het opnieuw"
+
+#: mod/photos.php:785
+msgid "Image file is missing"
+msgstr "Beeld bestand ontbreekt"
+
+#: mod/photos.php:790
+msgid ""
+"Server can't accept new file upload at this time, please contact your "
+"administrator"
+msgstr "De server kan op dit moment geen nieuw bestand opladen, contacteer alsjeblieft je beheerder"
+
+#: mod/photos.php:816
+msgid "Image file is empty."
+msgstr "Afbeeldingsbestand is leeg."
+
+#: mod/photos.php:953
+msgid "No photos selected"
+msgstr "Geen foto's geselecteerd"
+
+#: mod/photos.php:1104
+msgid "Upload Photos"
+msgstr "Upload foto's"
+
+#: mod/photos.php:1108 mod/photos.php:1176
+msgid "New album name: "
+msgstr "Nieuwe albumnaam: "
+
+#: mod/photos.php:1109
+msgid "or select existing album:"
+msgstr "Of selecteer bestaand album:"
+
+#: mod/photos.php:1110
+msgid "Do not show a status post for this upload"
+msgstr "Toon geen bericht op je tijdlijn van deze upload"
+
+#: mod/photos.php:1187
+msgid "Edit Album"
+msgstr "Album wijzigen"
+
+#: mod/photos.php:1192
+msgid "Show Newest First"
+msgstr "Toon niewste eerst"
+
+#: mod/photos.php:1194
+msgid "Show Oldest First"
+msgstr "Toon oudste eerst"
+
+#: mod/photos.php:1215 mod/photos.php:1693
+msgid "View Photo"
+msgstr "Bekijk foto"
+
+#: mod/photos.php:1256
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Toegang geweigerd. Toegang tot dit item is mogelijk beperkt."
+
+#: mod/photos.php:1258
+msgid "Photo not available"
+msgstr "Foto is niet beschikbaar"
+
+#: mod/photos.php:1333
+msgid "View photo"
+msgstr "Bekijk foto"
+
+#: mod/photos.php:1333
+msgid "Edit photo"
+msgstr "Bewerk foto"
+
+#: mod/photos.php:1334
+msgid "Use as profile photo"
+msgstr "Gebruik als profielfoto"
+
+#: mod/photos.php:1340 src/Object/Post.php:151
+msgid "Private Message"
+msgstr "Privébericht"
+
+#: mod/photos.php:1360
+msgid "View Full Size"
+msgstr "Bekijk in volledig formaat"
+
+#: mod/photos.php:1421
+msgid "Tags: "
+msgstr "Labels: "
+
+#: mod/photos.php:1424
+msgid "[Remove any tag]"
+msgstr "[Alle labels verwijderen]"
+
+#: mod/photos.php:1439
+msgid "New album name"
+msgstr "Nieuwe albumnaam"
+
+#: mod/photos.php:1440
+msgid "Caption"
+msgstr "Onderschrift"
+
+#: mod/photos.php:1441
+msgid "Add a Tag"
+msgstr "Een label toevoegen"
+
+#: mod/photos.php:1441
+msgid ""
+"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl, #Ardennen, #camping "
+
+#: mod/photos.php:1442
+msgid "Do not rotate"
+msgstr "Niet roteren"
+
+#: mod/photos.php:1443
+msgid "Rotate CW (right)"
+msgstr "Roteren met de klok mee (rechts)"
+
+#: mod/photos.php:1444
+msgid "Rotate CCW (left)"
+msgstr "Roteren tegen de klok in (links)"
+
+#: mod/photos.php:1478 src/Object/Post.php:293
+msgid "I like this (toggle)"
+msgstr "Vind ik leuk"
+
+#: mod/photos.php:1479 src/Object/Post.php:294
+msgid "I don't like this (toggle)"
+msgstr "Vind ik niet leuk"
+
+#: mod/photos.php:1496 mod/photos.php:1535 mod/photos.php:1595
+#: src/Object/Post.php:398 src/Object/Post.php:794
+msgid "Comment"
+msgstr "Reacties"
+
+#: mod/photos.php:1627
+msgid "Map"
+msgstr "Kaart"
+
+#: local/test.php:1840
+#, php-format
+msgid ""
+"<span><a href=\"%s\" target=\"_blank\" class=\"shared-wall-item-"
+"name\">%s</a> wrote the following <a href=\"%s\" target=\"_blank\">post</a>"
+msgstr "<span><a href=\"%s\" target=\"_blank\" class=\"shared-wall-item-name\">%s</a> schreef volgend <a href=\"%s\" target=\"_blank\">bericht</a>"
+
+#: local/testshare.php:158 src/Content/Text/BBCode.php:991
+#, php-format
+msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
+msgstr "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
+
+#: local/testshare.php:180
+#, php-format
+msgid ""
+"<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a "
+"href=\"%s\" target=\"_blank\">post</a>"
+msgstr "<span><a href=\"%s\" target=\"_blank\">%s</a> schreef volgend <a href=\"%s\" target=\"_blank\">bericht</a>"
+
+#: boot.php:653
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr "Wijziging %s mislukt. Lees de error logbestanden."
+
+#: src/Database/DBStructure.php:33
+msgid "There are no tables on MyISAM."
+msgstr "Er zijn geen MyISAM tabellen."
+
+#: src/Database/DBStructure.php:76
+#, 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 "\n\t\t\t\tDe Friendica ontwikkelaars hebben recent update %svrijgegeven,\n \t\t\t\tmaar wanneer ik deze probeerde te installeren ging het verschrikkelijk fout.\n \t\t\t\tDit moet snel opgelost worden en ik kan het niet alleen. Contacteer alstublieft\n \t\t\t\teen Friendica ontwikkelaar als je mij zelf niet kan helpen. Mijn database kan ongeldig zijn."
+
+#: src/Database/DBStructure.php:81
+#, php-format
+msgid ""
+"The error message is\n"
+"[pre]%s[/pre]"
+msgstr "De foutboodschap is\n[pre]%s[/pre]"
+
+#: src/Database/DBStructure.php:192
+#, php-format
+msgid ""
+"\n"
+"Error %d occurred during database update:\n"
+"%s\n"
+msgstr "\nFout %d is opgetreden tijdens database update:\n%s\n"
+
+#: src/Database/DBStructure.php:195
+msgid "Errors encountered performing database changes: "
+msgstr "Fouten opgetreden tijdens database aanpassingen:"
+
+#: src/Database/DBStructure.php:211
+#, php-format
+msgid "%s: Database update"
+msgstr "%s: Database update"
+
+#: src/Database/DBStructure.php:473
+#, php-format
+msgid "%s: updating %s table."
+msgstr "%s: tabel %s aan het updaten."
+
+#: src/Core/Install.php:138
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "Kan geen command-line-versie van PHP vinden in het PATH van de webserver."
+
+#: src/Core/Install.php:139
+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://github.com/friendica/friendica/blob/master/doc/Install.md#set-"
+"up-the-worker'>'Setup the worker'</a>"
+msgstr "Als je geen command line versie van PHP geïnstalleerd hebt op je server, dan kan je de achtergrondprocessen niet draaien. Zie <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Installatie van de worker'</a>"
+
+#: src/Core/Install.php:143
+msgid "PHP executable path"
+msgstr "PATH van het PHP commando"
+
+#: src/Core/Install.php:143
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Vul het volledige pad in naar het php programma. Je kunt dit leeg laten om de installatie verder te zetten."
+
+#: src/Core/Install.php:148
+msgid "Command line PHP"
+msgstr "PHP-opdrachtregel"
+
+#: src/Core/Install.php:157
+msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
+msgstr "PHP uitvoerbaar bestand is niet de php cli binary (zou kunnen de cgi-fgci versie zijn)"
+
+#: src/Core/Install.php:158
+msgid "Found PHP version: "
+msgstr "Gevonden PHP versie:"
+
+#: src/Core/Install.php:160
+msgid "PHP cli binary"
+msgstr "PHP cli binary"
+
+#: src/Core/Install.php:170
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "De command-line versie van PHP op jouw systeem heeft \"register_argc_argv\" niet geactiveerd."
+
+#: src/Core/Install.php:171
+msgid "This is required for message delivery to work."
+msgstr "Dit is nodig om het verzenden van berichten mogelijk te maken."
+
+#: src/Core/Install.php:173
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
+
+#: src/Core/Install.php:201
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Fout: de \"openssl_pkey_new\" functie op dit systeem kan geen encryptie sleutels genereren"
+
+#: src/Core/Install.php:202
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Zie \"http://www.php.net/manual/en/openssl.installation.php\" wanneer u Friendica onder Windows draait."
+
+#: src/Core/Install.php:204
+msgid "Generate encryption keys"
+msgstr "Genereer encryptie sleutels"
+
+#: src/Core/Install.php:225
+msgid "libCurl PHP module"
+msgstr "libCurl PHP module"
+
+#: src/Core/Install.php:226
+msgid "GD graphics PHP module"
+msgstr "GD graphics PHP module"
+
+#: src/Core/Install.php:227
+msgid "OpenSSL PHP module"
+msgstr "OpenSSL PHP module"
+
+#: src/Core/Install.php:228
+msgid "PDO or MySQLi PHP module"
+msgstr "PDO of MySQLi PHP module"
+
+#: src/Core/Install.php:229
+msgid "mb_string PHP module"
+msgstr "mb_string PHP module"
+
+#: src/Core/Install.php:230
+msgid "XML PHP module"
+msgstr "XML PHP module"
+
+#: src/Core/Install.php:231
+msgid "iconv PHP module"
+msgstr "iconv PHP module"
+
+#: src/Core/Install.php:232
+msgid "POSIX PHP module"
+msgstr "POSIX PHP module"
+
+#: src/Core/Install.php:236 src/Core/Install.php:238
+msgid "Apache mod_rewrite module"
+msgstr "Apache mod_rewrite module"
+
+#: src/Core/Install.php:236
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Fout: Apache-module mod-rewrite is vereist, maar niet geïnstalleerd."
+
+#: src/Core/Install.php:244
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Fout: PHP-module libCURL is vereist, maar niet geïnstalleerd."
+
+#: src/Core/Install.php:248
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Fout: PHP-module GD graphics met JPEG support is vereist, maar niet geïnstalleerd."
+
+#: src/Core/Install.php:252
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Fout: PHP-module openssl is vereist, maar niet geïnstalleerd."
+
+#: src/Core/Install.php:256
+msgid "Error: PDO or MySQLi PHP module required but not installed."
+msgstr "Fout: PDO of MySQLi PHP module vereist maar niet geïnstalleerd."
+
+#: src/Core/Install.php:260
+msgid "Error: The MySQL driver for PDO is not installed."
+msgstr "Fout: de MySQL driver voor PDO is niet geïnstalleerd."
+
+#: src/Core/Install.php:264
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Fout: PHP-module mb_string is vereist, maar niet geïnstalleerd."
+
+#: src/Core/Install.php:268
+msgid "Error: iconv PHP module required but not installed."
+msgstr "Fout: iconv PHP module vereist maar niet geïnstalleerd."
+
+#: src/Core/Install.php:272
+msgid "Error: POSIX PHP module required but not installed."
+msgstr "Fout: POSIX PHP module vereist maar niet geïnstalleerd."
+
+#: src/Core/Install.php:282
+msgid "Error, XML PHP module required but not installed."
+msgstr "Fout: XML PHP module vereist maar niet geinstalleerd."
+
+#: src/Core/Install.php:301
+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 "Het installatieprogramma moet een bestand \"local.ini.php\" in de \"config\" map van je webserver aanmaken, maar kan dit niet doen. "
+
+#: src/Core/Install.php:302
+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 "Dit is meestal een permissieprobleem, omdat de webserver niet in staat is om in deze map bestanden weg te schrijven - ook al kun je dit zelf wel."
+
+#: src/Core/Install.php:303
+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 "Op het einde van deze procedure zal ik je een tekst geven om te bewaren in een bestand local.ini.php in Friendica \"config\" map. "
+
+#: src/Core/Install.php:304
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"INSTALL.txt\" for instructions."
+msgstr "Je kunt ook deze procedure overslaan, en een manuele installatie uitvoeren. Lees het bestand \"INSTALL.txt\" voor instructies."
+
+#: src/Core/Install.php:307
+msgid "config/local.ini.php is writable"
+msgstr "config/local.ini.php is schrijfbaar "
+
+#: src/Core/Install.php:325
+msgid ""
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Friendica gebruikt het Smarty3 sjabloon systeem om zijn webpagina's weer te geven. Smarty3 compileert sjablonen naar PHP om de weergave te versnellen."
+
+#: src/Core/Install.php:326
+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 "Om deze gecompileerde sjablonen op te slaan moet de webserver schrijftoegang hebben tot de folder view/smarty3, t.o.v. van de hoogste folder van je Friendica-installatie."
+
+#: src/Core/Install.php:327
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Zorg ervoor dat de gebruiker waaronder je webserver runt (bijv. www-data) schrijf-toegang heeft tot deze map."
+
+#: src/Core/Install.php:328
+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 "Opmerking: voor een goede beveiliging zou je de webserver alleen schrijf-toegang moeten geven voor de map view/smarty3 -- niet voor de template bestanden (.tpl) die in die map zitten."
+
+#: src/Core/Install.php:331
+msgid "view/smarty3 is writable"
+msgstr "view/smarty3 is schrijfbaar"
+
+#: src/Core/Install.php:356
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+msgstr "Url rewrite in .htaccess werkt niet. Kijk je server configuratie na."
+
+#: src/Core/Install.php:358
+msgid "Error message from Curl when fetching"
+msgstr "Fout boodschap van Curl bij ophalen"
+
+#: src/Core/Install.php:362
+msgid "Url rewrite is working"
+msgstr "Url rewrite werkt correct"
+
+#: src/Core/Install.php:389
+msgid "ImageMagick PHP extension is not installed"
+msgstr "ImageMagick PHP extensie is niet geïnstalleerd"
+
+#: src/Core/Install.php:391
+msgid "ImageMagick PHP extension is installed"
+msgstr "ImageMagick PHP extensie is geïnstalleerd"
+
+#: src/Core/Install.php:393
+msgid "ImageMagick supports GIF"
+msgstr "ImageMagick ondersteunt GIF"
+
+#: src/Core/ACL.php:284
+msgid "Post to Email"
+msgstr "Verzenden per e-mail"
+
+#: src/Core/ACL.php:290
+msgid "Hide your profile details from unknown viewers?"
+msgstr "Je profieldetails verbergen voor onbekende bezoekers?"
+
+#: src/Core/ACL.php:289
+#, php-format
+msgid "Connectors disabled, since \"%s\" is enabled."
+msgstr "Connectoren gedeactiveerd, aangezien \"%s\" geactiveerd is."
+
+#: src/Core/ACL.php:296
+msgid "Visible to everybody"
+msgstr "Zichtbaar voor iedereen"
+
+#: src/Core/ACL.php:308
+msgid "Close"
+msgstr "Afsluiten"
 
 #: src/Core/Console/ArchiveContact.php:65
 #, php-format
@@ -7715,361 +8062,388 @@ msgstr "Kon geen niet-gearchiveerde contacten vinden voor deze URL (%s)"
 msgid "The contact entries have been archived"
 msgstr "The contacten zijn gearchiveerd"
 
+#: src/Core/Console/PostUpdate.php:32
+msgid "Execute pending post updates."
+msgstr ""
+
+#: src/Core/Console/PostUpdate.php:38
+msgid "All pending post updates are done."
+msgstr ""
+
 #: src/Core/Console/NewPassword.php:73
 msgid "Enter new password: "
 msgstr "Geef nieuw paswoord:"
 
-#: src/Core/Console/NewPassword.php:78 src/Model/User.php:266
+#: src/Core/Console/NewPassword.php:78 src/Model/User.php:269
 msgid "Password can't be empty"
 msgstr "Paswoord mag niet leeg zijn"
 
-#: src/Core/Install.php:156
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "Kan geen command-line-versie van PHP vinden in het PATH van de webserver."
-
-#: src/Core/Install.php:157
-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://github.com/friendica/friendica/blob/master/doc/Install.md#set-"
-"up-the-worker'>'Setup the worker'</a>"
-msgstr "Als je geen command line versie van PHP geïnstalleerd hebt op je server, dan kan je de achtergrondprocessen niet draaien. Zie <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Installatie van de worker'</a>"
-
-#: src/Core/Install.php:161
-msgid "PHP executable path"
-msgstr "PATH van het PHP commando"
-
-#: src/Core/Install.php:161
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "Vul het volledige pad in naar het php programma. Je kunt dit leeg laten om de installatie verder te zetten."
-
-#: src/Core/Install.php:166
-msgid "Command line PHP"
-msgstr "PHP-opdrachtregel"
-
-#: src/Core/Install.php:175
-msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
-msgstr "PHP uitvoerbaar bestand is niet de php cli binary (zou kunnen de cgi-fgci versie zijn)"
-
-#: src/Core/Install.php:176
-msgid "Found PHP version: "
-msgstr "Gevonden PHP versie:"
-
-#: src/Core/Install.php:178
-msgid "PHP cli binary"
-msgstr "PHP cli binary"
-
-#: src/Core/Install.php:188
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr "De command-line versie van PHP op jouw systeem heeft \"register_argc_argv\" niet geactiveerd."
-
-#: src/Core/Install.php:189
-msgid "This is required for message delivery to work."
-msgstr "Dit is nodig om het verzenden van berichten mogelijk te maken."
-
-#: src/Core/Install.php:191
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
-
-#: src/Core/Install.php:219
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr "Fout: de \"openssl_pkey_new\" functie op dit systeem kan geen encryptie sleutels genereren"
-
-#: src/Core/Install.php:220
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Zie \"http://www.php.net/manual/en/openssl.installation.php\" wanneer u Friendica onder Windows draait."
-
-#: src/Core/Install.php:222
-msgid "Generate encryption keys"
-msgstr "Genereer encryptie sleutels"
-
-#: src/Core/Install.php:243
-msgid "libCurl PHP module"
-msgstr "libCurl PHP module"
-
-#: src/Core/Install.php:244
-msgid "GD graphics PHP module"
-msgstr "GD graphics PHP module"
-
-#: src/Core/Install.php:245
-msgid "OpenSSL PHP module"
-msgstr "OpenSSL PHP module"
-
-#: src/Core/Install.php:246
-msgid "PDO or MySQLi PHP module"
-msgstr "PDO of MySQLi PHP module"
-
-#: src/Core/Install.php:247
-msgid "mb_string PHP module"
-msgstr "mb_string PHP module"
-
-#: src/Core/Install.php:248
-msgid "XML PHP module"
-msgstr "XML PHP module"
-
-#: src/Core/Install.php:249
-msgid "iconv PHP module"
-msgstr "iconv PHP module"
-
-#: src/Core/Install.php:250
-msgid "POSIX PHP module"
-msgstr "POSIX PHP module"
-
-#: src/Core/Install.php:254 src/Core/Install.php:256
-msgid "Apache mod_rewrite module"
-msgstr "Apache mod_rewrite module"
-
-#: src/Core/Install.php:254
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Fout: Apache-module mod-rewrite is vereist, maar niet geïnstalleerd."
-
-#: src/Core/Install.php:262
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Fout: PHP-module libCURL is vereist, maar niet geïnstalleerd."
-
-#: src/Core/Install.php:266
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Fout: PHP-module GD graphics met JPEG support is vereist, maar niet geïnstalleerd."
-
-#: src/Core/Install.php:270
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Fout: PHP-module openssl is vereist, maar niet geïnstalleerd."
-
-#: src/Core/Install.php:274
-msgid "Error: PDO or MySQLi PHP module required but not installed."
-msgstr "Fout: PDO of MySQLi PHP module vereist maar niet geïnstalleerd."
-
-#: src/Core/Install.php:278
-msgid "Error: The MySQL driver for PDO is not installed."
-msgstr "Fout: de MySQL driver voor PDO is niet geïnstalleerd."
-
-#: src/Core/Install.php:282
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Fout: PHP-module mb_string is vereist, maar niet geïnstalleerd."
-
-#: src/Core/Install.php:286
-msgid "Error: iconv PHP module required but not installed."
-msgstr "Fout: iconv PHP module vereist maar niet geïnstalleerd."
-
-#: src/Core/Install.php:290
-msgid "Error: POSIX PHP module required but not installed."
-msgstr "Fout: POSIX PHP module vereist maar niet geïnstalleerd."
-
-#: src/Core/Install.php:300
-msgid "Error, XML PHP module required but not installed."
-msgstr "Fout: XML PHP module vereist maar niet geinstalleerd."
-
-#: src/Core/Install.php:319
-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 "Het installatieprogramma moet een bestand \"local.ini.php\" in de \"config\" map van je webserver aanmaken, maar kan dit niet doen. "
-
-#: src/Core/Install.php:320
-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 "Dit is meestal een permissieprobleem, omdat de webserver niet in staat is om in deze map bestanden weg te schrijven - ook al kun je dit zelf wel."
-
-#: src/Core/Install.php:321
-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 "Op het einde van deze procedure zal ik je een tekst geven om te bewaren in een bestand local.ini.php in Friendica \"config\" map. "
-
-#: src/Core/Install.php:322
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation."
-" Please see the file \"INSTALL.txt\" for instructions."
-msgstr "Je kunt ook deze procedure overslaan, en een manuele installatie uitvoeren. Lees het bestand \"INSTALL.txt\" voor instructies."
-
-#: src/Core/Install.php:325
-msgid "config/local.ini.php is writable"
-msgstr "config/local.ini.php is schrijfbaar "
-
-#: src/Core/Install.php:343
-msgid ""
-"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr "Friendica gebruikt het Smarty3 sjabloon systeem om zijn webpagina's weer te geven. Smarty3 compileert sjablonen naar PHP om de weergave te versnellen."
-
-#: src/Core/Install.php:344
-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 "Om deze gecompileerde sjablonen op te slaan moet de webserver schrijftoegang hebben tot de folder view/smarty3, t.o.v. van de hoogste folder van je Friendica-installatie."
-
-#: src/Core/Install.php:345
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has"
-" write access to this folder."
-msgstr "Zorg ervoor dat de gebruiker waaronder je webserver runt (bijv. www-data) schrijf-toegang heeft tot deze map."
-
-#: src/Core/Install.php:346
-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 "Opmerking: voor een goede beveiliging zou je de webserver alleen schrijf-toegang moeten geven voor de map view/smarty3 -- niet voor de template bestanden (.tpl) die in die map zitten."
-
-#: src/Core/Install.php:349
-msgid "view/smarty3 is writable"
-msgstr "view/smarty3 is schrijfbaar"
-
-#: src/Core/Install.php:374
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-msgstr "Url rewrite in .htaccess werkt niet. Kijk je server configuratie na."
-
-#: src/Core/Install.php:376
-msgid "Error message from Curl when fetching"
-msgstr "Fout boodschap van Curl bij ophalen"
-
-#: src/Core/Install.php:380
-msgid "Url rewrite is working"
-msgstr "Url rewrite werkt correct"
-
-#: src/Core/Install.php:407
-msgid "ImageMagick PHP extension is not installed"
-msgstr "ImageMagick PHP extensie is niet geïnstalleerd"
-
-#: src/Core/Install.php:409
-msgid "ImageMagick PHP extension is installed"
-msgstr "ImageMagick PHP extensie is geïnstalleerd"
-
-#: src/Core/Install.php:411
-msgid "ImageMagick supports GIF"
-msgstr "ImageMagick ondersteunt GIF"
-
-#: src/Core/ACL.php:285
-msgid "Post to Email"
-msgstr "Verzenden per e-mail"
-
-#: src/Core/ACL.php:291
-msgid "Hide your profile details from unknown viewers?"
-msgstr "Je profieldetails verbergen voor onbekende bezoekers?"
-
-#: src/Core/ACL.php:290
-#, php-format
-msgid "Connectors disabled, since \"%s\" is enabled."
-msgstr "Connectoren gedeactiveerd, aangezien \"%s\" geactiveerd is."
-
-#: src/Core/ACL.php:297
-msgid "Visible to everybody"
-msgstr "Zichtbaar voor iedereen"
-
-#: src/Core/ACL.php:309
-msgid "Close"
-msgstr "Afsluiten"
-
-#: src/Core/NotificationsManager.php:169
+#: src/Core/NotificationsManager.php:172
 msgid "System"
 msgstr "Systeem"
 
-#: src/Core/NotificationsManager.php:190 src/Content/Nav.php:124
+#: src/Core/NotificationsManager.php:193 src/Content/Nav.php:124
 #: src/Content/Nav.php:186
 msgid "Home"
 msgstr "Tijdlijn"
 
-#: src/Core/NotificationsManager.php:197 src/Content/Nav.php:190
+#: src/Core/NotificationsManager.php:200 src/Content/Nav.php:190
 msgid "Introductions"
 msgstr "Verzoeken"
 
-#: src/Core/NotificationsManager.php:259 src/Core/NotificationsManager.php:271
+#: src/Core/NotificationsManager.php:262 src/Core/NotificationsManager.php:274
 #, php-format
 msgid "%s commented on %s's post"
 msgstr "%s gaf een reactie op het bericht van %s"
 
-#: src/Core/NotificationsManager.php:270
+#: src/Core/NotificationsManager.php:273
 #, php-format
 msgid "%s created a new post"
 msgstr "%s schreef een nieuw bericht"
 
-#: src/Core/NotificationsManager.php:284
+#: src/Core/NotificationsManager.php:287
 #, php-format
 msgid "%s liked %s's post"
 msgstr "%s vond het bericht van %s leuk"
 
-#: src/Core/NotificationsManager.php:297
+#: src/Core/NotificationsManager.php:300
 #, php-format
 msgid "%s disliked %s's post"
 msgstr "%s vond het bericht van %s niet leuk"
 
-#: src/Core/NotificationsManager.php:310
+#: src/Core/NotificationsManager.php:313
 #, php-format
 msgid "%s is attending %s's event"
 msgstr "%s woont het event van %s bij"
 
-#: src/Core/NotificationsManager.php:323
+#: src/Core/NotificationsManager.php:326
 #, php-format
 msgid "%s is not attending %s's event"
 msgstr "%s woont het event van %s niet bij"
 
-#: src/Core/NotificationsManager.php:336
+#: src/Core/NotificationsManager.php:339
 #, php-format
 msgid "%s may attend %s's event"
 msgstr "%s woont het event van %s misschien bij"
 
-#: src/Core/NotificationsManager.php:353
+#: src/Core/NotificationsManager.php:360
 #, php-format
 msgid "%s is now friends with %s"
 msgstr "%s is nu bevriend met %s"
 
-#: src/Core/NotificationsManager.php:619
+#: src/Core/NotificationsManager.php:626
 msgid "Friend Suggestion"
 msgstr "Vriendschapsvoorstel"
 
-#: src/Core/NotificationsManager.php:649
+#: src/Core/NotificationsManager.php:656
 msgid "Friend/Connect Request"
 msgstr "Vriendschapsverzoek"
 
-#: src/Core/NotificationsManager.php:649
+#: src/Core/NotificationsManager.php:656
 msgid "New Follower"
 msgstr "Nieuwe Volger"
 
-#: src/Core/UserImport.php:99
+#: src/Core/UserImport.php:100
 msgid "Error decoding account file"
 msgstr "Fout bij decoderen van het account bestand"
 
-#: src/Core/UserImport.php:105
+#: src/Core/UserImport.php:106
 msgid "Error! No version data in file! This is not a Friendica account file?"
 msgstr "Fout! Geen versie data in het bestand! Is dit wel een Friendica account bestand?"
 
-#: src/Core/UserImport.php:113
+#: src/Core/UserImport.php:114
 #, php-format
 msgid "User '%s' already exists on this server!"
 msgstr "Gebruiker '%s' bestaat al op deze server!"
 
-#: src/Core/UserImport.php:146
+#: src/Core/UserImport.php:147
 msgid "User creation error"
 msgstr "Fout bij het aanmaken van de gebruiker"
 
-#: src/Core/UserImport.php:164
+#: src/Core/UserImport.php:165
 msgid "User profile creation error"
 msgstr "Fout bij het aanmaken van het gebruikersprofiel"
 
-#: src/Core/UserImport.php:208
+#: src/Core/UserImport.php:209
 #, php-format
 msgid "%d contact not imported"
 msgid_plural "%d contacts not imported"
 msgstr[0] "%d contact werd niet geïmporteerd"
 msgstr[1] "%d contacten werden niet geïmporteerd"
 
-#: src/Core/UserImport.php:273
+#: src/Core/UserImport.php:274
 msgid "Done. You can now login with your username and password"
 msgstr "Gebeurd. Je kunt nu inloggen met je gebruikersnaam en wachtwoord"
 
-#: src/Util/Temporal.php:147 src/Model/Profile.php:754
+#: src/Worker/Delivery.php:423
+msgid "(no subject)"
+msgstr "(geen onderwerp)"
+
+#: src/Object/Post.php:130
+msgid "This entry was edited"
+msgstr "Deze entry werd bewerkt"
+
+#: src/Object/Post.php:190
+msgid "Delete globally"
+msgstr "Verwijder globaal"
+
+#: src/Object/Post.php:190
+msgid "Remove locally"
+msgstr "Verwijder lokaal"
+
+#: src/Object/Post.php:203
+msgid "save to folder"
+msgstr "Bewaren in map"
+
+#: src/Object/Post.php:232
+msgid "I will attend"
+msgstr "Ik zal er zijn"
+
+#: src/Object/Post.php:232
+msgid "I will not attend"
+msgstr "Ik zal er niet zijn"
+
+#: src/Object/Post.php:232
+msgid "I might attend"
+msgstr "Ik ga misschien"
+
+#: src/Object/Post.php:259
+msgid "ignore thread"
+msgstr "Negeer gesprek"
+
+#: src/Object/Post.php:260
+msgid "unignore thread"
+msgstr "Stop met gesprek te negeren"
+
+#: src/Object/Post.php:261
+msgid "toggle ignore status"
+msgstr "verwissel negeer status"
+
+#: src/Object/Post.php:272
+msgid "add star"
+msgstr "ster toevoegen"
+
+#: src/Object/Post.php:273
+msgid "remove star"
+msgstr "ster verwijderen"
+
+#: src/Object/Post.php:274
+msgid "toggle star status"
+msgstr "ster toevoegen of verwijderen"
+
+#: src/Object/Post.php:277
+msgid "starred"
+msgstr "met ster"
+
+#: src/Object/Post.php:282
+msgid "add tag"
+msgstr "label toevoegen"
+
+#: src/Object/Post.php:293
+msgid "like"
+msgstr "leuk"
+
+#: src/Object/Post.php:294
+msgid "dislike"
+msgstr "niet leuk"
+
+#: src/Object/Post.php:297
+msgid "Share this"
+msgstr "Delen"
+
+#: src/Object/Post.php:297
+msgid "share"
+msgstr "Delen"
+
+#: src/Object/Post.php:364
+msgid "to"
+msgstr "aan"
+
+#: src/Object/Post.php:365
+msgid "via"
+msgstr "via"
+
+#: src/Object/Post.php:366
+msgid "Wall-to-Wall"
+msgstr "wall-to-wall"
+
+#: src/Object/Post.php:367
+msgid "via Wall-To-Wall:"
+msgstr "via wall-to-wall"
+
+#: src/Object/Post.php:426
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d reactie"
+msgstr[1] "%d reacties"
+
+#: src/Object/Post.php:796
+msgid "Bold"
+msgstr "Vet"
+
+#: src/Object/Post.php:797
+msgid "Italic"
+msgstr "Cursief"
+
+#: src/Object/Post.php:798
+msgid "Underline"
+msgstr "Onderstrepen"
+
+#: src/Object/Post.php:799
+msgid "Quote"
+msgstr "Citeren"
+
+#: src/Object/Post.php:800
+msgid "Code"
+msgstr "Broncode"
+
+#: src/Object/Post.php:801
+msgid "Image"
+msgstr "Afbeelding"
+
+#: src/Object/Post.php:802
+msgid "Link"
+msgstr "Link"
+
+#: src/Object/Post.php:803
+msgid "Video"
+msgstr "Video"
+
+#: src/App.php:785
+msgid "Delete this item?"
+msgstr "Dit item verwijderen?"
+
+#: src/App.php:787
+msgid "show fewer"
+msgstr "Minder tonen"
+
+#: src/App.php:1385
+msgid "No system theme config value set."
+msgstr "Geen systeem thema configuratie ingesteld."
+
+#: src/Module/Logout.php:28
+msgid "Logged out."
+msgstr "Uitgelogd."
+
+#: src/Module/Login.php:100 src/Model/User.php:408
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Er is een probleem opgetreden bij het inloggen met het opgegeven OpenID. Kijk alsjeblieft de spelling van deze ID na."
+
+#: src/Module/Login.php:100 src/Model/User.php:408
+msgid "The error message was:"
+msgstr "De foutboodschap was:"
+
+#: src/Module/Login.php:280
+msgid "Create a New Account"
+msgstr "Nieuwe account aanmaken"
+
+#: src/Module/Login.php:313
+msgid "Password: "
+msgstr "Wachtwoord:"
+
+#: src/Module/Login.php:314
+msgid "Remember me"
+msgstr "Onthou me"
+
+#: src/Module/Login.php:317
+msgid "Or login using OpenID: "
+msgstr "Of log in met OpenID:"
+
+#: src/Module/Login.php:323
+msgid "Forgot your password?"
+msgstr "Wachtwoord vergeten?"
+
+#: src/Module/Login.php:326
+msgid "Website Terms of Service"
+msgstr "Gebruikersvoorwaarden website"
+
+#: src/Module/Login.php:327
+msgid "terms of service"
+msgstr "servicevoorwaarden"
+
+#: src/Module/Login.php:329
+msgid "Website Privacy Policy"
+msgstr "Privacybeleid website"
+
+#: src/Module/Login.php:330
+msgid "privacy policy"
+msgstr "privacybeleid"
+
+#: src/Module/Tos.php:34 src/Module/Tos.php:74
+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"
+" name), an username (nickname) and a working email address. The names will "
+"be accessible on the profile page of the account by any visitor of the page,"
+" even if other profile details are not displayed. The email address will "
+"only be used to send the user notifications about interactions, but wont be "
+"visibly displayed. The listing of an account in the node's user directory or"
+" the global user directory is optional and can be controlled in the user "
+"settings, it is not necessary for communication."
+msgstr "Op het moment van de registratie, en om communicatie mogelijk te maken tussen de gebruikersaccount en zijn of haar contacten, moet de gebruiker een weergave naam opgeven, een gebruikersnaam (bijnaam) en een werkend email adres. De namen zullen toegankelijk zijn op de profiel pagina van het account voor elke bezoeker van de pagina, zelfs als andere profiel details niet getoond worden. Het email adres zal enkel gebruikt worden om de gebruiker notificaties te sturen over interacties, maar zal niet zichtbaar getoond worden. Het oplijsten van een account in de gids van de node van de gebruiker of in de globale gids is optioneel en kan beheerd worden in de gebruikersinstellingen, dit is niet nodig voor communicatie."
+
+#: src/Module/Tos.php:35 src/Module/Tos.php:75
+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 "Deze data is vereist voor communicatie en wordt doorgegeven aan de nodes van de communicatie partners en wordt daar opgeslagen. Gebruikers kunnen bijkomende privé data opgeven die mag doorgegeven worden aan de accounts van de communicatie partners."
+
+#: src/Module/Tos.php:36 src/Module/Tos.php:76
+#, php-format
+msgid ""
+"At any point in time a logged in user can export their account data from the"
+" <a href=\"%1$s/settings/uexport\">account settings</a>. If the user wants "
+"to delete their account they can do so at <a "
+"href=\"%1$s/removeme\">%1$s/removeme</a>. The deletion of the account will "
+"be permanent. Deletion of the data will also be requested from the nodes of "
+"the communication partners."
+msgstr "Een ingelogd gebruiker kan op elk moment zijn of haar account data exporteren via <a href=\"%1$s/settings/uexport\">account instellingen</a>. Een gebruiker kan ook zijn of haar account verwijderen via <a href=\"%1$s/removeme\">%1$s/removeme</a>. De verwijdering van het account is permanent. Ook zal aan andere nodes van communicatie partners gevraagd worden om de data te verwijderen."
+
+#: src/Module/Tos.php:39 src/Module/Tos.php:73
+msgid "Privacy Statement"
+msgstr "Privacy Verklaring"
+
+#: src/Protocol/OStatus.php:1813
+#, php-format
+msgid "%s is now following %s."
+msgstr "%s volgt nu %s."
+
+#: src/Protocol/OStatus.php:1814
+msgid "following"
+msgstr "volgend"
+
+#: src/Protocol/OStatus.php:1817
+#, php-format
+msgid "%s stopped following %s."
+msgstr "%s stopte %s te volgen."
+
+#: src/Protocol/OStatus.php:1818
+msgid "stopped following"
+msgstr "is gestopt met volgen"
+
+#: src/Protocol/DFRN.php:1525 src/Model/Contact.php:1956
+#, php-format
+msgid "%s's birthday"
+msgstr "%s's verjaardag"
+
+#: src/Protocol/DFRN.php:1526 src/Model/Contact.php:1957
+#, php-format
+msgid "Happy Birthday %s"
+msgstr "Gefeliciteerd %s"
+
+#: src/Protocol/Diaspora.php:2417
+msgid "Sharing notification from Diaspora network"
+msgstr "Deelt notificatie van het Diaspora netwerk"
+
+#: src/Protocol/Diaspora.php:3514
+msgid "Attachments:"
+msgstr "Bijlagen:"
+
+#: src/Util/Temporal.php:147 src/Model/Profile.php:745
 msgid "Birthday:"
 msgstr "Verjaardag:"
 
@@ -8134,47 +8508,780 @@ msgstr "seconden"
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s geleden"
 
-#: src/Content/Text/BBCode.php:423
-msgid "view full size"
-msgstr "Volledig formaat"
+#: src/Model/Mail.php:39 src/Model/Mail.php:171
+msgid "[no subject]"
+msgstr "[geen onderwerp]"
 
-#: src/Content/Text/BBCode.php:853 src/Content/Text/BBCode.php:1629
-#: src/Content/Text/BBCode.php:1630
-msgid "Image/photo"
-msgstr "Afbeelding/foto"
+#: src/Model/Contact.php:942
+msgid "Drop Contact"
+msgstr "Verwijder contact"
 
-#: src/Content/Text/BBCode.php:991
+#: src/Model/Contact.php:1399
+msgid "Organisation"
+msgstr "Organisatie"
+
+#: src/Model/Contact.php:1403
+msgid "News"
+msgstr "Nieuws"
+
+#: src/Model/Contact.php:1407
+msgid "Forum"
+msgstr "Forum"
+
+#: src/Model/Contact.php:1587
+msgid "Connect URL missing."
+msgstr "Connectie URL ontbreekt."
+
+#: src/Model/Contact.php:1596
+msgid ""
+"The contact could not be added. Please check the relevant network "
+"credentials in your Settings -> Social Networks page."
+msgstr "Het contact kon niet toegevoegd worden. Gelieve de relevante netwerk gegevens na te kijken in Instellingen -> Sociale Netwerken."
+
+#: src/Model/Contact.php:1635
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr "Deze website is niet geconfigureerd voor communicatie met andere netwerken."
+
+#: src/Model/Contact.php:1636 src/Model/Contact.php:1650
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr "Er werden geen compatibele communicatieprotocols of feeds ontdekt."
+
+#: src/Model/Contact.php:1648
+msgid "The profile address specified does not provide adequate information."
+msgstr "Het opgegeven profiel adres bevat geen adequate informatie."
+
+#: src/Model/Contact.php:1653
+msgid "An author or name was not found."
+msgstr "Er werd geen auteur of naam gevonden."
+
+#: src/Model/Contact.php:1656
+msgid "No browser URL could be matched to this address."
+msgstr "Er kan geen browser URL gematcht worden met dit adres."
+
+#: src/Model/Contact.php:1659
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
+msgstr "Het @-stijl-identiteitsadres komt niet overeen met een nekend protocol of e-mailcontact."
+
+#: src/Model/Contact.php:1660
+msgid "Use mailto: in front of address to force email check."
+msgstr "Gebruik mailto: voor het adres om een e-mailcontrole af te dwingen."
+
+#: src/Model/Contact.php:1666
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr "Het opgegeven profiel adres behoort tot een netwerk dat gedeactiveerd is op deze site."
+
+#: src/Model/Contact.php:1671
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr "Profiel met restricties. Deze peresoon zal geen directe/persoonlijke notificaties van jou kunnen ontvangen."
+
+#: src/Model/Contact.php:1722
+msgid "Unable to retrieve contact information."
+msgstr "Het was niet mogelijk informatie over dit contact op te halen."
+
+#: src/Model/Event.php:59 src/Model/Event.php:76 src/Model/Event.php:428
+#: src/Model/Event.php:897
+msgid "Starts:"
+msgstr "Begint:"
+
+#: src/Model/Event.php:62 src/Model/Event.php:82 src/Model/Event.php:429
+#: src/Model/Event.php:901
+msgid "Finishes:"
+msgstr "Eindigt:"
+
+#: src/Model/Event.php:377
+msgid "all-day"
+msgstr "de hele dag"
+
+#: src/Model/Event.php:400
+msgid "Jun"
+msgstr "Jun"
+
+#: src/Model/Event.php:403
+msgid "Sept"
+msgstr "Sep"
+
+#: src/Model/Event.php:426
+msgid "No events to display"
+msgstr "Geen gebeurtenissen te tonen"
+
+#: src/Model/Event.php:550
+msgid "l, F j"
+msgstr "l j F"
+
+#: src/Model/Event.php:581
+msgid "Edit event"
+msgstr "Gebeurtenis bewerken"
+
+#: src/Model/Event.php:582
+msgid "Duplicate event"
+msgstr "Duplicate gebeurtenis"
+
+#: src/Model/Event.php:583
+msgid "Delete event"
+msgstr "Verwijder gebeurtenis"
+
+#: src/Model/Event.php:830
+msgid "D g:i A"
+msgstr "D g:i A"
+
+#: src/Model/Event.php:831
+msgid "g:i A"
+msgstr "g:i A"
+
+#: src/Model/Event.php:916 src/Model/Event.php:918
+msgid "Show map"
+msgstr "Toon kaart"
+
+#: src/Model/Event.php:917
+msgid "Hide map"
+msgstr "Verberg kaart"
+
+#: src/Model/User.php:168
+msgid "Login failed"
+msgstr "Login mislukt"
+
+#: src/Model/User.php:199
+msgid "Not enough information to authenticate"
+msgstr "Niet genoeg informatie om te authentificeren"
+
+#: src/Model/User.php:384
+msgid "An invitation is required."
+msgstr "Een uitnodiging is vereist."
+
+#: src/Model/User.php:388
+msgid "Invitation could not be verified."
+msgstr "Uitnodiging kon niet geverifieerd worden."
+
+#: src/Model/User.php:395
+msgid "Invalid OpenID url"
+msgstr "Ongeldige OpenID url"
+
+#: src/Model/User.php:414
+msgid "Please enter the required information."
+msgstr "Vul de vereiste informatie in."
+
+#: src/Model/User.php:427
+msgid "Please use a shorter name."
+msgstr "gebruik een kortere naam"
+
+#: src/Model/User.php:430
+msgid "Name too short."
+msgstr "Naam te kort"
+
+#: src/Model/User.php:438
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr "Dat lijkt niet je volledige naam (voor- en achternaam) te zijn."
+
+#: src/Model/User.php:443
+msgid "Your email domain is not among those allowed on this site."
+msgstr "Je e-maildomein is op deze website niet toegestaan."
+
+#: src/Model/User.php:447
+msgid "Not a valid email address."
+msgstr "Geen geldig e-mailadres."
+
+#: src/Model/User.php:450
+msgid "The nickname was blocked from registration by the nodes admin."
+msgstr "De bijnaam werd geblokkeerd voor registratie door de node admin"
+
+#: src/Model/User.php:454 src/Model/User.php:462
+msgid "Cannot use that email."
+msgstr "Ik kan die e-mail niet gebruiken."
+
+#: src/Model/User.php:469
+msgid "Your nickname can only contain a-z, 0-9 and _."
+msgstr "Je bijnaam mag alleen a-z, 0-9 of _ bevatten."
+
+#: src/Model/User.php:476 src/Model/User.php:533
+msgid "Nickname is already registered. Please choose another."
+msgstr "Bijnaam is al geregistreerd. Kies een andere."
+
+#: src/Model/User.php:486
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr "ERNSTIGE FOUT: aanmaken van beveiligingssleutels mislukt."
+
+#: src/Model/User.php:520 src/Model/User.php:524
+msgid "An error occurred during registration. Please try again."
+msgstr "Er is een fout opgetreden tijdens de registratie. Probeer opnieuw."
+
+#: src/Model/User.php:549
+msgid "An error occurred creating your default profile. Please try again."
+msgstr "Er is een fout opgetreden bij het aanmaken van je standaard profiel. Probeer opnieuw."
+
+#: src/Model/User.php:556
+msgid "An error occurred creating your self contact. Please try again."
+msgstr "Er is een fout opgetreden bij het aanmaken van je self contact. Probeer opnieuw."
+
+#: src/Model/User.php:561 src/Content/ContactSelector.php:166
+msgid "Friends"
+msgstr "Vrienden"
+
+#: src/Model/User.php:565
+msgid ""
+"An error occurred creating your default contact group. Please try again."
+msgstr "Er is een fout opgetreden bij het aanmaken van je standaard contact groep. Probeer opnieuw."
+
+#: src/Model/User.php:639
 #, php-format
-msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
-msgstr "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
+msgid ""
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tThank you for registering at %2$s. Your account is pending for approval by the administrator.\n"
+"\t\t"
+msgstr "\n\t\t\tBeste %1$s,\n\t\t\t\tBedant voor je registratie bij %2$s. De aanmaak van je account wacht op goedkeuring door de beheerder.\n\t\t"
 
-#: src/Content/Text/BBCode.php:1556 src/Content/Text/BBCode.php:1578
-msgid "$1 wrote:"
-msgstr "$1 schreef:"
+#: src/Model/User.php:649
+#, php-format
+msgid "Registration at %s"
+msgstr "Registratie bij %s"
 
-#: src/Content/Text/BBCode.php:1638 src/Content/Text/BBCode.php:1639
-msgid "Encrypted content"
-msgstr "Versleutelde inhoud"
+#: src/Model/User.php:667
+#, php-format
+msgid ""
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tThank you for registering at %2$s. Your account has been created.\n"
+"\t\t"
+msgstr "\n\t\t\tBeste %1$s,\n\t\t\t\tBedankt voor je registratie bij %2$s. Je account is aangemaakt.\n\t\t"
 
-#: src/Content/Text/BBCode.php:1758
-msgid "Invalid source protocol"
-msgstr "Ongeldig bron protocol"
+#: src/Model/User.php:671
+#, php-format
+msgid ""
+"\n"
+"\t\t\tThe login details are as follows:\n"
+"\n"
+"\t\t\tSite Location:\t%3$s\n"
+"\t\t\tLogin Name:\t\t%1$s\n"
+"\t\t\tPassword:\t\t%5$s\n"
+"\n"
+"\t\t\tYou may change your password from your account \"Settings\" page after logging\n"
+"\t\t\tin.\n"
+"\n"
+"\t\t\tPlease take a few moments to review the other account settings on that page.\n"
+"\n"
+"\t\t\tYou may also wish to add some basic information to your default profile\n"
+"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
+"\n"
+"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
+"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
+"\t\t\tperhaps what country you live in; if you do not wish to be more specific\n"
+"\t\t\tthan that.\n"
+"\n"
+"\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
+"\t\t\tIf you are new and do not know anybody here, they may help\n"
+"\t\t\tyou to make some new and interesting friends.\n"
+"\n"
+"\t\t\tIf you ever want to delete your account, you can do so at %3$s/removeme\n"
+"\n"
+"\t\t\tThank you and welcome to %2$s."
+msgstr "\n\t\t\tDe login details zijn de volgende:\n\n\t\t\tSite Locatie:\t%3$s\n\t\t\tLogin Naam:\t\t%1$s\n\t\t\tPaswoord:\t\t%5$s\n\n\t\t\tJe kunt je paswoord in de \"Instellingen\" pagina veranderen nadat je bent ingelogd.\n\n\t\t\tNeem een ogenblik de tijd om je andere instellingen na te kijken op die pagina.\n\n\t\t\tJe kunt ook wat basis informatie toevoegen aan je standaard profiel\n\t\t\t(in de \"Profielen\" pagina) zodat anderen je gemakkelijk kunnen vinden.\n\n\t\t\tWe raden aan je volledige naam in te vullen, een profiel foto toe te voegen,\n\t\t\tenkele profiel \"sleutelwoorden\" (zeer handig om nieuwe vrienden te leren kennen) - en\n\t\t\tmisschien in welk land je woont; als je niet meer details wil geven.\n\t\t\tWe respecteren je privacy volledig, en geen van deze velden zijn verplicht.\n\t\t\tAls je nieuw bent en niemand kent, dan kunnen zij je misschien\n\t\t\thelpen om enkele nieuwe en interessante vrienden te leren kennen.\n\n\t\t\tAls je ooit je account wil verwijderen, dan kan je dat via %3$s/removeme\n\n\t\t\tBedankt en welkom bij %2$s."
 
-#: src/Content/Text/BBCode.php:1769
-msgid "Invalid link protocol"
-msgstr "Ongeldig verbinding protocol"
+#: src/Model/Group.php:43
+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 "Een verwijderde groep met deze naam is weer tot leven gewekt. Bestaande itemrechten <strong>kunnen</strong> voor deze groep en toekomstige leden gelden. Wanneer je niet zo had bedoeld kan je een andere groep met een andere naam creëren. "
 
-#: src/Content/Widget/CalendarExport.php:61
-msgid "Export"
-msgstr "Exporteer"
+#: src/Model/Group.php:329
+msgid "Default privacy group for new contacts"
+msgstr "Standaard privacy groep voor nieuwe contacten"
 
-#: src/Content/Widget/CalendarExport.php:62
-msgid "Export calendar as ical"
-msgstr "Exporteer kalender als ical"
+#: src/Model/Group.php:362
+msgid "Everybody"
+msgstr "Iedereen"
 
-#: src/Content/Widget/CalendarExport.php:63
-msgid "Export calendar as csv"
-msgstr "Exporteer kalender als csv"
+#: src/Model/Group.php:382
+msgid "edit"
+msgstr "verander"
+
+#: src/Model/Group.php:406
+msgid "Edit group"
+msgstr "Verander groep"
+
+#: src/Model/Group.php:409
+msgid "Create a new group"
+msgstr "Maak nieuwe groep"
+
+#: src/Model/Group.php:411
+msgid "Edit groups"
+msgstr "Bewerk groepen"
+
+#: src/Model/Profile.php:97
+msgid "Requested account is not available."
+msgstr "Gevraagde account is niet beschikbaar."
+
+#: src/Model/Profile.php:163 src/Model/Profile.php:399
+#: src/Model/Profile.php:846
+msgid "Edit profile"
+msgstr "Bewerk profiel"
+
+#: src/Model/Profile.php:333
+msgid "Atom feed"
+msgstr "Atom feed"
+
+#: src/Model/Profile.php:372
+msgid "Manage/edit profiles"
+msgstr "Beheer/wijzig profielen"
+
+#: src/Model/Profile.php:550 src/Model/Profile.php:639
+msgid "g A l F d"
+msgstr "G l j F"
+
+#: src/Model/Profile.php:551
+msgid "F d"
+msgstr "d F"
+
+#: src/Model/Profile.php:604 src/Model/Profile.php:690
+msgid "[today]"
+msgstr "[vandaag]"
+
+#: src/Model/Profile.php:615
+msgid "Birthday Reminders"
+msgstr "Verjaardagsherinneringen"
+
+#: src/Model/Profile.php:616
+msgid "Birthdays this week:"
+msgstr "Verjaardagen deze week:"
+
+#: src/Model/Profile.php:677
+msgid "[No description]"
+msgstr "[Geen omschrijving]"
+
+#: src/Model/Profile.php:704
+msgid "Event Reminders"
+msgstr "Gebeurtenisherinneringen"
+
+#: src/Model/Profile.php:705
+msgid "Upcoming events the next 7 days:"
+msgstr "Evenementen de komende 7 dagen:"
+
+#: src/Model/Profile.php:728
+msgid "Member since:"
+msgstr "Lid sinds:"
+
+#: src/Model/Profile.php:736
+msgid "j F, Y"
+msgstr "F j Y"
+
+#: src/Model/Profile.php:737
+msgid "j F"
+msgstr "F j"
+
+#: src/Model/Profile.php:752
+msgid "Age:"
+msgstr "Leeftijd:"
+
+#: src/Model/Profile.php:765
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "voor %1$d %2$s"
+
+#: src/Model/Profile.php:789
+msgid "Religion:"
+msgstr "Religie:"
+
+#: src/Model/Profile.php:797
+msgid "Hobbies/Interests:"
+msgstr "Hobby:"
+
+#: src/Model/Profile.php:809
+msgid "Contact information and Social Networks:"
+msgstr "Contactinformatie en sociale netwerken:"
+
+#: src/Model/Profile.php:813
+msgid "Musical interests:"
+msgstr "Muzikale interesse "
+
+#: src/Model/Profile.php:817
+msgid "Books, literature:"
+msgstr "Boeken, literatuur:"
+
+#: src/Model/Profile.php:821
+msgid "Television:"
+msgstr "Televisie"
+
+#: src/Model/Profile.php:825
+msgid "Film/dance/culture/entertainment:"
+msgstr "Film/dans/cultuur/ontspanning:"
+
+#: src/Model/Profile.php:829
+msgid "Love/Romance:"
+msgstr "Liefde/romance:"
+
+#: src/Model/Profile.php:833
+msgid "Work/employment:"
+msgstr "Werk/beroep:"
+
+#: src/Model/Profile.php:837
+msgid "School/education:"
+msgstr "School/opleiding:"
+
+#: src/Model/Profile.php:842
+msgid "Forums:"
+msgstr "Fora:"
+
+#: src/Model/Profile.php:936
+msgid "Only You Can See This"
+msgstr "Alleen jij kunt dit zien"
+
+#: src/Model/Profile.php:944 src/Model/Profile.php:947
+msgid "Tips for New Members"
+msgstr "Tips voor nieuwe leden"
+
+#: src/Model/Profile.php:1106
+#, php-format
+msgid "OpenWebAuth: %1$s welcomes %2$s"
+msgstr "OpenWebAuth: %1$s verwelkomt %2$s"
+
+#: src/Content/Widget.php:33
+msgid "Add New Contact"
+msgstr "Nieuw Contact toevoegen"
+
+#: src/Content/Widget.php:34
+msgid "Enter address or web location"
+msgstr "Voeg een webadres of -locatie in:"
+
+#: src/Content/Widget.php:35
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Voorbeeld: jan@voorbeeld.be, http://voorbeeld.nl/barbara"
+
+#: src/Content/Widget.php:53
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d uitnodiging beschikbaar"
+msgstr[1] "%d uitnodigingen beschikbaar"
+
+#: src/Content/Widget.php:157
+msgid "Networks"
+msgstr "Netwerken"
+
+#: src/Content/Widget.php:160
+msgid "All Networks"
+msgstr "Alle netwerken"
+
+#: src/Content/Widget.php:198 src/Content/Feature.php:118
+msgid "Saved Folders"
+msgstr "Bewaarde Mappen"
+
+#: src/Content/Widget.php:201 src/Content/Widget.php:241
+msgid "Everything"
+msgstr "Alles"
+
+#: src/Content/Widget.php:238
+msgid "Categories"
+msgstr "Categorieën"
+
+#: src/Content/Widget.php:305
+#, php-format
+msgid "%d contact in common"
+msgid_plural "%d contacts in common"
+msgstr[0] "%d gedeeld contact"
+msgstr[1] "%d gedeelde contacten"
+
+#: src/Content/ContactSelector.php:54
+msgid "Frequently"
+msgstr "Frequent"
+
+#: src/Content/ContactSelector.php:55
+msgid "Hourly"
+msgstr "Ieder uur"
+
+#: src/Content/ContactSelector.php:56
+msgid "Twice daily"
+msgstr "Twee maal daags"
+
+#: src/Content/ContactSelector.php:57
+msgid "Daily"
+msgstr "Dagelijks"
+
+#: src/Content/ContactSelector.php:58
+msgid "Weekly"
+msgstr "Wekelijks"
+
+#: src/Content/ContactSelector.php:59
+msgid "Monthly"
+msgstr "Maandelijks"
+
+#: src/Content/ContactSelector.php:79
+msgid "OStatus"
+msgstr "OStatus"
+
+#: src/Content/ContactSelector.php:80
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: src/Content/ContactSelector.php:83
+msgid "Zot!"
+msgstr "Zot!"
+
+#: src/Content/ContactSelector.php:84
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: src/Content/ContactSelector.php:85
+msgid "XMPP/IM"
+msgstr "XMPP/Chat"
+
+#: src/Content/ContactSelector.php:86
+msgid "MySpace"
+msgstr "MySpace"
+
+#: src/Content/ContactSelector.php:87
+msgid "Google+"
+msgstr "Google+"
+
+#: src/Content/ContactSelector.php:88
+msgid "pump.io"
+msgstr "pump.io"
+
+#: src/Content/ContactSelector.php:89
+msgid "Twitter"
+msgstr "Twitter"
+
+#: src/Content/ContactSelector.php:90
+msgid "Diaspora Connector"
+msgstr "Diaspora Connector"
+
+#: src/Content/ContactSelector.php:91
+msgid "GNU Social Connector"
+msgstr "GNU Social Connector"
+
+#: src/Content/ContactSelector.php:92
+msgid "pnut"
+msgstr "pnut"
+
+#: src/Content/ContactSelector.php:122
+msgid "Male"
+msgstr "Mannelijk"
+
+#: src/Content/ContactSelector.php:122
+msgid "Female"
+msgstr "Vrouwelijk"
+
+#: src/Content/ContactSelector.php:122
+msgid "Currently Male"
+msgstr "Momenteel mannelijk"
+
+#: src/Content/ContactSelector.php:122
+msgid "Currently Female"
+msgstr "Momenteel vrouwelijk"
+
+#: src/Content/ContactSelector.php:122
+msgid "Mostly Male"
+msgstr "Hoofdzakelijk mannelijk"
+
+#: src/Content/ContactSelector.php:122
+msgid "Mostly Female"
+msgstr "Hoofdzakelijk vrouwelijk"
+
+#: src/Content/ContactSelector.php:122
+msgid "Transgender"
+msgstr "Transgender"
+
+#: src/Content/ContactSelector.php:122
+msgid "Intersex"
+msgstr "Intersex"
+
+#: src/Content/ContactSelector.php:122
+msgid "Transsexual"
+msgstr "Transeksueel"
+
+#: src/Content/ContactSelector.php:122
+msgid "Hermaphrodite"
+msgstr "Hermafrodiet"
+
+#: src/Content/ContactSelector.php:122
+msgid "Neuter"
+msgstr "Onzijdig"
+
+#: src/Content/ContactSelector.php:122
+msgid "Non-specific"
+msgstr "Niet-specifiek"
+
+#: src/Content/ContactSelector.php:122
+msgid "Other"
+msgstr "Anders"
+
+#: src/Content/ContactSelector.php:144
+msgid "Males"
+msgstr "Mannen"
+
+#: src/Content/ContactSelector.php:144
+msgid "Females"
+msgstr "Vrouwen"
+
+#: src/Content/ContactSelector.php:144
+msgid "Gay"
+msgstr "Homo"
+
+#: src/Content/ContactSelector.php:144
+msgid "Lesbian"
+msgstr "Lesbienne"
+
+#: src/Content/ContactSelector.php:144
+msgid "No Preference"
+msgstr "Geen voorkeur"
+
+#: src/Content/ContactSelector.php:144
+msgid "Bisexual"
+msgstr "Biseksueel"
+
+#: src/Content/ContactSelector.php:144
+msgid "Autosexual"
+msgstr "Autoseksueel"
+
+#: src/Content/ContactSelector.php:144
+msgid "Abstinent"
+msgstr "Onthouder"
+
+#: src/Content/ContactSelector.php:144
+msgid "Virgin"
+msgstr "Maagd"
+
+#: src/Content/ContactSelector.php:144
+msgid "Deviant"
+msgstr "Afwijkend"
+
+#: src/Content/ContactSelector.php:144
+msgid "Fetish"
+msgstr "Fetisj"
+
+#: src/Content/ContactSelector.php:144
+msgid "Oodles"
+msgstr "Veel"
+
+#: src/Content/ContactSelector.php:144
+msgid "Nonsexual"
+msgstr "Niet seksueel"
+
+#: src/Content/ContactSelector.php:166
+msgid "Single"
+msgstr "Alleenstaand"
+
+#: src/Content/ContactSelector.php:166
+msgid "Lonely"
+msgstr "Eenzaam"
+
+#: src/Content/ContactSelector.php:166
+msgid "Available"
+msgstr "Beschikbaar"
+
+#: src/Content/ContactSelector.php:166
+msgid "Unavailable"
+msgstr "Onbeschikbaar"
+
+#: src/Content/ContactSelector.php:166
+msgid "Has crush"
+msgstr "Verliefd"
+
+#: src/Content/ContactSelector.php:166
+msgid "Infatuated"
+msgstr "Smoorverliefd"
+
+#: src/Content/ContactSelector.php:166
+msgid "Dating"
+msgstr "Aan het daten"
+
+#: src/Content/ContactSelector.php:166
+msgid "Unfaithful"
+msgstr "Ontrouw"
+
+#: src/Content/ContactSelector.php:166
+msgid "Sex Addict"
+msgstr "Seksverslaafd"
+
+#: src/Content/ContactSelector.php:166
+msgid "Friends/Benefits"
+msgstr "Vriendschap plus"
+
+#: src/Content/ContactSelector.php:166
+msgid "Casual"
+msgstr "Ongebonden/vluchtig"
+
+#: src/Content/ContactSelector.php:166
+msgid "Engaged"
+msgstr "Verloofd"
+
+#: src/Content/ContactSelector.php:166
+msgid "Married"
+msgstr "Getrouwd"
+
+#: src/Content/ContactSelector.php:166
+msgid "Imaginarily married"
+msgstr "Denkbeeldig getrouwd"
+
+#: src/Content/ContactSelector.php:166
+msgid "Partners"
+msgstr "Partners"
+
+#: src/Content/ContactSelector.php:166
+msgid "Cohabiting"
+msgstr "Samenwonend"
+
+#: src/Content/ContactSelector.php:166
+msgid "Common law"
+msgstr "getrouwd voor-de-wet"
+
+#: src/Content/ContactSelector.php:166
+msgid "Happy"
+msgstr "Blij"
+
+#: src/Content/ContactSelector.php:166
+msgid "Not looking"
+msgstr "Niet op zoek"
+
+#: src/Content/ContactSelector.php:166
+msgid "Swinger"
+msgstr "Swinger"
+
+#: src/Content/ContactSelector.php:166
+msgid "Betrayed"
+msgstr "Bedrogen"
+
+#: src/Content/ContactSelector.php:166
+msgid "Separated"
+msgstr "Uit elkaar"
+
+#: src/Content/ContactSelector.php:166
+msgid "Unstable"
+msgstr "Onstabiel"
+
+#: src/Content/ContactSelector.php:166
+msgid "Divorced"
+msgstr "Gescheiden"
+
+#: src/Content/ContactSelector.php:166
+msgid "Imaginarily divorced"
+msgstr "Denkbeeldig gescheiden"
+
+#: src/Content/ContactSelector.php:166
+msgid "Widowed"
+msgstr "Weduwnaar/weduwe"
+
+#: src/Content/ContactSelector.php:166
+msgid "Uncertain"
+msgstr "Onzeker"
+
+#: src/Content/ContactSelector.php:166
+msgid "It's complicated"
+msgstr "Het is gecompliceerd"
+
+#: src/Content/ContactSelector.php:166
+msgid "Don't care"
+msgstr "Kan me niet schelen"
+
+#: src/Content/ContactSelector.php:166
+msgid "Ask me"
+msgstr "Vraag me"
 
 #: src/Content/Feature.php:79
 msgid "General Features"
@@ -8327,10 +9434,6 @@ msgstr "Categorieën berichten"
 msgid "Add categories to your posts"
 msgstr "Voeg categorieën toe aan je berichten"
 
-#: src/Content/Feature.php:118 src/Content/Widget.php:204
-msgid "Saved Folders"
-msgstr "Bewaarde Mappen"
-
 #: src/Content/Feature.php:118
 msgid "Ability to file posts under folders"
 msgstr "Mogelijkheid om berichten in mappen te bewaren"
@@ -8383,314 +9486,6 @@ msgstr "Toon Lidmaatschap Datum"
 msgid "Display membership date in profile"
 msgstr "Toon lidmaatschap datum in profiel"
 
-#: src/Content/ContactSelector.php:53
-msgid "Frequently"
-msgstr "Frequent"
-
-#: src/Content/ContactSelector.php:54
-msgid "Hourly"
-msgstr "Ieder uur"
-
-#: src/Content/ContactSelector.php:55
-msgid "Twice daily"
-msgstr "Twee maal daags"
-
-#: src/Content/ContactSelector.php:56
-msgid "Daily"
-msgstr "Dagelijks"
-
-#: src/Content/ContactSelector.php:57
-msgid "Weekly"
-msgstr "Wekelijks"
-
-#: src/Content/ContactSelector.php:58
-msgid "Monthly"
-msgstr "Maandelijks"
-
-#: src/Content/ContactSelector.php:78
-msgid "OStatus"
-msgstr "OStatus"
-
-#: src/Content/ContactSelector.php:79
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
-
-#: src/Content/ContactSelector.php:82
-msgid "Facebook"
-msgstr "Facebook"
-
-#: src/Content/ContactSelector.php:83
-msgid "Zot!"
-msgstr "Zot!"
-
-#: src/Content/ContactSelector.php:84
-msgid "LinkedIn"
-msgstr "LinkedIn"
-
-#: src/Content/ContactSelector.php:85
-msgid "XMPP/IM"
-msgstr "XMPP/Chat"
-
-#: src/Content/ContactSelector.php:86
-msgid "MySpace"
-msgstr "MySpace"
-
-#: src/Content/ContactSelector.php:87
-msgid "Google+"
-msgstr "Google+"
-
-#: src/Content/ContactSelector.php:88
-msgid "pump.io"
-msgstr "pump.io"
-
-#: src/Content/ContactSelector.php:89
-msgid "Twitter"
-msgstr "Twitter"
-
-#: src/Content/ContactSelector.php:90
-msgid "Diaspora Connector"
-msgstr "Diaspora Connector"
-
-#: src/Content/ContactSelector.php:91
-msgid "GNU Social Connector"
-msgstr "GNU Social Connector"
-
-#: src/Content/ContactSelector.php:92
-msgid "pnut"
-msgstr "pnut"
-
-#: src/Content/ContactSelector.php:93
-msgid "App.net"
-msgstr "App.net"
-
-#: src/Content/ContactSelector.php:123
-msgid "Male"
-msgstr "Mannelijk"
-
-#: src/Content/ContactSelector.php:123
-msgid "Female"
-msgstr "Vrouwelijk"
-
-#: src/Content/ContactSelector.php:123
-msgid "Currently Male"
-msgstr "Momenteel mannelijk"
-
-#: src/Content/ContactSelector.php:123
-msgid "Currently Female"
-msgstr "Momenteel vrouwelijk"
-
-#: src/Content/ContactSelector.php:123
-msgid "Mostly Male"
-msgstr "Hoofdzakelijk mannelijk"
-
-#: src/Content/ContactSelector.php:123
-msgid "Mostly Female"
-msgstr "Hoofdzakelijk vrouwelijk"
-
-#: src/Content/ContactSelector.php:123
-msgid "Transgender"
-msgstr "Transgender"
-
-#: src/Content/ContactSelector.php:123
-msgid "Intersex"
-msgstr "Intersex"
-
-#: src/Content/ContactSelector.php:123
-msgid "Transsexual"
-msgstr "Transeksueel"
-
-#: src/Content/ContactSelector.php:123
-msgid "Hermaphrodite"
-msgstr "Hermafrodiet"
-
-#: src/Content/ContactSelector.php:123
-msgid "Neuter"
-msgstr "Onzijdig"
-
-#: src/Content/ContactSelector.php:123
-msgid "Non-specific"
-msgstr "Niet-specifiek"
-
-#: src/Content/ContactSelector.php:123
-msgid "Other"
-msgstr "Anders"
-
-#: src/Content/ContactSelector.php:145
-msgid "Males"
-msgstr "Mannen"
-
-#: src/Content/ContactSelector.php:145
-msgid "Females"
-msgstr "Vrouwen"
-
-#: src/Content/ContactSelector.php:145
-msgid "Gay"
-msgstr "Homo"
-
-#: src/Content/ContactSelector.php:145
-msgid "Lesbian"
-msgstr "Lesbienne"
-
-#: src/Content/ContactSelector.php:145
-msgid "No Preference"
-msgstr "Geen voorkeur"
-
-#: src/Content/ContactSelector.php:145
-msgid "Bisexual"
-msgstr "Biseksueel"
-
-#: src/Content/ContactSelector.php:145
-msgid "Autosexual"
-msgstr "Autoseksueel"
-
-#: src/Content/ContactSelector.php:145
-msgid "Abstinent"
-msgstr "Onthouder"
-
-#: src/Content/ContactSelector.php:145
-msgid "Virgin"
-msgstr "Maagd"
-
-#: src/Content/ContactSelector.php:145
-msgid "Deviant"
-msgstr "Afwijkend"
-
-#: src/Content/ContactSelector.php:145
-msgid "Fetish"
-msgstr "Fetisj"
-
-#: src/Content/ContactSelector.php:145
-msgid "Oodles"
-msgstr "Veel"
-
-#: src/Content/ContactSelector.php:145
-msgid "Nonsexual"
-msgstr "Niet seksueel"
-
-#: src/Content/ContactSelector.php:167
-msgid "Single"
-msgstr "Alleenstaand"
-
-#: src/Content/ContactSelector.php:167
-msgid "Lonely"
-msgstr "Eenzaam"
-
-#: src/Content/ContactSelector.php:167
-msgid "Available"
-msgstr "Beschikbaar"
-
-#: src/Content/ContactSelector.php:167
-msgid "Unavailable"
-msgstr "Onbeschikbaar"
-
-#: src/Content/ContactSelector.php:167
-msgid "Has crush"
-msgstr "Verliefd"
-
-#: src/Content/ContactSelector.php:167
-msgid "Infatuated"
-msgstr "Smoorverliefd"
-
-#: src/Content/ContactSelector.php:167
-msgid "Dating"
-msgstr "Aan het daten"
-
-#: src/Content/ContactSelector.php:167
-msgid "Unfaithful"
-msgstr "Ontrouw"
-
-#: src/Content/ContactSelector.php:167
-msgid "Sex Addict"
-msgstr "Seksverslaafd"
-
-#: src/Content/ContactSelector.php:167 src/Model/User.php:558
-msgid "Friends"
-msgstr "Vrienden"
-
-#: src/Content/ContactSelector.php:167
-msgid "Friends/Benefits"
-msgstr "Vriendschap plus"
-
-#: src/Content/ContactSelector.php:167
-msgid "Casual"
-msgstr "Ongebonden/vluchtig"
-
-#: src/Content/ContactSelector.php:167
-msgid "Engaged"
-msgstr "Verloofd"
-
-#: src/Content/ContactSelector.php:167
-msgid "Married"
-msgstr "Getrouwd"
-
-#: src/Content/ContactSelector.php:167
-msgid "Imaginarily married"
-msgstr "Denkbeeldig getrouwd"
-
-#: src/Content/ContactSelector.php:167
-msgid "Partners"
-msgstr "Partners"
-
-#: src/Content/ContactSelector.php:167
-msgid "Cohabiting"
-msgstr "Samenwonend"
-
-#: src/Content/ContactSelector.php:167
-msgid "Common law"
-msgstr "getrouwd voor-de-wet"
-
-#: src/Content/ContactSelector.php:167
-msgid "Happy"
-msgstr "Blij"
-
-#: src/Content/ContactSelector.php:167
-msgid "Not looking"
-msgstr "Niet op zoek"
-
-#: src/Content/ContactSelector.php:167
-msgid "Swinger"
-msgstr "Swinger"
-
-#: src/Content/ContactSelector.php:167
-msgid "Betrayed"
-msgstr "Bedrogen"
-
-#: src/Content/ContactSelector.php:167
-msgid "Separated"
-msgstr "Uit elkaar"
-
-#: src/Content/ContactSelector.php:167
-msgid "Unstable"
-msgstr "Onstabiel"
-
-#: src/Content/ContactSelector.php:167
-msgid "Divorced"
-msgstr "Gescheiden"
-
-#: src/Content/ContactSelector.php:167
-msgid "Imaginarily divorced"
-msgstr "Denkbeeldig gescheiden"
-
-#: src/Content/ContactSelector.php:167
-msgid "Widowed"
-msgstr "Weduwnaar/weduwe"
-
-#: src/Content/ContactSelector.php:167
-msgid "Uncertain"
-msgstr "Onzeker"
-
-#: src/Content/ContactSelector.php:167
-msgid "It's complicated"
-msgstr "Het is gecompliceerd"
-
-#: src/Content/ContactSelector.php:167
-msgid "Don't care"
-msgstr "Kan me niet schelen"
-
-#: src/Content/ContactSelector.php:167
-msgid "Ask me"
-msgstr "Vraag me"
-
 #: src/Content/Nav.php:53
 msgid "Nothing new here"
 msgstr "Niets nieuw hier"
@@ -8811,6 +9606,18 @@ msgstr "Navigatie"
 msgid "Site map"
 msgstr "Sitemap"
 
+#: src/Content/Widget/CalendarExport.php:65
+msgid "Export"
+msgstr "Exporteer"
+
+#: src/Content/Widget/CalendarExport.php:66
+msgid "Export calendar as ical"
+msgstr "Exporteer kalender als ical"
+
+#: src/Content/Widget/CalendarExport.php:67
+msgid "Export calendar as csv"
+msgstr "Exporteer kalender als csv"
+
 #: src/Content/OEmbed.php:256
 msgid "Embedding disabled"
 msgstr "Inbedden uitgeschakeld"
@@ -8819,803 +9626,27 @@ msgstr "Inbedden uitgeschakeld"
 msgid "Embedded content"
 msgstr "Ingebedde inhoud"
 
-#: src/Content/Widget.php:32
-msgid "Add New Contact"
-msgstr "Nieuw Contact toevoegen"
-
-#: src/Content/Widget.php:33
-msgid "Enter address or web location"
-msgstr "Voeg een webadres of -locatie in:"
-
-#: src/Content/Widget.php:34
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Voorbeeld: jan@voorbeeld.be, http://voorbeeld.nl/barbara"
-
-#: src/Content/Widget.php:52
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d uitnodiging beschikbaar"
-msgstr[1] "%d uitnodigingen beschikbaar"
-
-#: src/Content/Widget.php:163
-msgid "Networks"
-msgstr "Netwerken"
-
-#: src/Content/Widget.php:166
-msgid "All Networks"
-msgstr "Alle netwerken"
-
-#: src/Content/Widget.php:207 src/Content/Widget.php:247
-msgid "Everything"
-msgstr "Alles"
-
-#: src/Content/Widget.php:244
-msgid "Categories"
-msgstr "Categorieën"
-
-#: src/Content/Widget.php:311
-#, php-format
-msgid "%d contact in common"
-msgid_plural "%d contacts in common"
-msgstr[0] "%d gedeeld contact"
-msgstr[1] "%d gedeelde contacten"
-
-#: src/Database/DBStructure.php:33
-msgid "There are no tables on MyISAM."
-msgstr "Er zijn geen MyISAM tabellen."
-
-#: src/Database/DBStructure.php:76
-#, 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 "\n\t\t\t\tDe Friendica ontwikkelaars hebben recent update %svrijgegeven,\n \t\t\t\tmaar wanneer ik deze probeerde te installeren ging het verschrikkelijk fout.\n \t\t\t\tDit moet snel opgelost worden en ik kan het niet alleen. Contacteer alstublieft\n \t\t\t\teen Friendica ontwikkelaar als je mij zelf niet kan helpen. Mijn database kan ongeldig zijn."
-
-#: src/Database/DBStructure.php:81
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
-msgstr "De foutboodschap is\n[pre]%s[/pre]"
-
-#: src/Database/DBStructure.php:192
-#, php-format
-msgid ""
-"\n"
-"Error %d occurred during database update:\n"
-"%s\n"
-msgstr "\nFout %d is opgetreden tijdens database update:\n%s\n"
-
-#: src/Database/DBStructure.php:195
-msgid "Errors encountered performing database changes: "
-msgstr "Fouten opgetreden tijdens database aanpassingen:"
-
-#: src/Database/DBStructure.php:211
-#, php-format
-msgid "%s: Database update"
-msgstr "%s: Database update"
-
-#: src/Database/DBStructure.php:473
-#, php-format
-msgid "%s: updating %s table."
-msgstr "%s: tabel %s aan het updaten."
-
-#: src/Model/Contact.php:733
-msgid "Drop Contact"
-msgstr "Verwijder contact"
-
-#: src/Model/Contact.php:1155
-msgid "Organisation"
-msgstr "Organisatie"
-
-#: src/Model/Contact.php:1159
-msgid "News"
-msgstr "Nieuws"
-
-#: src/Model/Contact.php:1163
-msgid "Forum"
-msgstr "Forum"
-
-#: src/Model/Contact.php:1343
-msgid "Connect URL missing."
-msgstr "Connectie URL ontbreekt."
-
-#: src/Model/Contact.php:1352
-msgid ""
-"The contact could not be added. Please check the relevant network "
-"credentials in your Settings -> Social Networks page."
-msgstr "Het contact kon niet toegevoegd worden. Gelieve de relevante netwerk gegevens na te kijken in Instellingen -> Sociale Netwerken."
-
-#: src/Model/Contact.php:1399
-msgid ""
-"This site is not configured to allow communications with other networks."
-msgstr "Deze website is niet geconfigureerd voor communicatie met andere netwerken."
-
-#: src/Model/Contact.php:1400 src/Model/Contact.php:1414
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr "Er werden geen compatibele communicatieprotocols of feeds ontdekt."
-
-#: src/Model/Contact.php:1412
-msgid "The profile address specified does not provide adequate information."
-msgstr "Het opgegeven profiel adres bevat geen adequate informatie."
-
-#: src/Model/Contact.php:1417
-msgid "An author or name was not found."
-msgstr "Er werd geen auteur of naam gevonden."
-
-#: src/Model/Contact.php:1420
-msgid "No browser URL could be matched to this address."
-msgstr "Er kan geen browser URL gematcht worden met dit adres."
-
-#: src/Model/Contact.php:1423
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
-msgstr "Het @-stijl-identiteitsadres komt niet overeen met een nekend protocol of e-mailcontact."
-
-#: src/Model/Contact.php:1424
-msgid "Use mailto: in front of address to force email check."
-msgstr "Gebruik mailto: voor het adres om een e-mailcontrole af te dwingen."
-
-#: src/Model/Contact.php:1430
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
-msgstr "Het opgegeven profiel adres behoort tot een netwerk dat gedeactiveerd is op deze site."
-
-#: src/Model/Contact.php:1435
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr "Profiel met restricties. Deze peresoon zal geen directe/persoonlijke notificaties van jou kunnen ontvangen."
-
-#: src/Model/Contact.php:1486
-msgid "Unable to retrieve contact information."
-msgstr "Het was niet mogelijk informatie over dit contact op te halen."
-
-#: src/Model/Contact.php:1716 src/Protocol/DFRN.php:1496
-#, php-format
-msgid "%s's birthday"
-msgstr "%s's verjaardag"
-
-#: src/Model/Contact.php:1717 src/Protocol/DFRN.php:1497
-#, php-format
-msgid "Happy Birthday %s"
-msgstr "Gefeliciteerd %s"
-
-#: src/Model/Event.php:59 src/Model/Event.php:76 src/Model/Event.php:428
-#: src/Model/Event.php:894
-msgid "Starts:"
-msgstr "Begint:"
-
-#: src/Model/Event.php:62 src/Model/Event.php:82 src/Model/Event.php:429
-#: src/Model/Event.php:898
-msgid "Finishes:"
-msgstr "Eindigt:"
-
-#: src/Model/Event.php:377
-msgid "all-day"
-msgstr "de hele dag"
-
-#: src/Model/Event.php:400
-msgid "Jun"
-msgstr "Jun"
-
-#: src/Model/Event.php:403
-msgid "Sept"
-msgstr "Sep"
-
-#: src/Model/Event.php:426
-msgid "No events to display"
-msgstr "Geen gebeurtenissen te tonen"
-
-#: src/Model/Event.php:550
-msgid "l, F j"
-msgstr "l j F"
-
-#: src/Model/Event.php:578
-msgid "Edit event"
-msgstr "Gebeurtenis bewerken"
-
-#: src/Model/Event.php:579
-msgid "Duplicate event"
-msgstr "Duplicate gebeurtenis"
-
-#: src/Model/Event.php:580
-msgid "Delete event"
-msgstr "Verwijder gebeurtenis"
-
-#: src/Model/Event.php:827
-msgid "D g:i A"
-msgstr "D g:i A"
-
-#: src/Model/Event.php:828
-msgid "g:i A"
-msgstr "g:i A"
-
-#: src/Model/Event.php:913 src/Model/Event.php:915
-msgid "Show map"
-msgstr "Toon kaart"
-
-#: src/Model/Event.php:914
-msgid "Hide map"
-msgstr "Verberg kaart"
-
-#: src/Model/Group.php:43
-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 "Een verwijderde groep met deze naam is weer tot leven gewekt. Bestaande itemrechten <strong>kunnen</strong> voor deze groep en toekomstige leden gelden. Wanneer je niet zo had bedoeld kan je een andere groep met een andere naam creëren. "
-
-#: src/Model/Group.php:340
-msgid "Default privacy group for new contacts"
-msgstr "Standaard privacy groep voor nieuwe contacten"
-
-#: src/Model/Group.php:373
-msgid "Everybody"
-msgstr "Iedereen"
-
-#: src/Model/Group.php:393
-msgid "edit"
-msgstr "verander"
-
-#: src/Model/Group.php:417
-msgid "Edit group"
-msgstr "Verander groep"
-
-#: src/Model/Group.php:420
-msgid "Create a new group"
-msgstr "Maak nieuwe groep"
-
-#: src/Model/Group.php:422
-msgid "Edit groups"
-msgstr "Bewerk groepen"
-
-#: src/Model/Mail.php:39 src/Model/Mail.php:173
-msgid "[no subject]"
-msgstr "[geen onderwerp]"
-
-#: src/Model/User.php:165
-msgid "Login failed"
-msgstr "Login mislukt"
-
-#: src/Model/User.php:196
-msgid "Not enough information to authenticate"
-msgstr "Niet genoeg informatie om te authentificeren"
-
-#: src/Model/User.php:381
-msgid "An invitation is required."
-msgstr "Een uitnodiging is vereist."
-
-#: src/Model/User.php:385
-msgid "Invitation could not be verified."
-msgstr "Uitnodiging kon niet geverifieerd worden."
-
-#: src/Model/User.php:392
-msgid "Invalid OpenID url"
-msgstr "Ongeldige OpenID url"
-
-#: src/Model/User.php:405 src/Module/Login.php:100
-msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr "Er is een probleem opgetreden bij het inloggen met het opgegeven OpenID. Kijk alsjeblieft de spelling van deze ID na."
-
-#: src/Model/User.php:405 src/Module/Login.php:100
-msgid "The error message was:"
-msgstr "De foutboodschap was:"
-
-#: src/Model/User.php:411
-msgid "Please enter the required information."
-msgstr "Vul de vereiste informatie in."
-
-#: src/Model/User.php:424
-msgid "Please use a shorter name."
-msgstr "gebruik een kortere naam"
-
-#: src/Model/User.php:427
-msgid "Name too short."
-msgstr "Naam te kort"
-
-#: src/Model/User.php:435
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr "Dat lijkt niet je volledige naam (voor- en achternaam) te zijn."
-
-#: src/Model/User.php:440
-msgid "Your email domain is not among those allowed on this site."
-msgstr "Je e-maildomein is op deze website niet toegestaan."
-
-#: src/Model/User.php:444
-msgid "Not a valid email address."
-msgstr "Geen geldig e-mailadres."
-
-#: src/Model/User.php:447
-msgid "The nickname was blocked from registration by the nodes admin."
-msgstr "De bijnaam werd geblokkeerd voor registratie door de node admin"
-
-#: src/Model/User.php:451 src/Model/User.php:459
-msgid "Cannot use that email."
-msgstr "Ik kan die e-mail niet gebruiken."
-
-#: src/Model/User.php:466
-msgid "Your nickname can only contain a-z, 0-9 and _."
-msgstr "Je bijnaam mag alleen a-z, 0-9 of _ bevatten."
-
-#: src/Model/User.php:473 src/Model/User.php:530
-msgid "Nickname is already registered. Please choose another."
-msgstr "Bijnaam is al geregistreerd. Kies een andere."
-
-#: src/Model/User.php:483
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr "ERNSTIGE FOUT: aanmaken van beveiligingssleutels mislukt."
-
-#: src/Model/User.php:517 src/Model/User.php:521
-msgid "An error occurred during registration. Please try again."
-msgstr "Er is een fout opgetreden tijdens de registratie. Probeer opnieuw."
-
-#: src/Model/User.php:546
-msgid "An error occurred creating your default profile. Please try again."
-msgstr "Er is een fout opgetreden bij het aanmaken van je standaard profiel. Probeer opnieuw."
-
-#: src/Model/User.php:553
-msgid "An error occurred creating your self contact. Please try again."
-msgstr "Er is een fout opgetreden bij het aanmaken van je self contact. Probeer opnieuw."
-
-#: src/Model/User.php:562
-msgid ""
-"An error occurred creating your default contact group. Please try again."
-msgstr "Er is een fout opgetreden bij het aanmaken van je standaard contact groep. Probeer opnieuw."
-
-#: src/Model/User.php:636
-#, php-format
-msgid ""
-"\n"
-"\t\t\tDear %1$s,\n"
-"\t\t\t\tThank you for registering at %2$s. Your account is pending for approval by the administrator.\n"
-"\t\t"
-msgstr "\n\t\t\tBeste %1$s,\n\t\t\t\tBedant voor je registratie bij %2$s. De aanmaak van je account wacht op goedkeuring door de beheerder.\n\t\t"
-
-#: src/Model/User.php:646
-#, php-format
-msgid "Registration at %s"
-msgstr "Registratie bij %s"
-
-#: src/Model/User.php:664
-#, php-format
-msgid ""
-"\n"
-"\t\t\tDear %1$s,\n"
-"\t\t\t\tThank you for registering at %2$s. Your account has been created.\n"
-"\t\t"
-msgstr "\n\t\t\tBeste %1$s,\n\t\t\t\tBedankt voor je registratie bij %2$s. Je account is aangemaakt.\n\t\t"
-
-#: src/Model/User.php:668
-#, php-format
-msgid ""
-"\n"
-"\t\t\tThe login details are as follows:\n"
-"\n"
-"\t\t\tSite Location:\t%3$s\n"
-"\t\t\tLogin Name:\t\t%1$s\n"
-"\t\t\tPassword:\t\t%5$s\n"
-"\n"
-"\t\t\tYou may change your password from your account \"Settings\" page after logging\n"
-"\t\t\tin.\n"
-"\n"
-"\t\t\tPlease take a few moments to review the other account settings on that page.\n"
-"\n"
-"\t\t\tYou may also wish to add some basic information to your default profile\n"
-"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
-"\n"
-"\t\t\tWe recommend setting your full name, adding a profile photo,\n"
-"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
-"\t\t\tperhaps what country you live in; if you do not wish to be more specific\n"
-"\t\t\tthan that.\n"
-"\n"
-"\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
-"\t\t\tIf you are new and do not know anybody here, they may help\n"
-"\t\t\tyou to make some new and interesting friends.\n"
-"\n"
-"\t\t\tIf you ever want to delete your account, you can do so at %3$s/removeme\n"
-"\n"
-"\t\t\tThank you and welcome to %2$s."
-msgstr "\n\t\t\tDe login details zijn de volgende:\n\n\t\t\tSite Locatie:\t%3$s\n\t\t\tLogin Naam:\t\t%1$s\n\t\t\tPaswoord:\t\t%5$s\n\n\t\t\tJe kunt je paswoord in de \"Instellingen\" pagina veranderen nadat je bent ingelogd.\n\n\t\t\tNeem een ogenblik de tijd om je andere instellingen na te kijken op die pagina.\n\n\t\t\tJe kunt ook wat basis informatie toevoegen aan je standaard profiel\n\t\t\t(in de \"Profielen\" pagina) zodat anderen je gemakkelijk kunnen vinden.\n\n\t\t\tWe raden aan je volledige naam in te vullen, een profiel foto toe te voegen,\n\t\t\tenkele profiel \"sleutelwoorden\" (zeer handig om nieuwe vrienden te leren kennen) - en\n\t\t\tmisschien in welk land je woont; als je niet meer details wil geven.\n\t\t\tWe respecteren je privacy volledig, en geen van deze velden zijn verplicht.\n\t\t\tAls je nieuw bent en niemand kent, dan kunnen zij je misschien\n\t\t\thelpen om enkele nieuwe en interessante vrienden te leren kennen.\n\n\t\t\tAls je ooit je account wil verwijderen, dan kan je dat via %3$s/removeme\n\n\t\t\tBedankt en welkom bij %2$s."
-
-#: src/Model/Profile.php:96
-msgid "Requested account is not available."
-msgstr "Gevraagde account is niet beschikbaar."
-
-#: src/Model/Profile.php:164 src/Model/Profile.php:397
-#: src/Model/Profile.php:855
-msgid "Edit profile"
-msgstr "Bewerk profiel"
-
-#: src/Model/Profile.php:334
-msgid "Atom feed"
-msgstr "Atom feed"
-
-#: src/Model/Profile.php:370
-msgid "Manage/edit profiles"
-msgstr "Beheer/wijzig profielen"
-
-#: src/Model/Profile.php:548 src/Model/Profile.php:637
-msgid "g A l F d"
-msgstr "G l j F"
-
-#: src/Model/Profile.php:549
-msgid "F d"
-msgstr "d F"
-
-#: src/Model/Profile.php:602 src/Model/Profile.php:699
-msgid "[today]"
-msgstr "[vandaag]"
-
-#: src/Model/Profile.php:613
-msgid "Birthday Reminders"
-msgstr "Verjaardagsherinneringen"
-
-#: src/Model/Profile.php:614
-msgid "Birthdays this week:"
-msgstr "Verjaardagen deze week:"
-
-#: src/Model/Profile.php:686
-msgid "[No description]"
-msgstr "[Geen omschrijving]"
-
-#: src/Model/Profile.php:713
-msgid "Event Reminders"
-msgstr "Gebeurtenisherinneringen"
-
-#: src/Model/Profile.php:714
-msgid "Upcoming events the next 7 days:"
-msgstr "Evenementen de komende 7 dagen:"
-
-#: src/Model/Profile.php:737
-msgid "Member since:"
-msgstr "Lid sinds:"
-
-#: src/Model/Profile.php:745
-msgid "j F, Y"
-msgstr "F j Y"
-
-#: src/Model/Profile.php:746
-msgid "j F"
-msgstr "F j"
-
-#: src/Model/Profile.php:761
-msgid "Age:"
-msgstr "Leeftijd:"
-
-#: src/Model/Profile.php:774
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "voor %1$d %2$s"
-
-#: src/Model/Profile.php:798
-msgid "Religion:"
-msgstr "Religie:"
-
-#: src/Model/Profile.php:806
-msgid "Hobbies/Interests:"
-msgstr "Hobby:"
-
-#: src/Model/Profile.php:818
-msgid "Contact information and Social Networks:"
-msgstr "Contactinformatie en sociale netwerken:"
-
-#: src/Model/Profile.php:822
-msgid "Musical interests:"
-msgstr "Muzikale interesse "
-
-#: src/Model/Profile.php:826
-msgid "Books, literature:"
-msgstr "Boeken, literatuur:"
-
-#: src/Model/Profile.php:830
-msgid "Television:"
-msgstr "Televisie"
-
-#: src/Model/Profile.php:834
-msgid "Film/dance/culture/entertainment:"
-msgstr "Film/dans/cultuur/ontspanning:"
-
-#: src/Model/Profile.php:838
-msgid "Love/Romance:"
-msgstr "Liefde/romance:"
-
-#: src/Model/Profile.php:842
-msgid "Work/employment:"
-msgstr "Werk/beroep:"
-
-#: src/Model/Profile.php:846
-msgid "School/education:"
-msgstr "School/opleiding:"
-
-#: src/Model/Profile.php:851
-msgid "Forums:"
-msgstr "Fora:"
-
-#: src/Model/Profile.php:945
-msgid "Only You Can See This"
-msgstr "Alleen jij kunt dit zien"
-
-#: src/Model/Profile.php:953 src/Model/Profile.php:956
-msgid "Tips for New Members"
-msgstr "Tips voor nieuwe leden"
-
-#: src/Model/Profile.php:1115
-#, php-format
-msgid "OpenWebAuth: %1$s welcomes %2$s"
-msgstr "OpenWebAuth: %1$s verwelkomt %2$s"
-
-#: src/Protocol/Diaspora.php:2449
-msgid "Sharing notification from Diaspora network"
-msgstr "Deelt notificatie van het Diaspora netwerk"
-
-#: src/Protocol/Diaspora.php:3545
-msgid "Attachments:"
-msgstr "Bijlagen:"
-
-#: src/Protocol/OStatus.php:1816
-#, php-format
-msgid "%s is now following %s."
-msgstr "%s volgt nu %s."
-
-#: src/Protocol/OStatus.php:1817
-msgid "following"
-msgstr "volgend"
-
-#: src/Protocol/OStatus.php:1820
-#, php-format
-msgid "%s stopped following %s."
-msgstr "%s stopte %s te volgen."
-
-#: src/Protocol/OStatus.php:1821
-msgid "stopped following"
-msgstr "is gestopt met volgen"
-
-#: src/Worker/Delivery.php:439
-msgid "(no subject)"
-msgstr "(geen onderwerp)"
-
-#: src/Module/Logout.php:28
-msgid "Logged out."
-msgstr "Uitgelogd."
-
-#: src/Module/Tos.php:34 src/Module/Tos.php:74
-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"
-" name), an username (nickname) and a working email address. The names will "
-"be accessible on the profile page of the account by any visitor of the page,"
-" even if other profile details are not displayed. The email address will "
-"only be used to send the user notifications about interactions, but wont be "
-"visibly displayed. The listing of an account in the node's user directory or"
-" the global user directory is optional and can be controlled in the user "
-"settings, it is not necessary for communication."
-msgstr "Op het moment van de registratie, en om communicatie mogelijk te maken tussen de gebruikersaccount en zijn of haar contacten, moet de gebruiker een weergave naam opgeven, een gebruikersnaam (bijnaam) en een werkend email adres. De namen zullen toegankelijk zijn op de profiel pagina van het account voor elke bezoeker van de pagina, zelfs als andere profiel details niet getoond worden. Het email adres zal enkel gebruikt worden om de gebruiker notificaties te sturen over interacties, maar zal niet zichtbaar getoond worden. Het oplijsten van een account in de gids van de node van de gebruiker of in de globale gids is optioneel en kan beheerd worden in de gebruikersinstellingen, dit is niet nodig voor communicatie."
-
-#: src/Module/Tos.php:35 src/Module/Tos.php:75
-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 "Deze data is vereist voor communicatie en wordt doorgegeven aan de nodes van de communicatie partners en wordt daar opgeslagen. Gebruikers kunnen bijkomende privé data opgeven die mag doorgegeven worden aan de accounts van de communicatie partners."
-
-#: src/Module/Tos.php:36 src/Module/Tos.php:76
-#, php-format
-msgid ""
-"At any point in time a logged in user can export their account data from the"
-" <a href=\"%1$s/settings/uexport\">account settings</a>. If the user wants "
-"to delete their account they can do so at <a "
-"href=\"%1$s/removeme\">%1$s/removeme</a>. The deletion of the account will "
-"be permanent. Deletion of the data will also be requested from the nodes of "
-"the communication partners."
-msgstr "Een ingelogd gebruiker kan op elk moment zijn of haar account data exporteren via <a href=\"%1$s/settings/uexport\">account instellingen</a>. Een gebruiker kan ook zijn of haar account verwijderen via <a href=\"%1$s/removeme\">%1$s/removeme</a>. De verwijdering van het account is permanent. Ook zal aan andere nodes van communicatie partners gevraagd worden om de data te verwijderen."
-
-#: src/Module/Tos.php:39 src/Module/Tos.php:73
-msgid "Privacy Statement"
-msgstr "Privacy Verklaring"
-
-#: src/Module/Login.php:282
-msgid "Create a New Account"
-msgstr "Nieuwe account aanmaken"
-
-#: src/Module/Login.php:315
-msgid "Password: "
-msgstr "Wachtwoord:"
-
-#: src/Module/Login.php:316
-msgid "Remember me"
-msgstr "Onthou me"
-
-#: src/Module/Login.php:319
-msgid "Or login using OpenID: "
-msgstr "Of log in met OpenID:"
-
-#: src/Module/Login.php:325
-msgid "Forgot your password?"
-msgstr "Wachtwoord vergeten?"
-
-#: src/Module/Login.php:328
-msgid "Website Terms of Service"
-msgstr "Gebruikersvoorwaarden website"
-
-#: src/Module/Login.php:329
-msgid "terms of service"
-msgstr "servicevoorwaarden"
-
-#: src/Module/Login.php:331
-msgid "Website Privacy Policy"
-msgstr "Privacybeleid website"
-
-#: src/Module/Login.php:332
-msgid "privacy policy"
-msgstr "privacybeleid"
-
-#: src/Object/Post.php:129
-msgid "This entry was edited"
-msgstr "Deze entry werd bewerkt"
-
-#: src/Object/Post.php:189
-msgid "Delete globally"
-msgstr "Verwijder globaal"
-
-#: src/Object/Post.php:189
-msgid "Remove locally"
-msgstr "Verwijder lokaal"
-
-#: src/Object/Post.php:202
-msgid "save to folder"
-msgstr "Bewaren in map"
-
-#: src/Object/Post.php:231
-msgid "I will attend"
-msgstr "Ik zal er zijn"
-
-#: src/Object/Post.php:231
-msgid "I will not attend"
-msgstr "Ik zal er niet zijn"
-
-#: src/Object/Post.php:231
-msgid "I might attend"
-msgstr "Ik ga misschien"
-
-#: src/Object/Post.php:259
-msgid "add star"
-msgstr "ster toevoegen"
-
-#: src/Object/Post.php:260
-msgid "remove star"
-msgstr "ster verwijderen"
-
-#: src/Object/Post.php:261
-msgid "toggle star status"
-msgstr "ster toevoegen of verwijderen"
-
-#: src/Object/Post.php:264
-msgid "starred"
-msgstr "met ster"
-
-#: src/Object/Post.php:270
-msgid "ignore thread"
-msgstr "Negeer gesprek"
-
-#: src/Object/Post.php:271
-msgid "unignore thread"
-msgstr "Stop met gesprek te negeren"
-
-#: src/Object/Post.php:272
-msgid "toggle ignore status"
-msgstr "verwissel negeer status"
-
-#: src/Object/Post.php:281
-msgid "add tag"
-msgstr "label toevoegen"
-
-#: src/Object/Post.php:292
-msgid "like"
-msgstr "leuk"
-
-#: src/Object/Post.php:293
-msgid "dislike"
-msgstr "niet leuk"
-
-#: src/Object/Post.php:296
-msgid "Share this"
-msgstr "Delen"
-
-#: src/Object/Post.php:296
-msgid "share"
-msgstr "Delen"
-
-#: src/Object/Post.php:363
-msgid "to"
-msgstr "aan"
-
-#: src/Object/Post.php:364
-msgid "via"
-msgstr "via"
-
-#: src/Object/Post.php:365
-msgid "Wall-to-Wall"
-msgstr "wall-to-wall"
-
-#: src/Object/Post.php:366
-msgid "via Wall-To-Wall:"
-msgstr "via wall-to-wall"
-
-#: src/Object/Post.php:425
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d reactie"
-msgstr[1] "%d reacties"
-
-#: src/Object/Post.php:795
-msgid "Bold"
-msgstr "Vet"
-
-#: src/Object/Post.php:796
-msgid "Italic"
-msgstr "Cursief"
-
-#: src/Object/Post.php:797
-msgid "Underline"
-msgstr "Onderstrepen"
-
-#: src/Object/Post.php:798
-msgid "Quote"
-msgstr "Citeren"
-
-#: src/Object/Post.php:799
-msgid "Code"
-msgstr "Broncode"
-
-#: src/Object/Post.php:800
-msgid "Image"
-msgstr "Afbeelding"
-
-#: src/Object/Post.php:801
-msgid "Link"
-msgstr "Link"
-
-#: src/Object/Post.php:802
-msgid "Video"
-msgstr "Video"
-
-#: src/App.php:783
-msgid "Delete this item?"
-msgstr "Dit item verwijderen?"
-
-#: src/App.php:785
-msgid "show fewer"
-msgstr "Minder tonen"
-
-#: src/App.php:1383
-msgid "No system theme config value set."
-msgstr "Geen systeem thema configuratie ingesteld."
-
-#: boot.php:686
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr "Wijziging %s mislukt. Lees de error logbestanden."
-
-#: update.php:194
-#, php-format
-msgid "%s: Updating author-id and owner-id in item and thread table. "
-msgstr "%s: author-id en owner-id in item en gesprekstabel aan het updaten."
-
-#: update.php:240
-#, php-format
-msgid "%s: Updating post-type."
-msgstr "%s: bericht-type bewerken"
-
-#: index.php:460
-msgid "toggle mobile"
-msgstr "mobiel thema omwisselen"
+#: src/Content/Text/BBCode.php:423
+msgid "view full size"
+msgstr "Volledig formaat"
+
+#: src/Content/Text/BBCode.php:853 src/Content/Text/BBCode.php:1626
+#: src/Content/Text/BBCode.php:1627
+msgid "Image/photo"
+msgstr "Afbeelding/foto"
+
+#: src/Content/Text/BBCode.php:1553 src/Content/Text/BBCode.php:1575
+msgid "$1 wrote:"
+msgstr "$1 schreef:"
+
+#: src/Content/Text/BBCode.php:1635 src/Content/Text/BBCode.php:1636
+msgid "Encrypted content"
+msgstr "Versleutelde inhoud"
+
+#: src/Content/Text/BBCode.php:1755
+msgid "Invalid source protocol"
+msgstr "Ongeldig bron protocol"
+
+#: src/Content/Text/BBCode.php:1766
+msgid "Invalid link protocol"
+msgstr "Ongeldig verbinding protocol"

From 382a7f5acdd2ff0f995f760ce7a8173ad01761fa Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Mon, 17 Sep 2018 23:17:41 -0400
Subject: [PATCH 82/96] Create new HTML::toMarkdown wrapper

---
 src/Content/Text/BBCode.php |  4 +---
 src/Content/Text/HTML.php   | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index d0f512ce13..c3453bcf72 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -25,7 +25,6 @@ use Friendica\Util\Map;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
 use Friendica\Util\Proxy as ProxyUtils;
-use League\HTMLToMarkdown\HtmlConverter;
 
 class BBCode extends BaseObject
 {
@@ -1942,8 +1941,7 @@ class BBCode extends BaseObject
 		$stamp1 = microtime(true);
 
 		// Now convert HTML to Markdown
-		$converter = new HtmlConverter();
-		$text = $converter->convert($text);
+		$text = HTML::toMarkdown($text);
 
 		// unmask the special chars back to HTML
 		$text = str_replace(['&\_lt\_;', '&\_gt\_;', '&\_amp\_;'], ['&lt;', '&gt;', '&amp;'], $text);
diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index 9a9f24f97f..c256717a15 100644
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -11,6 +11,7 @@ use DOMXPath;
 use Friendica\Core\Addon;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
+use League\HTMLToMarkdown\HtmlConverter;
 
 class HTML
 {
@@ -672,4 +673,19 @@ class HTML
 
 		return trim($message);
 	}
+
+	/**
+	 * Converts provided HTML code to Markdown. The hardwrap parameter maximizes
+	 * compatibility with Diaspora in spite of the Markdown standards.
+	 *
+	 * @param string $html
+	 * @return string
+	 */
+	public static function toMarkdown($html)
+	{
+		$converter = new HtmlConverter(['hard_break' => true]);
+		$markdown = $converter->convert($html);
+
+		return $markdown;
+	}
 }

From d6985baaed150b1dc1e8ace1d86b097c2c8861fb Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Mon, 17 Sep 2018 23:18:34 -0400
Subject: [PATCH 83/96] Improve mod/babel

- Handle multiple line endings
- Conserve HTML special chars in input box on submit
- Add new result panel with HTML::toMarkdown result
---
 mod/babel.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mod/babel.php b/mod/babel.php
index fcd63113e8..e5ae96be70 100644
--- a/mod/babel.php
+++ b/mod/babel.php
@@ -10,7 +10,7 @@ function visible_whitespace($s)
 {
 	$s = str_replace(' ', '&nbsp;', $s);
 
-	return str_replace("\n", '<br />', $s);
+	return str_replace(["\r\n", "\n", "\r"], '<br />', $s);
 }
 
 function babel_content()
@@ -114,6 +114,12 @@ function babel_content()
 					'content' => visible_whitespace($bbcode)
 				];
 
+				$markdown = Text\HTML::toMarkdown($html);
+				$results[] = [
+					'title' => L10n::t('HTML::toMarkdown'),
+					'content' => visible_whitespace($markdown)
+				];
+
 				$text = Text\HTML::toPlaintext($html);
 				$results[] = [
 					'title' => L10n::t('HTML::toPlaintext'),
@@ -124,7 +130,7 @@ function babel_content()
 
 	$tpl = get_markup_template('babel.tpl');
 	$o = replace_macros($tpl, [
-		'$text'          => ['text', L10n::t('Source text'), defaults($_REQUEST, 'text', ''), ''],
+		'$text'          => ['text', L10n::t('Source text'), htmlentities(defaults($_REQUEST, 'text', '')), ''],
 		'$type_bbcode'   => ['type', L10n::t('BBCode'), 'bbcode', '', defaults($_REQUEST, 'type', 'bbcode') == 'bbcode'],
 		'$type_markdown' => ['type', L10n::t('Markdown'), 'markdown', '', defaults($_REQUEST, 'type', 'bbcode') == 'markdown'],
 		'$type_html'     => ['type', L10n::t('HTML'), 'html', '', defaults($_REQUEST, 'type', 'bbcode') == 'html'],

From 71575671a520846e30850479a8a6482091bd5246 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Tue, 18 Sep 2018 08:58:31 -0400
Subject: [PATCH 84/96] [Composer] Update league/html-to-markdown to version
 4.8.0

---
 composer.json |  2 +-
 composer.lock | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index e30dd7bdb1..c717775506 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
 		"asika/simple-console": "^1.0",
 		"divineomega/password_exposed": "^2.4",
 		"ezyang/htmlpurifier": "~4.7.0",
-		"league/html-to-markdown": "~4.4.1",
+		"league/html-to-markdown": "~4.8.0",
 		"lightopenid/lightopenid": "dev-master",
 		"michelf/php-markdown": "^1.7",
 		"mobiledetect/mobiledetectlib": "2.8.*",
diff --git a/composer.lock b/composer.lock
index fca91452ef..b0ff745c68 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "dbe452683e73047b19dd17173d3f32ae",
+    "content-hash": "5f6a43237dc52758484cd21cd76e8ce6",
     "packages": [
         {
             "name": "asika/simple-console",
@@ -483,16 +483,16 @@
         },
         {
             "name": "league/html-to-markdown",
-            "version": "4.4.1",
+            "version": "4.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/html-to-markdown.git",
-                "reference": "82ea375b5b2b1da1da222644c0565c695bf88186"
+                "reference": "f9a879a068c68ff47b722de63f58bec79e448f9d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/82ea375b5b2b1da1da222644c0565c695bf88186",
-                "reference": "82ea375b5b2b1da1da222644c0565c695bf88186",
+                "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/f9a879a068c68ff47b722de63f58bec79e448f9d",
+                "reference": "f9a879a068c68ff47b722de63f58bec79e448f9d",
                 "shasum": ""
             },
             "require": {
@@ -511,7 +511,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.5-dev"
+                    "dev-master": "4.9-dev"
                 }
             },
             "autoload": {
@@ -524,17 +524,17 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Colin O'Dell",
-                    "email": "colinodell@gmail.com",
-                    "homepage": "http://www.colinodell.com",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Nick Cernis",
                     "email": "nick@cern.is",
                     "homepage": "http://modernnerd.net",
                     "role": "Original Author"
+                },
+                {
+                    "name": "Colin O'Dell",
+                    "email": "colinodell@gmail.com",
+                    "homepage": "https://www.colinodell.com",
+                    "role": "Lead Developer"
                 }
             ],
             "description": "An HTML-to-markdown conversion helper for PHP",
@@ -543,7 +543,7 @@
                 "html",
                 "markdown"
             ],
-            "time": "2017-03-16T00:45:59+00:00"
+            "time": "2018-09-18T12:18:08+00:00"
         },
         {
             "name": "lightopenid/lightopenid",

From d5f00569f0ecd935582e0ef0fa42690e31015cb8 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Wed, 19 Sep 2018 11:16:47 +0200
Subject: [PATCH 85/96] regen credits

---
 util/credits.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/util/credits.txt b/util/credits.txt
index edbfbfdd55..ff430c9273 100644
--- a/util/credits.txt
+++ b/util/credits.txt
@@ -5,6 +5,7 @@ Adam Clark
 Adam Jurkiewicz
 Adam Magness
 Aditoo
+Aditoo17
 AgnesElisa
 Albert
 Alberto Díaz Tormo
@@ -99,6 +100,7 @@ hoergen
 Hubert Kościański
 Hypolite Petovan
 Ilmari
+ImgBotApp
 irhen
 Jak
 Jakob
@@ -161,6 +163,7 @@ Pascal Deklerck
 Pavel Morozov
 PerigGouanvic
 peturisfeld
+Philipp
 Philipp Holzer
 Pierre Rudloff
 Piotr Blonkowski
@@ -195,6 +198,7 @@ Simó Albert i Beltran
 soko1
 St John Karp
 Stanislav N.
+Steffen K9
 StefOfficiel
 Sveinn í Felli
 Sven Anders
@@ -211,6 +215,7 @@ thorsten23
 Tino
 Tobias Diekershoff
 Tobias Hößl
+tomacat
 tomamplius
 tomtom84
 Tony Baldwin
@@ -221,6 +226,7 @@ Tubuntu
 Tupambae.org
 U-SOUND\mike
 ufic
+Unknown
 Vasudev Kamath
 Vasya Novikov
 vislav

From 8fbcbbda16feff4ab82d942f099cf5ab4e4c832a Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Wed, 19 Sep 2018 21:36:21 -0400
Subject: [PATCH 86/96] Remove references to Pear Text_Highlighter stylesheets

---
 view/templates/head.tpl            | 1 -
 view/theme/frio/templates/head.tpl | 1 -
 2 files changed, 2 deletions(-)

diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index aadbfcd8ee..7da270d3ff 100644
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@ -7,7 +7,6 @@
 <link rel="stylesheet" href="view/asset/jgrowl/jquery.jgrowl.min.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="view/asset/perfect-scrollbar/css/perfect-scrollbar.min.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="vendor/pear/text_highlighter/sample.css" type="text/css" media="screen" />
 
 <link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
 
diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl
index 7d6cadea94..9d26a61b45 100644
--- a/view/theme/frio/templates/head.tpl
+++ b/view/theme/frio/templates/head.tpl
@@ -12,7 +12,6 @@
 <link rel="stylesheet" href="view/asset/jgrowl/jquery.jgrowl.min.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="view/asset/perfect-scrollbar/css/perfect-scrollbar.min.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="vendor/pear/text_highlighter/sample.css" type="text/css" media="screen" />
 
 <link rel="stylesheet" href="view/theme/frio/frameworks/bootstrap/css/bootstrap.min.css" type="text/css" media="screen"/>
 <link rel="stylesheet" href="view/theme/frio/frameworks/bootstrap/css/bootstrap-theme.min.css" type="text/css" media="screen"/>

From 18c8a7f2471f891c14803276655edc8f828d2eeb Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Wed, 19 Sep 2018 23:10:41 -0400
Subject: [PATCH 87/96] Fix inline code span display

---
 view/global.css                    | 1 -
 view/theme/duepuntozero/style.css  | 2 +-
 view/theme/frio/css/style.css      | 3 ---
 view/theme/quattro/dark/style.css  | 2 +-
 view/theme/quattro/green/style.css | 2 +-
 view/theme/quattro/lilac/style.css | 2 +-
 view/theme/smoothly/style.css      | 4 ++--
 view/theme/vier/breathe.css        | 2 +-
 view/theme/vier/style.css          | 2 +-
 9 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/view/global.css b/view/global.css
index cea6c51036..e266ceb53e 100644
--- a/view/global.css
+++ b/view/global.css
@@ -248,7 +248,6 @@ span.oembed, h4 {
 }
 
 code {
-  display: block;
   background-color: #eee;
   color: #666;
   padding: 1em;
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index b29ff37477..e327a1ec91 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -41,7 +41,7 @@ img { border :0px; }
 	width: 384px;
 }
 
-code {
+pre code {
 	font-family: Courier, monospace;
 	white-space: pre;
 	display: block;
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index cd55dcadc4..9b48336117 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -96,9 +96,6 @@ blockquote {
     max-height: 0px !important;
     overflow: hidden !important;
 }
-code {
-    white-space: pre-wrap;
-}
 
 /**
  * mobile aside
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 87dc372023..bfb078e566 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -469,7 +469,7 @@ blockquote {
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
 }
-code {
+pre code {
   font-family: Courier, monospace;
   white-space: pre;
   display: block;
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 55cb32556b..1dce844acd 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -469,7 +469,7 @@ blockquote {
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
 }
-code {
+pre code {
   font-family: Courier, monospace;
   white-space: pre;
   display: block;
diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 4e6c727b09..870fe6ce23 100644
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -469,7 +469,7 @@ blockquote {
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
 }
-code {
+pre code {
   font-family: Courier, monospace;
   white-space: pre;
   display: block;
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index 399f12e556..0907237871 100644
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -1860,7 +1860,7 @@ blockquote.shared_content {
 
 #item-delete-selected-icon {}
 
-code {
+pre code {
 	font-family: Courier, monospace;
 	display: block;
 	overflow: auto;
@@ -2024,7 +2024,7 @@ code {
 	float: right;
 }
 
-.wall-item-body code {
+.wall-item-body pre code {
 	font-family: Courier, monospace;
 	display: block;
 	overflow: auto;
diff --git a/view/theme/vier/breathe.css b/view/theme/vier/breathe.css
index ec6d91a569..3403a24b27 100644
--- a/view/theme/vier/breathe.css
+++ b/view/theme/vier/breathe.css
@@ -14,7 +14,7 @@ header #banner #logo-text {
   border-bottom: none !important;
 }
 
-code {
+pre code {
   border: none;
   border-radius: 5px;
 }
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 572be5e18f..6c4f2b20f3 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -323,7 +323,7 @@ a:hover {
 	/* color: #005c94; */
 	text-decoration: underline;
 }
-code {
+pre code {
 	font-family: Courier, monospace;
 	white-space: pre;
 	display: block;

From 58d43ad576276916668a506490ae0cfd1f892473 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 20 Sep 2018 12:44:40 +0000
Subject: [PATCH 88/96] Fix: Update routine for conversations in contacts was
 missing

---
 mod/update_contacts.php | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 mod/update_contacts.php

diff --git a/mod/update_contacts.php b/mod/update_contacts.php
new file mode 100644
index 0000000000..863542e666
--- /dev/null
+++ b/mod/update_contacts.php
@@ -0,0 +1,39 @@
+<?php
+
+// See update_profile.php for documentation
+
+use Friendica\App;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
+
+require_once 'mod/contacts.php';
+
+function update_contacts_content(App $a)
+{
+	header("Content-type: text/html");
+	echo "<!DOCTYPE html><html><body>\r\n";
+	echo "<section>";
+
+	if ($_GET["force"] == 1) {
+		$text = contacts_content($a, true);
+	} else {
+		$text = '';
+	}
+
+	if (PConfig::get(local_user(), "system", "bandwidth_saver")) {
+		$replace = "<br />".L10n::t("[Embedded content - reload page to view]")."<br />";
+		$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
+		$text = preg_replace($pattern, $replace, $text);
+		$pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
+		$text = preg_replace($pattern, $replace, $text);
+		$pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i";
+		$text = preg_replace($pattern, $replace, $text);
+		$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
+		$text = preg_replace($pattern, $replace, $text);
+	}
+
+	echo str_replace("\t", "       ", $text);
+	echo "</section>";
+	echo "</body></html>\r\n";
+	killme();
+}

From 0dbb6313a57ba6ec9e22876f3165dabd037fcdf0 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 22 Sep 2018 06:47:35 +0000
Subject: [PATCH 89/96] Hopefully fixes relocations that hadn't been executed

---
 src/Protocol/DFRN.php   | 4 ++--
 src/Worker/Delivery.php | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index b207c3ca87..1ab4d8f9e4 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1164,12 +1164,12 @@ class DFRN
 	 * @return int Deliver status. Negative values mean an error.
 	 * @todo Add array type-hint for $owner, $contact
 	 */
-	public static function deliver($owner, $contact, $atom, $dissolve = false)
+	public static function deliver($owner, $contact, $atom, $dissolve = false, $legacy_transport = false)
 	{
 		$a = get_app();
 
 		// At first try the Diaspora transport layer
-		if (!$dissolve) {
+		if (!$dissolve && !$legacy_transport) {
 			$ret = self::transmit($owner, $contact, $atom);
 			if ($ret >= 200) {
 				logger('Delivery via Diaspora transport layer was successful with status ' . $ret);
diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index e0a5c09c27..3a93d92f7b 100644
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -292,8 +292,10 @@ class Delivery extends BaseObject
 				self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
 				return;
 			}
-		} else {
+		} elseif ($cmd != self::RELOCATION) {
 			$deliver_status = DFRN::deliver($owner, $contact, $atom);
+		} else {
+			$deliver_status = DFRN::deliver($owner, $contact, $atom, false, true);
 		}
 
 		logger('Delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status);

From b3e314769784562906e0800d02b9d05037d4583a Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 22 Sep 2018 07:09:27 +0000
Subject: [PATCH 90/96] Issue 5768: This logging should help finding the origin
 of the problem

---
 src/Core/L10n.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index 8cdd935917..542590646d 100644
--- a/src/Core/L10n.php
+++ b/src/Core/L10n.php
@@ -183,6 +183,10 @@ class L10n extends BaseObject
 	{
 		$a = self::getApp();
 
+		if (!is_numeric($count)) {
+			logger('Non numeric count called by ' . System::callstack(20));
+		}
+
 		$lang = Config::get('system', 'language');
 
 		if (!empty($a->strings[$singular])) {

From c6268ca0b7c44e26e7a7a99e8d3435bfbe309b3e Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 22 Sep 2018 14:17:14 +0000
Subject: [PATCH 91/96] Issue 5760: Avoid a non numeric value for "tt"

---
 include/conversation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/conversation.php b/include/conversation.php
index 45e5d1caa3..e41b697b54 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1454,7 +1454,7 @@ function get_responses(array $conv_responses, array $response_verbs, $ob, array
 	$ret = [];
 	foreach ($response_verbs as $v) {
 		$ret[$v] = [];
-		$ret[$v]['count'] = defaults($conv_responses[$v], $item['uri'], '');
+		$ret[$v]['count'] = defaults($conv_responses[$v], $item['uri'], 0);
 		$ret[$v]['list']  = defaults($conv_responses[$v], $item['uri'] . '-l', []);
 		$ret[$v]['self']  = defaults($conv_responses[$v], $item['uri'] . '-self', '0');
 		if (count($ret[$v]['list']) > MAX_LIKERS) {

From 780571bb68dcb20cdde9632f0bc7aa78bb0ceef9 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 22 Sep 2018 19:30:26 +0200
Subject: [PATCH 92/96] CS translation update THX Aditoo

---
 view/lang/cs/messages.po | 48 ++++++++++++++++++++--------------------
 view/lang/cs/strings.php | 46 +++++++++++++++++++-------------------
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/view/lang/cs/messages.po b/view/lang/cs/messages.po
index 057416b7fe..7b87e7d327 100644
--- a/view/lang/cs/messages.po
+++ b/view/lang/cs/messages.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-25 15:34+0000\n"
-"PO-Revision-Date: 2018-09-17 14:51+0000\n"
+"PO-Revision-Date: 2018-09-22 16:53+0000\n"
 "Last-Translator: Aditoo\n"
 "Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -214,7 +214,7 @@ msgstr "Podobné zájmy"
 
 #: view/theme/vier/theme.php:204 src/Content/Widget.php:66
 msgid "Random Profile"
-msgstr "Náhodný Profil"
+msgstr "Náhodný profil"
 
 #: view/theme/vier/theme.php:205 src/Content/Widget.php:67
 msgid "Invite Friends"
@@ -1786,7 +1786,7 @@ msgstr "Databáze se již používá."
 
 #: mod/install.php:163
 msgid "System check"
-msgstr "Testování systému"
+msgstr "Zkouška systému"
 
 #: mod/install.php:167 mod/cal.php:279 mod/events.php:394
 msgid "Next"
@@ -1794,7 +1794,7 @@ msgstr "Dále"
 
 #: mod/install.php:168
 msgid "Check again"
-msgstr "Otestovat znovu"
+msgstr "Vyskoušet znovu"
 
 #: mod/install.php:187
 msgid "Database connection"
@@ -1804,7 +1804,7 @@ msgstr "Databázové spojení"
 msgid ""
 "In order to install Friendica we need to know how to connect to your "
 "database."
-msgstr "Pro instalaci Friendica potřeujeme znát připojení k Vaší databázi."
+msgstr "Pro instalaci Friendica potřebujeme znát připojení k Vaší databázi."
 
 #: mod/install.php:189
 msgid ""
@@ -1840,13 +1840,13 @@ msgstr "Jméno databáze"
 
 #: mod/install.php:198 mod/install.php:235
 msgid "Site administrator email address"
-msgstr "Emailová adresa administrátora webu"
+msgstr "E-mailová adresa administrátora webu"
 
 #: mod/install.php:198 mod/install.php:235
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
-msgstr "Vaše emailová adresa účtu se musí s touto shodovat, aby bylo možné využívat administrační panel ve webovém rozhraní."
+msgstr "Vaše e-mailová adresa účtu se musí s touto shodovat, aby bylo možné využívat administrační panel ve webovém rozhraní."
 
 #: mod/install.php:200 mod/install.php:238
 msgid "Please select a default timezone for your website"
@@ -2109,7 +2109,7 @@ msgstr "Profily"
 
 #: mod/settings.php:72 mod/admin.php:190
 msgid "Additional features"
-msgstr "Další funkčnosti"
+msgstr "Dodatečné vlastnosti"
 
 #: mod/settings.php:80
 msgid "Display"
@@ -2157,7 +2157,7 @@ msgstr "Nastavení e-mailu aktualizována."
 
 #: mod/settings.php:306
 msgid "Features updated"
-msgstr "Funkce aktualizovány"
+msgstr "Vlastnosti aktualizovány"
 
 #: mod/settings.php:379
 msgid "Relocate message has been send to your contacts"
@@ -2230,7 +2230,7 @@ msgstr "Přidat aplikaci"
 #: mod/admin.php:317 mod/admin.php:1426 mod/admin.php:2074 mod/admin.php:2328
 #: mod/admin.php:2403 mod/admin.php:2550
 msgid "Save Settings"
-msgstr "Uložit Nastavení"
+msgstr "Uložit nastavení"
 
 #: mod/settings.php:678 mod/settings.php:704
 msgid "Consumer Key"
@@ -2290,7 +2290,7 @@ msgstr "Zap"
 
 #: mod/settings.php:780
 msgid "Additional Features"
-msgstr "Další funkce"
+msgstr "Dodatečné vlastnosti"
 
 #: mod/settings.php:803 src/Content/ContactSelector.php:82
 msgid "Diaspora"
@@ -3511,19 +3511,19 @@ msgstr "Ignorovat"
 
 #: mod/notifications.php:93 src/Content/Nav.php:191
 msgid "Notifications"
-msgstr "Upozornění"
+msgstr "Oznámení"
 
 #: mod/notifications.php:101
 msgid "Network Notifications"
-msgstr "Upozornění Sítě"
+msgstr "Síťová oznámení"
 
 #: mod/notifications.php:106 mod/notify.php:81
 msgid "System Notifications"
-msgstr "Systémová upozornění"
+msgstr "Systémová oznámení"
 
 #: mod/notifications.php:111
 msgid "Personal Notifications"
-msgstr "Osobní upozornění"
+msgstr "Osobní oznámení"
 
 #: mod/notifications.php:116
 msgid "Home Notifications"
@@ -4328,7 +4328,7 @@ msgstr "Smazat položku"
 
 #: mod/admin.php:200 mod/admin.php:201 mod/admin.php:2402
 msgid "Logs"
-msgstr "Logy"
+msgstr "Záznamy"
 
 #: mod/admin.php:202 mod/admin.php:2469
 msgid "View Logs"
@@ -4336,7 +4336,7 @@ msgstr "Zobrazit záznamy"
 
 #: mod/admin.php:204
 msgid "Diagnostics"
-msgstr "Diagnostica"
+msgstr "Diagnostika"
 
 #: mod/admin.php:205
 msgid "PHP Info"
@@ -5237,7 +5237,7 @@ msgstr "Podpora OpenID pro registraci a přihlašování."
 
 #: mod/admin.php:1477
 msgid "Fullname check"
-msgstr "kontrola úplného jména"
+msgstr "Kontrola úplného jména"
 
 #: mod/admin.php:1477
 msgid ""
@@ -5299,7 +5299,7 @@ msgstr "Podpora pro Diasporu nemůže být zapnuta, protože Friendica byla nain
 
 #: mod/admin.php:1485
 msgid "Enable Diaspora support"
-msgstr "Povolit podporu Diaspora"
+msgstr "Zapnout podporu pro Diaspora"
 
 #: mod/admin.php:1485
 msgid "Provide built-in Diaspora network compatibility."
@@ -5773,7 +5773,7 @@ msgid ""
 "\n"
 "\t\t\tDear %1$s,\n"
 "\t\t\t\tthe administrator of %2$s has set up an account for you."
-msgstr "\n\t\t\tVážený/á%1$s,\n\t\t\t\tadministrátor %2$s pro Vás vytvořil uživatelský účet."
+msgstr "\n\t\t\tVážený/á %1$s,\n\t\t\t\tadministrátor %2$s pro Vás vytvořil uživatelský účet."
 
 #: mod/admin.php:1669
 #, php-format
@@ -6015,7 +6015,7 @@ msgstr "[Nepodporováno]"
 
 #: mod/admin.php:2360
 msgid "Log settings updated."
-msgstr "Nastavení protokolu aktualizováno."
+msgstr "Nastavení záznamů aktualizována."
 
 #: mod/admin.php:2393
 msgid "PHP log currently enabled."
@@ -6183,7 +6183,7 @@ msgstr "Vzdálený odběr nemůže být na Vaší síti proveden. Prosím, přih
 
 #: mod/dfrn_request.php:486
 msgid "Please login to confirm introduction."
-msgstr "Pro ptvrzení představení se prosím přihlaste."
+msgstr "Pro potvrzení představení se prosím přihlaste."
 
 #: mod/dfrn_request.php:494
 msgid ""
@@ -7847,13 +7847,13 @@ msgstr "Pokud nemáte na Vašem serveru nainstalovanou verzi PHP pro příkazov
 
 #: src/Core/Install.php:143
 msgid "PHP executable path"
-msgstr "Cesta k \"PHP executable\""
+msgstr "Cesta ke spustitelnému souboru PHP"
 
 #: src/Core/Install.php:143
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
-msgstr "Zadejte plnou cestu k spustitelnému souboru php. Tento údaj můžete ponechat nevyplněný a pokračovat v instalaci."
+msgstr "Zadejte plnou cestu ke spustitelnému souboru PHP. Tento údaj můžete ponechat nevyplněný a pokračovat v instalaci."
 
 #: src/Core/Install.php:148
 msgid "Command line PHP"
diff --git a/view/lang/cs/strings.php b/view/lang/cs/strings.php
index f4b53ec73f..753b0e51da 100644
--- a/view/lang/cs/strings.php
+++ b/view/lang/cs/strings.php
@@ -45,7 +45,7 @@ $a->strings["Examples: Robert Morgenstein, Fishing"] = "Příklady: Josef Dvoř
 $a->strings["Find"] = "Najít";
 $a->strings["Friend Suggestions"] = "Návrhy přátel";
 $a->strings["Similar Interests"] = "Podobné zájmy";
-$a->strings["Random Profile"] = "Náhodný Profil";
+$a->strings["Random Profile"] = "Náhodný profil";
 $a->strings["Invite Friends"] = "Pozvat přátele";
 $a->strings["Global Directory"] = "Globální adresář";
 $a->strings["Local Directory"] = "Místní adresář";
@@ -430,11 +430,11 @@ $a->strings["Your Friendica site database has been installed."] = "Vaše databá
 $a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Nejspíše budete muset manuálně importovat soubor \"database.sql\" pomocí phpMyAdmin či MySQL.";
 $a->strings["Please see the file \"INSTALL.txt\"."] = "Přečtěte si prosím informace v souboru \"INSTALL.txt\".";
 $a->strings["Database already in use."] = "Databáze se již používá.";
-$a->strings["System check"] = "Testování systému";
+$a->strings["System check"] = "Zkouška systému";
 $a->strings["Next"] = "Dále";
-$a->strings["Check again"] = "Otestovat znovu";
+$a->strings["Check again"] = "Vyskoušet znovu";
 $a->strings["Database connection"] = "Databázové spojení";
-$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Pro instalaci Friendica potřeujeme znát připojení k Vaší databázi.";
+$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Pro instalaci Friendica potřebujeme znát připojení k Vaší databázi.";
 $a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Pokud máte otázky k následujícím nastavením, obraťte se na svého poskytovatele hostingu nebo administrátora serveru.";
 $a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Databáze, kterou uvedete níže, by již měla existovat. Pokud to tak není, prosíme, vytvořte ji před pokračováním.";
 $a->strings["Database Server Name"] = "Jméno databázového serveru";
@@ -442,8 +442,8 @@ $a->strings["Database Login Name"] = "Přihlašovací jméno k databázi";
 $a->strings["Database Login Password"] = "Heslo k databázovému účtu ";
 $a->strings["For security reasons the password must not be empty"] = "Z bezpečnostních důvodů nesmí být heslo prázdné.";
 $a->strings["Database Name"] = "Jméno databáze";
-$a->strings["Site administrator email address"] = "Emailová adresa administrátora webu";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "Vaše emailová adresa účtu se musí s touto shodovat, aby bylo možné využívat administrační panel ve webovém rozhraní.";
+$a->strings["Site administrator email address"] = "E-mailová adresa administrátora webu";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "Vaše e-mailová adresa účtu se musí s touto shodovat, aby bylo možné využívat administrační panel ve webovém rozhraní.";
 $a->strings["Please select a default timezone for your website"] = "Prosím, vyberte výchozí časové pásmo pro váš server";
 $a->strings["Site settings"] = "Nastavení webu";
 $a->strings["System Language:"] = "Systémový jazyk";
@@ -501,7 +501,7 @@ $a->strings["Profile Match"] = "Shoda profilu";
 $a->strings["everybody"] = "Žádost o připojení selhala nebo byla zrušena.";
 $a->strings["Account"] = "Účet";
 $a->strings["Profiles"] = "Profily";
-$a->strings["Additional features"] = "Další funkčnosti";
+$a->strings["Additional features"] = "Dodatečné vlastnosti";
 $a->strings["Display"] = "Zobrazení";
 $a->strings["Social Networks"] = "Sociální sítě";
 $a->strings["Addons"] = "Doplňky";
@@ -513,7 +513,7 @@ $a->strings["Missing some important data!"] = "Chybí některé důležité úda
 $a->strings["Update"] = "Aktualizace";
 $a->strings["Failed to connect with email account using the settings provided."] = "Nepodařilo se připojit k e-mailovému účtu pomocí dodaného nastavení.";
 $a->strings["Email settings updated."] = "Nastavení e-mailu aktualizována.";
-$a->strings["Features updated"] = "Funkce aktualizovány";
+$a->strings["Features updated"] = "Vlastnosti aktualizovány";
 $a->strings["Relocate message has been send to your contacts"] = "Správa o změně umístění byla odeslána vašim kontaktům";
 $a->strings["Passwords do not match. Password unchanged."] = "Hesla se neshodují. Heslo nebylo změněno.";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "Prázdné hesla nejsou povolena. Heslo nebylo změněno.";
@@ -530,7 +530,7 @@ $a->strings["Private forum has no privacy permissions. Using default privacy gro
 $a->strings["Private forum has no privacy permissions and no default privacy group."] = "Soukromé fórum nemá nastaveno zabezpečení a ani žádnou defaultní výchozí skupinu.";
 $a->strings["Settings updated."] = "Nastavení aktualizováno.";
 $a->strings["Add application"] = "Přidat aplikaci";
-$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Save Settings"] = "Uložit nastavení";
 $a->strings["Consumer Key"] = "Consumer Key";
 $a->strings["Consumer Secret"] = "Consumer Secret";
 $a->strings["Redirect"] = "Přesměrování";
@@ -545,7 +545,7 @@ $a->strings["No Addon settings configured"] = "Žádná nastavení doplňků nen
 $a->strings["Addon Settings"] = "Nastavení doplňků";
 $a->strings["Off"] = "Vyp";
 $a->strings["On"] = "Zap";
-$a->strings["Additional Features"] = "Další funkce";
+$a->strings["Additional Features"] = "Dodatečné vlastnosti";
 $a->strings["Diaspora"] = "Diaspora";
 $a->strings["enabled"] = "povoleno";
 $a->strings["disabled"] = "zakázáno";
@@ -826,10 +826,10 @@ $a->strings["Note: This node explicitly contains adult content"] = "Poznámka: T
 $a->strings["Invalid request identifier."] = "Neplatný identifikátor požadavku.";
 $a->strings["Discard"] = "Odstranit";
 $a->strings["Ignore"] = "Ignorovat";
-$a->strings["Notifications"] = "Upozornění";
-$a->strings["Network Notifications"] = "Upozornění Sítě";
-$a->strings["System Notifications"] = "Systémová upozornění";
-$a->strings["Personal Notifications"] = "Osobní upozornění";
+$a->strings["Notifications"] = "Oznámení";
+$a->strings["Network Notifications"] = "Síťová oznámení";
+$a->strings["System Notifications"] = "Systémová oznámení";
+$a->strings["Personal Notifications"] = "Osobní oznámení";
 $a->strings["Home Notifications"] = "Oznámení na domovské stránce";
 $a->strings["Show Ignored Requests"] = "Zobrazit ignorované žádosti";
 $a->strings["Hide Ignored Requests"] = "Skrýt ignorované žádosti";
@@ -1001,9 +1001,9 @@ $a->strings["Tools"] = "Nástroje";
 $a->strings["Contact Blocklist"] = "Blokované kontakty";
 $a->strings["Server Blocklist"] = "Blokované servery";
 $a->strings["Delete Item"] = "Smazat položku";
-$a->strings["Logs"] = "Logy";
+$a->strings["Logs"] = "Záznamy";
 $a->strings["View Logs"] = "Zobrazit záznamy";
-$a->strings["Diagnostics"] = "Diagnostica";
+$a->strings["Diagnostics"] = "Diagnostika";
 $a->strings["PHP Info"] = "Info o PHP";
 $a->strings["probe address"] = "vyzkoušet adresu";
 $a->strings["check webfinger"] = "vyzkoušet webfinger";
@@ -1204,7 +1204,7 @@ $a->strings["Block multiple registrations"] = "Blokovat více registrací";
 $a->strings["Disallow users to register additional accounts for use as pages."] = "Znemožnit uživatelům registraci dodatečných účtů k použití jako stránky.";
 $a->strings["OpenID support"] = "Podpora OpenID";
 $a->strings["OpenID support for registration and logins."] = "Podpora OpenID pro registraci a přihlašování.";
-$a->strings["Fullname check"] = "kontrola úplného jména";
+$a->strings["Fullname check"] = "Kontrola úplného jména";
 $a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Přimět uživatele k registraci s mezerou mezi jménu a příjmením v poli Celé jméno, jako antispamové opatření.";
 $a->strings["Community pages for visitors"] = "Komunitní stránky pro návštěvníky";
 $a->strings["Which community pages should be available for visitors. Local users always see both pages."] = "Které komunitní stránky by měly být viditelné pro návštěvníky. Lokální uživatelé vždy vidí obě stránky.";
@@ -1216,7 +1216,7 @@ $a->strings["Only import OStatus threads from our contacts"] = "Pouze importovat
 $a->strings["Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system."] = "Běžně importujeme všechen obsah z našich kontaktů na OStatus. S touto volbou uchováváme vlákna počatá kontaktem, který je na našem systému známý.";
 $a->strings["OStatus support can only be enabled if threading is enabled."] = "Podpora pro OStatus může být zapnuta pouze, je-li povolen threading.";
 $a->strings["Diaspora support can't be enabled because Friendica was installed into a sub directory."] = "Podpora pro Diasporu nemůže být zapnuta, protože Friendica byla nainstalována do podadresáře.";
-$a->strings["Enable Diaspora support"] = "Povolit podporu Diaspora";
+$a->strings["Enable Diaspora support"] = "Zapnout podporu pro Diaspora";
 $a->strings["Provide built-in Diaspora network compatibility."] = "Poskytnout zabudovanou kompatibilitu sitě Diaspora.";
 $a->strings["Only allow Friendica contacts"] = "Povolit pouze kontakty z Friendica";
 $a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Všechny kontakty musí používat Friendica protokol. Všchny jiné zabudované komunikační protokoly budou zablokované.";
@@ -1313,7 +1313,7 @@ $a->strings["Failed Updates"] = "Neúspěšné aktualizace";
 $a->strings["This does not include updates prior to 1139, which did not return a status."] = "To nezahrnuje aktualizace do verze 1139, které nevracejí žádný status.";
 $a->strings["Mark success (if update was manually applied)"] = "Označit za úspěšné (pokud byla aktualizace aplikována manuálně)";
 $a->strings["Attempt to execute this update step automatically"] = "Pokusit se provést tuto aktualizaci automaticky.";
-$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tthe administrator of %2\$s has set up an account for you."] = "\n\t\t\tVážený/á%1\$s,\n\t\t\t\tadministrátor %2\$s pro Vás vytvořil uživatelský účet.";
+$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tthe administrator of %2\$s has set up an account for you."] = "\n\t\t\tVážený/á %1\$s,\n\t\t\t\tadministrátor %2\$s pro Vás vytvořil uživatelský účet.";
 $a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%1\$s\n\t\t\tLogin Name:\t\t%2\$s\n\t\t\tPassword:\t\t%3\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %1\$s/removeme\n\n\t\t\tThank you and welcome to %4\$s."] = "\n\t\t\tZde jsou Vaše přihlašovací detaily:\n\n\t\t\tAdresa stránky:\t\t%1\$s\n\t\t\tPřihlašovací jméno:\t%2\$s\n\t\t\tHeslo:\t\t\t%3\$s\n\n\t\t\tSvé heslo si po přihlášení můžete změnit na stránce \"Nastavení\" vašeho\n\t\t\túčtu.\n\n\t\t\tProsím, prohlédněte si na chvilku ostatní nastavení účtu na této stránce.\n\n\t\t\tMožná byste si také přál/a přidat pár základních informací na svůj výchozí\n\t\t\tprofil (na stránce \"Profily\") aby vás další lidé mohli snadno najít.\n\t\t\tDoporučujeme nastavit si Vaše celé jméno, přidat profilovou fotku,\n\t\t\tpřidat pár \"klíčových slov\" k profilu (velmi užitečné při získávání nových\n\t\t\tpřátel) - a možná v jaké zemi žijete; pokud nechcete být konkrétnější.\n\n\t\t\tZcela respektujeme Vaše právo na soukromí a žádnou z těchto položek\n\t\t\tnení potřeba vyplňovat. Pokud jste zde nový/á a nikoho zde neznáte, mohou vám\n\t\t\tpomoci si získat nové a zajímavé přátele.\n\t\t\tPokud byste si někdy přál/a smazat účet, můžete tak učinit na stránce\n\t\t\t%1\$s/removeme.\n\n\t\t\tDěkujeme Vám a vítáme Vás na %4\$s.";
 $a->strings["Registration details for %s"] = "Registrační údaje pro uživatele %s";
 $a->strings["%s user blocked/unblocked"] = [
@@ -1370,7 +1370,7 @@ $a->strings["Reload active themes"] = "Znovu načíst aktivní motivy";
 $a->strings["No themes found on the system. They should be placed in %1\$s"] = "V systému nebyly nalezeny žádné motivy. Měly by být uloženy v %1\$s";
 $a->strings["[Experimental]"] = "[Experimentální]";
 $a->strings["[Unsupported]"] = "[Nepodporováno]";
-$a->strings["Log settings updated."] = "Nastavení protokolu aktualizováno.";
+$a->strings["Log settings updated."] = "Nastavení záznamů aktualizována.";
 $a->strings["PHP log currently enabled."] = "PHP záznamy jsou aktuálně povolené.";
 $a->strings["PHP log currently disabled."] = "PHP záznamy jsou aktuálně zakázané.";
 $a->strings["Clear"] = "Vyčistit";
@@ -1411,7 +1411,7 @@ $a->strings["Disallowed profile URL."] = "Nepovolené URL profilu.";
 $a->strings["Failed to update contact record."] = "Nepodařilo se aktualizovat kontakt.";
 $a->strings["Your introduction has been sent."] = "Vaše žádost o propojení byla odeslána.";
 $a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "Vzdálený odběr nemůže být na Vaší síti proveden. Prosím, přihlaste se k odběru přímo na Vašem systému.";
-$a->strings["Please login to confirm introduction."] = "Pro ptvrzení představení se prosím přihlaste.";
+$a->strings["Please login to confirm introduction."] = "Pro potvrzení představení se prosím přihlaste.";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Jste přihlášen/a pod nesprávnou identitou. Prosím, přihlaste se do <strong>tohoto</strong> profilu.";
 $a->strings["Confirm"] = "Potvrdit";
 $a->strings["Hide this contact"] = "Skrýt tento kontakt";
@@ -1801,8 +1801,8 @@ $a->strings["%s: Database update"] = "%s: Aktualizace databáze";
 $a->strings["%s: updating %s table."] = "%s: aktualizuji tabulku %s";
 $a->strings["Could not find a command line version of PHP in the web server PATH."] = "Nelze najít verzi PHP pro příkazový řádek v PATH webového serveru.";
 $a->strings["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://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>"] = "Pokud nemáte na Vašem serveru nainstalovanou verzi PHP pro příkazový řádek, nebudete moci spouštět procesy v pozadí. Více na <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>\"Nastavte pracovníka\"</a>";
-$a->strings["PHP executable path"] = "Cesta k \"PHP executable\"";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Zadejte plnou cestu k spustitelnému souboru php. Tento údaj můžete ponechat nevyplněný a pokračovat v instalaci.";
+$a->strings["PHP executable path"] = "Cesta ke spustitelnému souboru PHP";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Zadejte plnou cestu ke spustitelnému souboru PHP. Tento údaj můžete ponechat nevyplněný a pokračovat v instalaci.";
 $a->strings["Command line PHP"] = "Příkazový řádek PHP";
 $a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "PHP executable není php cli binary (může být verze cgi-fgci)";
 $a->strings["Found PHP version: "] = "Nalezena PHP verze:";

From ebae440490cbf009766aa0c6ba24734f3a938d9e Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 23 Sep 2018 12:43:36 +0200
Subject: [PATCH 93/96] change the link to the DE wiki

---
 doc/de/FAQ.md  | 2 +-
 doc/de/Home.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/de/FAQ.md b/doc/de/FAQ.md
index 6baa5c5f5e..fe8a9d128d 100644
--- a/doc/de/FAQ.md
+++ b/doc/de/FAQ.md
@@ -180,7 +180,7 @@ Hier ist eine Liste von Clients bei denen dies möglich ist, bzw. die speziell f
 <a name="help"></a>
 ### Wo finde ich Hilfe?
 
-Wenn Du Probleme mit Deiner Friendica-Seite hast, dann kannst Du die Community in der [Friendica-Support-Gruppe](https://forum.friendi.ca/profile/helpers) oder im [deutschen Friendica-Support-Forum](http://toktan.org/profile/wiki) fragen oder Dir das [deutsche Wiki](http://wiki.toktan.org/doku.php) anschauen.
+Wenn Du Probleme mit Deiner Friendica-Seite hast, dann kannst Du die Community in der [Friendica-Support-Gruppe](https://forum.friendi.ca/profile/helpers) fragen oder Dir das [deutsche Wiki](https://friendica-wiki.de/) anschauen.
 Wenn Du Deinen Account nicht nutzen kannst, kannst Du entweder einen [Testaccount](https://tryfriendica.de) bzw. einen Account auf einer öffentlichen Seite ([Liste](https://dir.friendica.social/servers)) nutzen.
 
 Wenn du dir keinen weiteren Friendica Account einrichten willst, kannst du auch gerne über einen der folgenden alternativen Kanäle Hilfe suchen:
diff --git a/doc/de/Home.md b/doc/de/Home.md
index b6a07cc09a..6c95476eda 100644
--- a/doc/de/Home.md
+++ b/doc/de/Home.md
@@ -61,7 +61,7 @@ Friendica - Dokumentation und Ressourcen
 **Externe Ressourcen**
 
 * [Haupt-Webseite](https://friendi.ca)
-* [Deutsches Friendica-Wiki](http://wiki.toktan.org/doku.php)
+* [Deutsches Friendica-Wiki](https://friendica-wiki.de)
 * Support Kanäle
   * [Friendica Support Forum](https://forum.friendi.ca/~helpers)
   * [Mailing Listen Archiv](http://mailman.friendi.ca/mailman/listinfo/support-friendi.ca) zum Abonnieren der Liste eine E-Mail an ``support-request(at)friendi.ca?subject=subscribe`` senden

From c17a2b8a4ec11ab99772a82cd394d1cb7bf77208 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 23 Sep 2018 12:50:56 -0400
Subject: [PATCH 94/96] Add missing change to quattro main less file

---
 view/theme/quattro/quattro.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index c7b29a495e..415eda83c5 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -59,7 +59,7 @@ blockquote {
 
 }
 
-code {
+pre code {
 	font-family: Courier, monospace;
 	white-space: pre;
 	display: block;

From 18b20e8147dcd085bddc9cb50b849044c5aeb1c9 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 23 Sep 2018 20:59:58 +0200
Subject: [PATCH 95/96] Changelog 2018.09 (#5685)

* 1st batch of entries for the 2018.08 CHANGELOG file

* changes till the begin of RC phase

* updated the addon changes

* updated list of closed Issues

* updated at the end of the current RC phase

* last minute updates to the CHANGELOG

* missing stuff

* missing stuff ;-)

* other themes got enhancements as well
---
 CHANGELOG | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 131 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 6385d22bb1..2f675fb6d3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,134 @@
+Version 2018.09 (2018-09-23)
+  Friendica Core:
+    Update to the translation (CS, DE, EN-US, FI, IT, NL, PL, ZH-CN) [translation teams]
+    Update to the documentation [Aditoo17, annando, astifter, rebeka-catalina, fabrixxm, M-arcus, microgroove, nupplaphil, tobiasd]
+    Enhancements to the database structure, handling and documentation [abanink, Angristan, annando, miqrogroove, tobiasd]
+    Enhancements of unit testing [abanink, nupplaphil, rudloff]
+    Enhancements to labelling of UI elements [andyhee, tobiasd]
+    Enhancements to the background workers [annando, miqrogroove, rabuzarus]
+    Enhancements to the PHP7.2 compatibility [annando, miqrogroove, MrPetovan]
+    Enhancements to the content filter [MrPetovan]
+    Enhancements to the hooks provided for addons [abanink]
+    Enhancements to the interaction with public postings [annando]
+    Enhancements to the config storage [frabrixxm]
+    Enhancements to the themes (frio, quattro, smoothly, vier) [annando, astifter, hoergen, MrPetovan, rabuzarus, tobiasd]
+    Enhancements to the handling of locks [nupplaphil]
+    Enhancements to the redis integration [nupplaphil]
+    Enhancements to the admin panel [JeroenED, tobiasd]
+    Enhancements to the user import process [annando]
+    Enhancements to the display of invitation information [JeroenED]
+    Enhancements to the automatic installation process [nupplaphil]
+    Enhancements to the contact group UI [annando, astifter]
+    Enhancements to the call of JS [hypolite]
+    Enhancements to the storage of items in the database [annando]
+    Enhancements to the process of changing relationships [annando]
+    Enhancements to the OEmbed of data [MrPetovan]
+    Fixed various PHP notice occurrences [annando, MrPetovan]
+    Fixed a bug that could lead to the display of posts from deleted accounts on the community page for a short period [annando]
+    Fixed a bug that prevented email notification to be send out [annando]
+    Fixed a bug in database optimisation [annando]
+    Fixed a bug during removing contacts [annando]
+    Fixed a bug in the tag-cloud widget [annando]
+    Fixed a bug in the daemon mode of the background worker [annando]
+    Fixed a bug in the frio theme that contact filtering [rabuzarus]
+    Fixed a bug that mangled the display of some additional smileys [abanink]
+    Fixed a bug in generating registration mails [MrPetovan] 
+    Fixed a bug that caused blank re-share bodies [MrPetovon]
+    Fixed a bug in the API handling of private mails [fabrixxm]
+    Fixed a bug when calling the mail() function [miqrogroove]
+    Fixed a bug that caused deleted accounts being displayed in the local directory [miqrogroove]
+    Fixed a bug when checking the domain of an email address [VVelox]
+    Fixed a bug that prevented re-shares from Twitter to be shown as this [annando] 
+    Fixed a bug that caused broken profile links [miqrogroove]
+    Fixed a bug that caused content from unknown accounts appearing in the timeline [annando]
+    Fixed a bug with the ignoring and blocking of contacts [annando]
+    Fixed a bug with showing hidden contacts in some places [annando]
+    Fixed a bug that prevented the deletion of events by contacts [annando]
+    Fixed a bug that prevented email contacts from being added [annando]
+    Fixed a bug in the notification/seen API call [fabrixxm]
+    Fixed a bug that prevented a refresh after un-/ignoring a conversation [annando]
+    Fixed a bug in the handling of some language translations [anndno]
+    Fixed a bug in the hook handling [annando]
+    Fixed the handling of too long tags [annando]
+    Fixed a bug that prevented the unliking of dis-/likes [annando]
+    Fixed bugs with the handling of private nodes [annando]
+    Fixed a bug in the session initialisation [annando]
+    Fixed bugs in the execution of the background processes [annando, Quix0r]
+    Fixed a problem with the notification page [MrPetovan]
+    Fixed a bug with wrong dates in importing some Atom feeds [annando]
+    Fixed forum exclusive distribution of postings using the !notation [annando]
+    Fixed a bug that lead to empty notifications [MrPetovan]
+    Fixed a problem that could sometimes prevent the execution of the relocation [annando]
+    Fixed a bug with the handling of images in postings over the connectors [annando]
+    Added conversation cleanup configuration [miqrogroove]
+    Added support of the usage of internal diaspora links to accounts [annando]
+    Added the possibility for admins to block certain nicknames (e.g. role names) [tobiasd]
+    Added the generation of system guid [nupplaphil]
+    Added the possibility for admins to mark a node for explicit content [tobiasd]
+    Added filter by account type to the community page [annando]
+    Added private flag to API results [fabrixxm]
+    Added post update checks to the console utility [annando]
+    Added codecov analysis [nupplaphil]
+    Added access-keys to the frio theme [tobiasd]
+    Added the profile settings to the user settings [tobiasd]
+    General code refactoring and beautification work [annando, MrPetovan, Quix0r, tobiasd]
+    Fixation of the position on the network page when new posts arrive [rabuzarus]
+    Ported OpenWebAuth from Hubzilla [annando, rabuzarus]
+    Removed hard coded syntax highlighting from code blocks [MrPetovan]
+    Removed (temporarily) the possibility to add pictures to private messages [annando]
+    New INI style config file format in /config [MrPetovan, tobiasd]
+    The .htaccess file is not part of the git repository anymore [annando, Quix0r]
+
+  Friendica Addons:
+    Update to the translations (CS, DE, EN-US, NL, PL, ZH-CN) [translation teams]
+    General update to adopt changes in core [annando, MrPetovan, Quix0r, tobiasd]
+    advancedcontentfilter:
+      Enhancement to the error handling [MrPetovan]
+      Honour the CSP settings [MrPetovan]
+      Fixed translation problems [annando]
+    blockem:
+      Enhancement of the settings [AlfredSK]
+    buffer:
+      support for app.net removed [annando]
+    js_upload:
+      Enhancement of the album name handling [rabuzarus]
+      Enhancement to the wording of the labels [astifter]
+    langfilter:
+      Fixed a problem with default values of the filtered languages [tobiasd]
+    libravatar:
+      The service wont shutdown, so we can keep the addon [tobiasd]
+    pumpio:
+      Fixed a problem that prevented new connections [annando]
+    superblock:
+      Fixed a bug that prevented the addon to block accounts [annando]
+      Enhancements of the settings [AlfredSK]
+    twitter:
+      Use rich text for quote tweets [MrPetovan]
+      Prevent empty quotes from being created [annando]
+      Fixed a problem with re-shares from remote_self contacts [annando]
+      Changed URL display after link expansion [MrPetovan]
+      Fixed a problem with EXIF handling [MrPetovan]
+    added addons:
+      mastodoncustomemojis [MrPetovan]
+    deprecated addons:
+      notimeline, retriver, remote_permissions, widgets
+
+  Directory:
+    Enhancements of the health summary [andyhee]
+    Enhancements of the PHP7 compatibility [MrPetovan]
+
+  Closed Issues:
+     901, 1034, 1074, 1303, 1308, 1391, 1490, 1470, 1559, 2093, 2337,
+    2340, 2381, 2396, 2675, 3291, 3299, 3493, 3501, 3535, 3643, 3840,
+    4148, 4419, 4475, 4507, 4655, 4659, 4710, 4726, 4739, 4753, 4814,
+    4830, 4868, 4889, 4923, 4971, 4950, 4985, 5066, 5099, 5137, 5148,
+    5158, 5168, 5188, 5202, 5211, 5222, 5233, 5243, 5247, 5252, 5257,
+    5260, 5262, 5268, 5274, 5275, 5276, 5278, 5298, 5318, 5319, 5320,
+    5321, 5322, 5330, 5333, 5341, 5365, 5405, 5407, 5411, 5423, 5432,
+    5434, 5436, 5443, 5455, 5464, 5467, 5469, 5486, 5496, 5497, 5514,
+    5539, 5524, 5541, 5544, 5550, 5564, 5566, 5605, 5630, 5638, 5651,
+    5653, 5660, 5670, 5691, 5733, 5745, 5768
+
 Version 2018.05 (2018-06-01)
   Friendica Core:
     Update to the translations (DE, EN-GB, EN-US, FI, IS, IT, NL, PL, RU, ZN CH) [translation teams]

From c48fcd4a8f329946cdf09d214596ecf29e859cff Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 23 Sep 2018 21:12:10 +0200
Subject: [PATCH 96/96] Welcome 2018.09

---
 VERSION  | 2 +-
 boot.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 40284ee692..dffe5b5618 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2018.08-rc
+2018.09
diff --git a/boot.php b/boot.php
index 2236a4d5df..ebd8ed33f1 100644
--- a/boot.php
+++ b/boot.php
@@ -39,7 +39,7 @@ require_once 'include/text.php';
 
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
-define('FRIENDICA_VERSION',      '2018.08-rc');
+define('FRIENDICA_VERSION',      '2018.09');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
 define('DB_UPDATE_VERSION',      1283);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);